From 09ec7867436cdfc7420900af0f0ad9ce5909d53d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Jan 2024 08:05:09 +0100 Subject: update to version 7.1.1 patch level 27 drop patch merged upstream --- 0001-fix-PKG_CONFIG_LIBDIR.patch | 59 ---------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 0001-fix-PKG_CONFIG_LIBDIR.patch (limited to '0001-fix-PKG_CONFIG_LIBDIR.patch') diff --git a/0001-fix-PKG_CONFIG_LIBDIR.patch b/0001-fix-PKG_CONFIG_LIBDIR.patch deleted file mode 100644 index 1198a33..0000000 --- a/0001-fix-PKG_CONFIG_LIBDIR.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 99b35375058be40b6b6a30b0770a11f63e62ab37 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 8 Jan 2024 10:25:06 +0100 -Subject: [PATCH] fix PKG_CONFIG_LIBDIR - ---- - Magick++/bin/Magick++-config.in | 4 +++- - MagickCore/MagickCore-config.in | 4 +++- - MagickWand/MagickWand-config.in | 4 +++- - 3 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/Magick++/bin/Magick++-config.in b/Magick++/bin/Magick++-config.in -index 877545c1a..d55208a51 100755 ---- a/Magick++/bin/Magick++-config.in -+++ b/Magick++/bin/Magick++-config.in -@@ -7,7 +7,9 @@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ --export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig" -+libdir=@libdir@ -+pkgconfigdir=@pkgconfigdir@ -+export PKG_CONFIG_LIBDIR="${pkgconfigdir}" - - usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version] - -diff --git a/MagickCore/MagickCore-config.in b/MagickCore/MagickCore-config.in -index ab790055d..2263a1dd2 100644 ---- a/MagickCore/MagickCore-config.in -+++ b/MagickCore/MagickCore-config.in -@@ -6,7 +6,9 @@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ --export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig" -+libdir=@libdir@ -+pkgconfigdir=@pkgconfigdir@ -+export PKG_CONFIG_LIBDIR="${pkgconfigdir}" - - usage="\ - Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" -diff --git a/MagickWand/MagickWand-config.in b/MagickWand/MagickWand-config.in -index 647b80c2e..03680cfdc 100644 ---- a/MagickWand/MagickWand-config.in -+++ b/MagickWand/MagickWand-config.in -@@ -6,7 +6,9 @@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ --export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig" -+libdir=@libdir@ -+pkgconfigdir=@pkgconfigdir@ -+export PKG_CONFIG_LIBDIR="${pkgconfigdir}" - - usage="\ - Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" --- -2.43.0 - -- cgit