commit f11853fbc2a1aeb98f8fb9461844ddbbbc287c90
Author: Jan Rękorajski <[email protected]>
Date: Fri May 7 22:46:47 2021 +0200
- rediff patches
ImageMagick-ldflags.patch | 9 +++++----
magick6.patch | 41 +++++++++++++++++++++++------------------
2 files changed, 28 insertions(+), 22 deletions(-)
---
diff --git a/ImageMagick-ldflags.patch b/ImageMagick-ldflags.patch
index c8d0568..baffe85 100644
--- a/ImageMagick-ldflags.patch
+++ b/ImageMagick-ldflags.patch
@@ -1,6 +1,7 @@
---- ImageMagick-6.9.10-19/configure.ac.orig 2018-12-21 07:11:13.258445539
+0100
-+++ ImageMagick-6.9.10-19/configure.ac 2018-12-21 07:12:20.068444776 +0100
-@@ -3937,7 +3937,23 @@
+diff -urNp -x '*.orig' ImageMagick-6.9.11-34.org/configure.ac
ImageMagick-6.9.11-34/configure.ac
+--- ImageMagick-6.9.11-34.org/configure.ac 2021-05-07 22:46:18.273024527
+0200
++++ ImageMagick-6.9.11-34/configure.ac 2021-05-07 22:46:19.003023227 +0200
+@@ -3891,7 +3891,23 @@ MAGICK_CFLAGS=$CFLAGS
MAGICK_CXXFLAGS="$CXXFLAGS"
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
@@ -24,4 +25,4 @@
+LDFLAGS="$new_LDFLAGS"
MAGICK_LIBS="$MAGICK_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
- AC_SUBST(MAGICK_CFLAGS)
+ AC_SUBST([MAGICK_CFLAGS])
diff --git a/magick6.patch b/magick6.patch
index dd4226e..dbacbfb 100644
--- a/magick6.patch
+++ b/magick6.patch
@@ -1,6 +1,7 @@
---- ImageMagick-6.9.9-26/magick/Magick-config.in~ 2017-12-14
19:42:48.000000000 +0200
-+++ ImageMagick-6.9.9-26/magick/Magick-config.in 2017-12-14
19:51:25.404235766 +0200
-@@ -8,11 +8,11 @@
+diff -urNp -x '*.orig' ImageMagick-6.9.11-34.org/magick/Magick-config.in
ImageMagick-6.9.11-34/magick/Magick-config.in
+--- ImageMagick-6.9.11-34.org/magick/Magick-config.in 2020-10-08
15:25:41.000000000 +0200
++++ ImageMagick-6.9.11-34/magick/Magick-config.in 2021-05-07
22:46:23.866347708 +0200
+@@ -8,11 +8,11 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
usage="\
@@ -14,7 +15,7 @@
exit 1
fi
-@@ -38,19 +38,19 @@
+@@ -38,19 +38,19 @@ while test $# -gt 0; do
echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
@@ -39,9 +40,10 @@
;;
*)
echo "${usage}" 1>&2
---- ImageMagick-6.9.10-19/magick/MagickCore-config.in.orig 2018-12-20
00:48:40.000000000 +0100
-+++ ImageMagick-6.9.10-19/magick/MagickCore-config.in 2018-12-21
07:18:02.941774194 +0100
-@@ -8,11 +8,11 @@
+diff -urNp -x '*.orig' ImageMagick-6.9.11-34.org/magick/MagickCore-config.in
ImageMagick-6.9.11-34/magick/MagickCore-config.in
+--- ImageMagick-6.9.11-34.org/magick/MagickCore-config.in 2020-10-08
15:25:41.000000000 +0200
++++ ImageMagick-6.9.11-34/magick/MagickCore-config.in 2021-05-07
22:46:23.866347708 +0200
+@@ -8,11 +8,11 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
usage="\
@@ -55,9 +57,10 @@
exit 1
fi
---- ImageMagick-6.9.8-9/wand/MagickWand-config.in.orig 2017-06-03
02:38:04.000000000 +0200
-+++ ImageMagick-6.9.8-9/wand/MagickWand-config.in 2017-06-03
21:50:38.584589096 +0200
-@@ -8,11 +8,11 @@
+diff -urNp -x '*.orig' ImageMagick-6.9.11-34.org/wand/MagickWand-config.in
ImageMagick-6.9.11-34/wand/MagickWand-config.in
+--- ImageMagick-6.9.11-34.org/wand/MagickWand-config.in 2020-10-08
15:25:41.000000000 +0200
++++ ImageMagick-6.9.11-34/wand/MagickWand-config.in 2021-05-07
22:46:23.866347708 +0200
+@@ -8,11 +8,11 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
usage="\
@@ -71,9 +74,10 @@
exit 1
fi
---- ImageMagick-6.9.7-0/wand/Wand-config.in~ 2016-12-18 14:34:45.000000000
+0100
-+++ ImageMagick-6.9.7-0/wand/Wand-config.in 2016-12-27 08:39:14.421666371
+0100
-@@ -8,11 +8,11 @@
+diff -urNp -x '*.orig' ImageMagick-6.9.11-34.org/wand/Wand-config.in
ImageMagick-6.9.11-34/wand/Wand-config.in
+--- ImageMagick-6.9.11-34.org/wand/Wand-config.in 2020-10-08
15:25:41.000000000 +0200
++++ ImageMagick-6.9.11-34/wand/Wand-config.in 2021-05-07 22:46:23.866347708
+0200
+@@ -8,11 +8,11 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
usage="\
@@ -87,7 +91,7 @@
exit 1
fi
-@@ -38,19 +38,19 @@
+@@ -38,19 +38,19 @@ while test $# -gt 0; do
echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
@@ -112,11 +116,12 @@
;;
*)
echo "${usage}" 1>&2
---- ImageMagick-6.9.7-0/wand/Wand.pc.in~ 2016-12-18 14:34:45.000000000
+0100
-+++ ImageMagick-6.9.7-0/wand/Wand.pc.in 2016-12-27 08:46:32.786803064
+0100
-@@ -9,7 +9,7 @@
+diff -urNp -x '*.orig' ImageMagick-6.9.11-34.org/wand/Wand.pc.in
ImageMagick-6.9.11-34/wand/Wand.pc.in
+--- ImageMagick-6.9.11-34.org/wand/Wand.pc.in 2020-10-08 15:25:41.000000000
+0200
++++ ImageMagick-6.9.11-34/wand/Wand.pc.in 2021-05-07 22:46:23.866347708
+0200
+@@ -9,7 +9,7 @@ Name: MagickWand
Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
- URL: https://www.imagemagick.org
+ URL: https://github.com/ImageMagick/ImageMagick6
Version: @PACKAGE_VERSION@
-Requires: MagickCore
+Requires: MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/f11853fbc2a1aeb98f8fb9461844ddbbbc287c90
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
