public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-php/magickwand/files/
@ 2015-09-27 18:45 Michael Orlitzky
  0 siblings, 0 replies; only message in thread
From: Michael Orlitzky @ 2015-09-27 18:45 UTC (permalink / raw
  To: gentoo-commits

commit:     a54a061de90f28e0394ff814d31ac4216ce47af7
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 18:43:31 2015 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 18:43:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54a061d

dev-php/magickwand: remove unused files/imagemagick-pre-6.3.8-compat.patch.

Package-Manager: portage-2.2.20.1

 .../files/imagemagick-pre-6.3.8-compat.patch       | 72 ----------------------
 1 file changed, 72 deletions(-)

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
deleted file mode 100644
index b863430..0000000
--- a/dev-php/magickwand/files/imagemagick-pre-6.3.8-compat.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-# allow usage of <imagemagick-6.3.8, bug 215671
-# patch by Martin von Gagern <Martin.vGagern@gmx.net>
-
---- MagickWandForPHP-1.0.7-1/config.m4	2008-04-13 19:30:55.000000000 +0200
-+++ MagickWandForPHP-1.0.7/config.m4	2008-06-10 11:34:24.000000000 +0200
-@@ -3,30 +3,30 @@
- 
- if test $PHP_MAGICKWAND != "no"; then
- 
--    if test -r $PHP_MAGICKWAND/bin/MagickWand-config; then
-+    if test -r $PHP_MAGICKWAND/bin/Wand-config; then
-         WAND_CONFIG_PATH=$PHP_MAGICKWAND/bin
-     else
--        AC_MSG_CHECKING(MagickWand-config in default path)
-+        AC_MSG_CHECKING(Wand-config in default path)
- 
-         for i in /usr/local /usr;
-         do
--            test -r $i/bin/MagickWand-config && WAND_CONFIG_PATH=$i/bin && break
-+            test -r $i/bin/Wand-config && WAND_CONFIG_PATH=$i/bin && break
-         done
- 
-         if test -z "$WAND_CONFIG_PATH"; then
-             for i in $PHP_MAGICKWAND /usr/local /usr;
-             do
--                test -r $i/MagickWand-config && WAND_CONFIG_PATH=$i && break
-+                test -r $i/Wand-config && WAND_CONFIG_PATH=$i && break
-             done
-         fi
-         if test -z "$WAND_CONFIG_PATH"; then
--            AC_MSG_ERROR(Cannot locate configuration program MagickWand-config)
-+            AC_MSG_ERROR(Cannot locate configuration program Wand-config)
-         else
-             AC_MSG_RESULT(found in $WAND_CONFIG_PATH)
-         fi
-     fi
- 
--		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/MagickWand-config --version`
-+		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/Wand-config --version`
- 		IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- 
- 
-@@ -34,7 +34,7 @@
- 		if test "$IMAGEMAGICK_VERSION_MASK" -ge 6003005; then
- 				AC_MSG_RESULT(found version $IMAGEMAGICK_VERSION_ORIG)
- 		else
--				AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.8 to use MagickWand for PHP.)
-+				AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.5 to use MagickWand for PHP.)
- 		fi
- 
- 		AC_MSG_CHECKING(if PHP version is at least 4.1.3)
-@@ -63,16 +63,13 @@
- 
- 		AC_DEFINE(HAVE_MAGICKWAND,1,[ ])
- 
--		PHP_ADD_LIBRARY_WITH_PATH(MagickCore, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
--		PHP_ADD_LIBRARY_WITH_PATH(MagickWand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
--		PHP_ADD_INCLUDE($WAND_DIR/include/ImageMagick)
--		AC_MSG_CHECKING(MagickWand-config --cppflags)
--		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/MagickWand-config --cppflags`"
-+		AC_MSG_CHECKING(Wand-config --cppflags)
-+		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/Wand-config --cppflags`"
- 		AC_MSG_RESULT($WAND_CPPFLAGS)
- 		PHP_EVAL_INCLINE($WAND_CPPFLAGS)
- 
--		AC_MSG_CHECKING(MagickWand-config --libs)
--		WAND_LIBS="`$WAND_CONFIG_PATH/MagickWand-config --libs`"
-+		AC_MSG_CHECKING(Wand-config --libs)
-+		WAND_LIBS="`$WAND_CONFIG_PATH/Wand-config --libs`"
- 		AC_MSG_RESULT($WAND_LIBS)
- 		PHP_EVAL_LIBLINE($WAND_LIBS, MAGICKWAND_SHARED_LIBADD)
- 


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-09-27 18:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-27 18:45 [gentoo-commits] repo/gentoo:master commit in: dev-php/magickwand/files/ Michael Orlitzky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox