Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/magickwand/files/
Date: Sun, 27 Sep 2015 18:46:07
Message-Id: 1443379433.a54a061de90f28e0394ff814d31ac4216ce47af7.mjo@gentoo
1 commit: a54a061de90f28e0394ff814d31ac4216ce47af7
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 27 18:43:31 2015 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 27 18:43:53 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54a061d
7
8 dev-php/magickwand: remove unused files/imagemagick-pre-6.3.8-compat.patch.
9
10 Package-Manager: portage-2.2.20.1
11
12 .../files/imagemagick-pre-6.3.8-compat.patch | 72 ----------------------
13 1 file changed, 72 deletions(-)
14
15 diff --git a/dev-php/magickwand/files/imagemagick-pre-6.3.8-compat.patch b/dev-php/magickwand/files/imagemagick-pre-6.3.8-compat.patch
16 deleted file mode 100644
17 index b863430..0000000
18 --- a/dev-php/magickwand/files/imagemagick-pre-6.3.8-compat.patch
19 +++ /dev/null
20 @@ -1,72 +0,0 @@
21 -# allow usage of <imagemagick-6.3.8, bug 215671
22 -# patch by Martin von Gagern <Martin.vGagern@×××.net>
23 -
24 ---- MagickWandForPHP-1.0.7-1/config.m4 2008-04-13 19:30:55.000000000 +0200
25 -+++ MagickWandForPHP-1.0.7/config.m4 2008-06-10 11:34:24.000000000 +0200
26 -@@ -3,30 +3,30 @@
27 -
28 - if test $PHP_MAGICKWAND != "no"; then
29 -
30 -- if test -r $PHP_MAGICKWAND/bin/MagickWand-config; then
31 -+ if test -r $PHP_MAGICKWAND/bin/Wand-config; then
32 - WAND_CONFIG_PATH=$PHP_MAGICKWAND/bin
33 - else
34 -- AC_MSG_CHECKING(MagickWand-config in default path)
35 -+ AC_MSG_CHECKING(Wand-config in default path)
36 -
37 - for i in /usr/local /usr;
38 - do
39 -- test -r $i/bin/MagickWand-config && WAND_CONFIG_PATH=$i/bin && break
40 -+ test -r $i/bin/Wand-config && WAND_CONFIG_PATH=$i/bin && break
41 - done
42 -
43 - if test -z "$WAND_CONFIG_PATH"; then
44 - for i in $PHP_MAGICKWAND /usr/local /usr;
45 - do
46 -- test -r $i/MagickWand-config && WAND_CONFIG_PATH=$i && break
47 -+ test -r $i/Wand-config && WAND_CONFIG_PATH=$i && break
48 - done
49 - fi
50 - if test -z "$WAND_CONFIG_PATH"; then
51 -- AC_MSG_ERROR(Cannot locate configuration program MagickWand-config)
52 -+ AC_MSG_ERROR(Cannot locate configuration program Wand-config)
53 - else
54 - AC_MSG_RESULT(found in $WAND_CONFIG_PATH)
55 - fi
56 - fi
57 -
58 -- IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/MagickWand-config --version`
59 -+ IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/Wand-config --version`
60 - IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
61 -
62 -
63 -@@ -34,7 +34,7 @@
64 - if test "$IMAGEMAGICK_VERSION_MASK" -ge 6003005; then
65 - AC_MSG_RESULT(found version $IMAGEMAGICK_VERSION_ORIG)
66 - else
67 -- AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.8 to use MagickWand for PHP.)
68 -+ AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.5 to use MagickWand for PHP.)
69 - fi
70 -
71 - AC_MSG_CHECKING(if PHP version is at least 4.1.3)
72 -@@ -63,16 +63,13 @@
73 -
74 - AC_DEFINE(HAVE_MAGICKWAND,1,[ ])
75 -
76 -- PHP_ADD_LIBRARY_WITH_PATH(MagickCore, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
77 -- PHP_ADD_LIBRARY_WITH_PATH(MagickWand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
78 -- PHP_ADD_INCLUDE($WAND_DIR/include/ImageMagick)
79 -- AC_MSG_CHECKING(MagickWand-config --cppflags)
80 -- WAND_CPPFLAGS="`$WAND_CONFIG_PATH/MagickWand-config --cppflags`"
81 -+ AC_MSG_CHECKING(Wand-config --cppflags)
82 -+ WAND_CPPFLAGS="`$WAND_CONFIG_PATH/Wand-config --cppflags`"
83 - AC_MSG_RESULT($WAND_CPPFLAGS)
84 - PHP_EVAL_INCLINE($WAND_CPPFLAGS)
85 -
86 -- AC_MSG_CHECKING(MagickWand-config --libs)
87 -- WAND_LIBS="`$WAND_CONFIG_PATH/MagickWand-config --libs`"
88 -+ AC_MSG_CHECKING(Wand-config --libs)
89 -+ WAND_LIBS="`$WAND_CONFIG_PATH/Wand-config --libs`"
90 - AC_MSG_RESULT($WAND_LIBS)
91 - PHP_EVAL_LIBLINE($WAND_LIBS, MAGICKWAND_SHARED_LIBADD)
92 -