Update zlib-for-getimagesize.patch

diff --git a/php-zlib-for-getimagesize.patch b/php-zlib-for-getimagesize.patch
index 50a3ec377931ae420617727b11735867b89e712e..a72a4fab943f49224a5bd5825bd5c75012a2a7c2 100644 (file)
--- 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;

diff --git a/php.spec b/php.spec
index 2c02b6f601c69e011d8386bf1aeee4e11b6a38e0..fe359502b20050ca119d16f54f2b80dd0ee327a8 100644 (file)
--- 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