devel obsoletes php70-devel

[packages/php.git] / php-gd_imagerotate_enable.patch

diff --git a/php-gd_imagerotate_enable.patch b/php-gd_imagerotate_enable.patch
index f6533eb48edb49fdfea5a8d52b8f088a3312dce7..09f68b9b340fc278775478fabdb098485420a2e2 100644 (file)
--- a/php-gd_imagerotate_enable.patch
+++ b/php-gd_imagerotate_enable.patch
@@ -1,52 +1,78 @@
---- ./ext/gd/gd.c.org  Fri May 21 01:38:05 2004
-+++ ./ext/gd/gd.c      Thu Aug 12 14:48:38 2004
-@@ -162,8 +162,8 @@
-       PHP_FE(imagecopyresampled,                                              NULL)
+--- php-5.2.0/ext/gd/config.m4.orig    2005-11-29 19:25:59.000000000 +0100
++++ php-5.2.0/ext/gd/config.m4 2006-12-22 23:41:12.363074440 +0100
+@@ -261,6 +261,7 @@
+   PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown,    [AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdFreeFontCache,        [AC_DEFINE(HAVE_GD_FREEFONTCACHE,    1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx,      [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
++  PHP_CHECK_LIBRARY(gd, gdImageRotate,          [AC_DEFINE(HAVE_GD_ROTATE,           1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+ ])
+ 
+ dnl
+@@ -313,6 +314,7 @@
+   AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])
+   AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])
+   AC_DEFINE(HAVE_GD_GIF_CTX,          1, [ ])
++  AC_DEFINE(HAVE_GD_ROTATE,           1, [ ])
+ 
+ dnl Make sure the libgd/ is first in the include path
+   GDLIB_CFLAGS="-DHAVE_LIBPNG"
+--- php-5.2.0/ext/gd/gd.c.orig 2006-10-18 18:04:37.000000000 +0200
++++ php-5.2.0/ext/gd/gd.c      2006-12-22 23:45:04.600308887 +0100
+@@ -314,7 +314,7 @@
+ ZEND_END_ARG_INFO()
  #endif
  
 -#ifdef HAVE_GD_BUNDLED
-       PHP_FE(imagerotate,                                                     NULL)
++#ifdef HAVE_GD_ROTATE
+ static
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3)
+       ZEND_ARG_INFO(0, im)
+@@ -1020,8 +1020,10 @@
+       PHP_FE(imagecopyresampled,                                              arginfo_imagecopyresampled)
+ #endif
+ 
+-#ifdef HAVE_GD_BUNDLED
++#ifdef HAVE_GD_ROTATE
+       PHP_FE(imagerotate,                                                     arginfo_imagerotate)
++#endif
 +#ifdef HAVE_GD_BUNDLED
-       PHP_FE(imageantialias,                                                  NULL)
+       PHP_FE(imageantialias,                                                  arginfo_imageantialias)
  #endif
  
-@@ -361,11 +361,11 @@
+@@ -1248,11 +1250,13 @@
  #ifdef GD2_FMT_COMPRESSED
        REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
  #endif
 -#if HAVE_GD_BUNDLED
++#ifdef HAVE_GD_ROTATE
        REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("IMG_EFFECT_OVERLAY", gdEffectOverlay, CONST_CS | CONST_PERSISTENT);
++#endif
 +#if HAVE_GD_BUNDLED
        REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT);
- #else
-       REGISTER_LONG_CONSTANT("GD_BUNDLED", 0, CONST_CS | CONST_PERSISTENT);
-@@ -1088,7 +1088,6 @@
+       /* Section Filters */
+       REGISTER_LONG_CONSTANT("IMG_FILTER_NEGATE", IMAGE_FILTER_NEGATE, CONST_CS | CONST_PERSISTENT);
+@@ -2055,7 +2059,7 @@
  /* }}} */
  #endif
  
 -#ifdef HAVE_GD_BUNDLED
- /* {{{ proto int imagerotate(int src_im, float angle, int bgdcolor)
++#ifdef HAVE_GD_ROTATE
+ /* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor [, int ignoretransparent])
     Rotate an image using a custom angle */
  PHP_FUNCTION(imagerotate)
-@@ -1118,7 +1117,6 @@
-       }
- }
- /* }}} */
--#endif
- 
- #if HAVE_GD_IMAGESETTILE
- /* {{{ proto int imagesettile(resource image, resource tile)
---- ./ext/gd/php_gd.h.org      Mon Mar 31 10:49:30 2003
-+++ ./ext/gd/php_gd.h  Thu Aug 12 14:46:23 2004
-@@ -103,8 +103,8 @@
+--- php-5.2.0/ext/gd/php_gd.h.orig     2006-01-01 13:50:06.000000000 +0100
++++ php-5.2.0/ext/gd/php_gd.h  2006-12-22 23:42:04.138024927 +0100
+@@ -112,8 +112,10 @@
  PHP_FUNCTION(imagecopyresampled);
  #endif
  
 -#ifdef HAVE_GD_BUNDLED
++#ifdef HAVE_GD_ROTATE
  PHP_FUNCTION(imagerotate);
++#endif
 +#ifdef HAVE_GD_BUNDLED
  PHP_FUNCTION(imageantialias);
  #endif