From 565d7dce03152c39aa0a29ead4789567348c4f7f Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sun, 19 Nov 2023 01:32:19 +0100
Subject: [PATCH] dvdauthor: 0.7.1 -> 0.7.2

dvdauthor optionally depends on imagemagick6, which is marked insecure.
imagemagick7 could be supported with patches, but since upstream
disabled the feature by default, it seems easier to remove it.
(see https://github.com/ldo/dvdauthor/issues/24)

In addition, the previous release's Nix package listed imagemagick(7) as
dependence, but it was not recognised and not used due to an error in
the dvdauthor build script.
---
 pkgs/applications/video/dvdauthor/default.nix | 16 ++++++-------
 .../dvdauthor-0.7.1-automake-1.13.patch       | 10 --------
 .../dvdauthor-0.7.1-mga-strndup.patch         | 24 -------------------
 .../dvdauthor-imagemagick-0.7.0.patch         | 11 ---------
 4 files changed, 7 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch
 delete mode 100644 pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch
 delete mode 100644 pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch

diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix
index daf785b7139f..721368ae390a 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchurl
-, imagemagick
+, autoreconfHook
 , libdvdread
 , libxml2
 , freetype
@@ -15,20 +15,18 @@
 
 stdenv.mkDerivation rec {
   pname = "dvdauthor";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz";
-    sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh";
+    hash = "sha256-MCCpLen3jrNvSLbyLVoAHEcQeCZjSnhaYt/NCA9hLrc=";
   };
 
-  buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison ];
-  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi flex bison ];
 
-  patches = [
-    ./dvdauthor-0.7.1-automake-1.13.patch
-    ./dvdauthor-0.7.1-mga-strndup.patch
-    ./dvdauthor-imagemagick-0.7.0.patch
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch
deleted file mode 100644
index 786f0c968556..000000000000
--- a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dvdauthor/configure.ac~	2013-01-04 08:27:40.713197029 +0800
-+++ dvdauthor/configure.ac	2013-01-04 08:27:53.273525273 +0800
-@@ -1,6 +1,6 @@
- AC_INIT(DVDAuthor,0.7.1,dvdauthor-users@lists.sourceforge.net)
- 
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- AC_CONFIG_AUX_DIR(autotools)
- 
- AM_INIT_AUTOMAKE
diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch
deleted file mode 100644
index 5f77a68081a4..000000000000
--- a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: dvdauthor/src/dvdvml.l
-===================================================================
---- dvdauthor/src/dvdvml.l
-+++ dvdauthor/src/dvdvml.l      2014-09-14 19:36:05.098847465 +0000
-@@ -19,6 +19,7 @@
-  * USA
-  */
- 
-+#include "config.h"
- #include "compat.h" /* needed for bool */
- #include "dvdvm.h"
- #include "dvdvmy.h"
-Index: dvdauthor/src/dvdvmy.y
-===================================================================
---- dvdauthor/src/dvdvmy.y
-+++ dvdauthor/src/dvdvmy.y      2014-09-14 19:36:28.251618378 +0000
-@@ -19,6 +19,7 @@
-  * USA
-  */
- 
-+#include "config.h"
- #include "compat.h" /* needed for bool */
- #include "dvdvm.h"
- 
diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch b/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch
deleted file mode 100644
index 52b6cc44cd59..000000000000
--- a/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dvdauthor/configure.ac.orig	2010-10-23 04:26:49.000000000 +0200
-+++ dvdauthor/configure.ac	2010-10-24 14:37:45.489064778 +0200
-@@ -31,7 +31,7 @@
- 
- usemagick=0
- 
--AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config])
-+AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config])
- if test -n "$MAGICKCONFIG"; then
-     ac_save_CPPFLAGS="$CPPFLAGS"
-     ac_save_LIBS="$LIBS"