[packages/php/dev-8.0: 10/12] Update zlib-for-getimagesize.patch

[glen]

commit b886188fa08b76e271d68a1e3759140b389dc8c0
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Fri Oct 9 18:54:48 2020 +0300

    Update zlib-for-getimagesize.patch

 php-zlib-for-getimagesize.patch | 12 ++++++------
 php.spec                        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/php.spec b/php.spec
index 2c02b6f..fe35950 100644
--- a/php.spec
+++ b/php.spec
@@ -1869,7 +1869,7 @@ cp -p php.ini-production php.ini
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-#%patch24 -p1 -b .zlib-for-getimagesize
+%patch24 -p1 -b .zlib-for-getimagesize
 %patch25 -p1
 %patch27 -p1
 %patch29 -p1
diff --git a/php-zlib-for-getimagesize.patch b/php-zlib-for-getimagesize.patch
index 50a3ec3..a72a4fa 100644
--- a/php-zlib-for-getimagesize.patch
+++ b/php-zlib-for-getimagesize.patch
@@ -2,8 +2,8 @@ make compressed .swf parsing possible,
 link core php with -lz for getimagesize()
 see also http://bugs.php.net/bug.php?id=29611
 
---- php-7.0/ext/standard/image.c~	2015-05-21 23:10:45.000000000 +0300
-+++ php-7.0/ext/standard/image.c	2015-05-21 23:11:22.424948534 +0300
+--- php-8.0.0rc1/ext/standard/image.c~	2020-10-09 18:50:01.000000000 +0300
++++ php-8.0.0rc1/ext/standard/image.c	2020-10-09 18:53:44.278879164 +0300
 @@ -31,7 +31,7 @@
  #endif
  #include "php_image.h"
@@ -22,15 +22,15 @@ see also http://bugs.php.net/bug.php?id=29611
  	REGISTER_LONG_CONSTANT("IMAGETYPE_SWC",     IMAGE_FILETYPE_SWC,     CONST_CS | CONST_PERSISTENT);
  #endif	
  	REGISTER_LONG_CONSTANT("IMAGETYPE_IFF",     IMAGE_FILETYPE_IFF,     CONST_CS | CONST_PERSISTENT);
-@@ -184,7 +184,7 @@
+@@ -186,7 +186,7 @@
  }
  /* }}} */
  
 -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 +#if HAVE_ZLIB
- /* {{{ php_handle_swc
-  */
- static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
+ /* {{{ php_handle_swc */
+ static struct gfxinfo *php_handle_swc(php_stream * stream)
+ {
 @@ -1321,7 +1321,7 @@
  			result = php_handle_swf(stream);
  			break;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19