* [gentoo-commits] gentoo-x86 commit in dev-php5/magickwand/files: imagemagick-pre-6.3.8-compat.patch
@ 2008-06-09 15:33 Christian Hoffmann (hoffie)
0 siblings, 0 replies; 3+ messages in thread
From: Christian Hoffmann (hoffie) @ 2008-06-09 15:33 UTC (permalink / raw
To: gentoo-commits
hoffie 08/06/09 15:33:54
Added: imagemagick-pre-6.3.8-compat.patch
Log:
adding patch by Martin von Gagern <Martin.vGagern@gmx.net> (bug 215671) to allow for building against <imagemagick-6.3.8 again and adjust *DEPEND accordingly
(Portage version: 2.1.5.4)
Revision Changes Path
1.1 dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch?rev=1.1&content-type=text/plain
Index: imagemagick-pre-6.3.8-compat.patch
===================================================================
# 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-09 17:08:03.000000000 +0200
@@ -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)
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-php5/magickwand/files: imagemagick-pre-6.3.8-compat.patch
@ 2008-06-12 17:39 Christian Hoffmann (hoffie)
0 siblings, 0 replies; 3+ messages in thread
From: Christian Hoffmann (hoffie) @ 2008-06-12 17:39 UTC (permalink / raw
To: gentoo-commits
hoffie 08/06/12 17:39:19
Modified: imagemagick-pre-6.3.8-compat.patch
Log:
updated patch by Martin von Gagern <Martin.vGagern@gmx.net> (bug 215671), previous version missed some MagickWand-config calls. magickwand-1.0.7 should now really build with <imagemagick-6.3.8
(Portage version: 2.1.5.4)
Revision Changes Path
1.2 dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch?r1=1.1&r2=1.2
Index: imagemagick-pre-6.3.8-compat.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imagemagick-pre-6.3.8-compat.patch 9 Jun 2008 15:33:54 -0000 1.1
+++ imagemagick-pre-6.3.8-compat.patch 12 Jun 2008 17:39:19 -0000 1.2
@@ -2,7 +2,44 @@
# 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-09 17:08:03.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)
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-php5/magickwand/files: imagemagick-pre-6.3.8-compat.patch
@ 2011-04-10 17:38 Ole Markus With (olemarkus)
0 siblings, 0 replies; 3+ messages in thread
From: Ole Markus With (olemarkus) @ 2011-04-10 17:38 UTC (permalink / raw
To: gentoo-commits
olemarkus 11/04/10 17:38:11
Removed: imagemagick-pre-6.3.8-compat.patch
Log:
Moving dev-php5/magickwand to dev-php/magickwand
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-04-10 17:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-12 17:39 [gentoo-commits] gentoo-x86 commit in dev-php5/magickwand/files: imagemagick-pre-6.3.8-compat.patch Christian Hoffmann (hoffie)
-- strict thread matches above, loose matches on Subject: below --
2011-04-10 17:38 Ole Markus With (olemarkus)
2008-06-09 15:33 Christian Hoffmann (hoffie)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox