SOURCES (DEVEL): php-gd_imagerotate_enable.patch, php-nohttpd.patc...

arekm arekm at pld-linux.org
Thu Aug 25 15:51:06 CEST 2005


Author: arekm                        Date: Thu Aug 25 13:51:06 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- up for 5.1rc1 (we loose one parameter to imagereotate unfortunately)

---- Files affected:
SOURCES:
   php-gd_imagerotate_enable.patch (1.2 -> 1.2.2.1) , php-nohttpd.patch (1.1 -> 1.1.4.1) 

---- Diffs:

================================================================
Index: SOURCES/php-gd_imagerotate_enable.patch
diff -u SOURCES/php-gd_imagerotate_enable.patch:1.2 SOURCES/php-gd_imagerotate_enable.patch:1.2.2.1
--- SOURCES/php-gd_imagerotate_enable.patch:1.2	Mon Oct 18 14:25:34 2004
+++ SOURCES/php-gd_imagerotate_enable.patch	Thu Aug 25 15:51:00 2005
@@ -1,5 +1,6 @@
---- ./ext/gd/gd.c.org	2004-08-17 01:08:56.000000000 +0200
-+++ ./ext/gd/gd.c	2004-10-18 14:24:15.797275104 +0200
+diff -urbB php-5.1.0RC1.org/ext/gd/gd.c php-5.1.0RC1/ext/gd/gd.c
+--- php-5.1.0RC1.org/ext/gd/gd.c	2005-08-25 15:26:22.317049000 +0200
++++ php-5.1.0RC1/ext/gd/gd.c	2005-08-25 15:27:37.644598376 +0200
 @@ -209,8 +209,8 @@
  	PHP_FE(imagecopyresampled,						NULL)
  #endif
@@ -10,7 +11,7 @@
  	PHP_FE(imageantialias,							NULL)
  #endif
  
-@@ -416,11 +416,11 @@
+@@ -429,11 +429,11 @@
  #ifdef GD2_FMT_COMPRESSED
  	REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
  #endif
@@ -23,7 +24,7 @@
  	REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT);
  	/* Section Filters */
  	REGISTER_LONG_CONSTANT("IMG_FILTER_NEGATE", IMAGE_FILTER_NEGATE, CONST_CS | CONST_PERSISTENT);
-@@ -1191,7 +1191,6 @@
+@@ -1204,7 +1204,6 @@
  /* }}} */
  #endif
  
@@ -31,7 +32,16 @@
  /* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor)
     Rotate an image using a custom angle */
  PHP_FUNCTION(imagerotate)
-@@ -1221,7 +1220,6 @@
+@@ -1221,7 +1220,7 @@
+ 
+ 	ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd);
+ 
+-	im_dst = gdImageRotate(im_src, degrees, color, ignoretransparent);
++	im_dst = gdImageRotate(im_src, degrees, color);
+ 
+ 	if (im_dst != NULL) {
+ 		ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd);
+@@ -1230,7 +1229,6 @@
  	}
  }
  /* }}} */
@@ -39,8 +49,10 @@
  
  #if HAVE_GD_IMAGESETTILE
  /* {{{ proto bool imagesettile(resource image, resource tile)
---- ./ext/gd/php_gd.h.org	2004-01-08 18:32:08.000000000 +0100
-+++ ./ext/gd/php_gd.h	2004-10-18 14:24:34.372451248 +0200
+Tylko w php-5.1.0RC1/ext/gd: gd.c.orig
+diff -urbB php-5.1.0RC1.org/ext/gd/php_gd.h php-5.1.0RC1/ext/gd/php_gd.h
+--- php-5.1.0RC1.org/ext/gd/php_gd.h	2005-08-25 15:26:22.366042000 +0200
++++ php-5.1.0RC1/ext/gd/php_gd.h	2005-08-25 15:27:37.645598224 +0200
 @@ -103,8 +103,8 @@
  PHP_FUNCTION(imagecopyresampled);
  #endif

================================================================
Index: SOURCES/php-nohttpd.patch
diff -u SOURCES/php-nohttpd.patch:1.1 SOURCES/php-nohttpd.patch:1.1.4.1
--- SOURCES/php-nohttpd.patch:1.1	Fri Jul 30 07:54:01 2004
+++ SOURCES/php-nohttpd.patch	Thu Aug 25 15:51:01 2005
@@ -1,14 +1,15 @@
---- php-4.3.8/sapi/apache2handler/config.m4.orig	2003-07-16 07:46:46.000000000 +0200
-+++ php-4.3.8/sapi/apache2handler/config.m4	2004-07-30 00:45:48.301382112 +0200
-@@ -52,9 +52,9 @@
+diff -urBb php-5.1.0RC1.org/sapi/apache2handler/config.m4 php-5.1.0RC1/sapi/apache2handler/config.m4
+--- php-5.1.0RC1.org/sapi/apache2handler/config.m4	2005-08-05 10:14:54.000000000 +0200
++++ php-5.1.0RC1/sapi/apache2handler/config.m4	2005-08-25 15:09:38.486655320 +0200
+@@ -58,9 +58,9 @@
  
    # Test that we're trying to configure with apache 2.x
    PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
 -  if test "$APACHE_VERSION" -le 2000000; then
-+  if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then
++  if test "$APACHE_VERSION" -gt 0 -a -le 2000000; then
      AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)])
 -  elif test "$APACHE_VERSION" -lt 2000044; then
-+  elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then
-     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required.])
++  elif test "$APACHE_VERSION" -gt 0 -a -lt 2000044; then
+     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
    fi
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-gd_imagerotate_enable.patch?r1=1.2&r2=1.2.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/php-nohttpd.patch?r1=1.1&r2=1.1.4.1&f=u




More information about the pld-cvs-commit mailing list