[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/

[Aaron Bauman]

commit:     d4d35067dee48487ffbb89116d51e8af195d5258
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Apr 19 18:16:30 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 01:29:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d35067

dev-lang/php: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11527
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 ...php-7.1.25-intl-detect-icu-via-pkg-config.patch | 121 --------------------
 .../files/php-7.3.2-fix-iptcembed-bug77546.patch   | 127 ---------------------
 2 files changed, 248 deletions(-)

diff --git a/dev-lang/php/files/php-7.1.25-intl-detect-icu-via-pkg-config.patch b/dev-lang/php/files/php-7.1.25-intl-detect-icu-via-pkg-config.patch
deleted file mode 100644
index 2d4254d6e59..00000000000
--- a/dev-lang/php/files/php-7.1.25-intl-detect-icu-via-pkg-config.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Based on the following upstream commits:
-
-https://github.com/php/php-src/commit/9a8e7b571896f39f83cb000fdb7c466b6d328d52
-https://github.com/php/php-src/pull/3701
-https://github.com/php/php-src/commit/2bd299f7318492fd7e5cafffa562d76ba60e69d4
-
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2205,52 +2205,16 @@ dnl
- dnl Common setup macro for ICU
- dnl
- AC_DEFUN([PHP_SETUP_ICU],[
--  PHP_ARG_WITH(icu-dir,,
--  [  --with-icu-dir=DIR      Specify where ICU libraries and headers can be found], DEFAULT, no)
-+  PKG_CHECK_MODULES([ICU], [icu-io >= 50.1])
- 
--  if test "$PHP_ICU_DIR" = "no"; then
--    PHP_ICU_DIR=DEFAULT
--  fi
--
--  if test "$PHP_ICU_DIR" = "DEFAULT"; then
--    dnl Try to find icu-config
--    AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin])
--  else
--    ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
--  fi
--
--  AC_MSG_CHECKING([for location of ICU headers and libraries])
--
--  dnl Trust icu-config to know better what the install prefix is..
--  icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
--  if test "$?" != "0" || test -z "$icu_install_prefix"; then
--    AC_MSG_RESULT([not found])
--    AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.])
--  else
--    AC_MSG_RESULT([$icu_install_prefix])
--
--    dnl Check ICU version
--    AC_MSG_CHECKING([for ICU 4.0 or greater])
--    icu_version_full=`$ICU_CONFIG --version`
--    ac_IFS=$IFS
--    IFS="."
--    set $icu_version_full
--    IFS=$ac_IFS
--    icu_version=`expr [$]1 \* 1000 + [$]2`
--    AC_MSG_RESULT([found $icu_version_full])
--
--    if test "$icu_version" -lt "4000"; then
--      AC_MSG_ERROR([ICU version 4.0 or later is required])
--    fi
-+  PHP_EVAL_INCLINE($ICU_CFLAGS)
-+  PHP_EVAL_LIBLINE($ICU_LIBS, $1)
- 
--    ICU_VERSION=$icu_version
--    ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
--    ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
--    PHP_EVAL_INCLINE($ICU_INCS)
--    PHP_EVAL_LIBLINE($ICU_LIBS, $1)
-+  ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
-+  ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
- 
--    ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags`
--    ICU_CXXFLAGS="$ICU_CXXFLAGS -DU_USING_ICU_NAMESPACE=1"
-+  if test "$PKG_CONFIG icu-io --atleast-version=60"; then
-+    ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
-   fi
- ])
- 
---- a/ext/intl/config.m4
-+++ b/ext/intl/config.m4
-@@ -9,15 +9,7 @@ if test "$PHP_INTL" != "no"; then
-   PHP_SETUP_ICU(INTL_SHARED_LIBADD)
-   PHP_SUBST(INTL_SHARED_LIBADD)
-   PHP_REQUIRE_CXX()
--  INTL_COMMON_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
--  if test "$icu_version" -ge "4002"; then
--    icu_spoof_src=" spoofchecker/spoofchecker_class.c \
--    spoofchecker/spoofchecker.c\
--    spoofchecker/spoofchecker_create.c\
--    spoofchecker/spoofchecker_main.c"
--  else
--    icu_spoof_src=""
--  fi
-+  INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
-   PHP_NEW_EXTENSION(intl, php_intl.c \
-     intl_error.c \
-     intl_convert.c \
-@@ -68,9 +60,12 @@ if test "$PHP_INTL" != "no"; then
-     transliterator/transliterator_methods.c \
-     uchar/uchar.c \
-     idn/idn.c \
--    $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS,cxx)
-+    spoofchecker/spoofchecker_class.c \
-+    spoofchecker/spoofchecker.c\
-+    spoofchecker/spoofchecker_create.c\
-+    spoofchecker/spoofchecker_main.c, $ext_shared,,$INTL_COMMON_FLAGS,cxx)
- 
--  PHP_INTL_CXX_SOURCES="intl_convertcpp.cpp \
-+  PHP_INTL_CPP_SOURCES="intl_convertcpp.cpp \
-     common/common_enum.cpp \
-     common/common_date.cpp \
-     dateformat/dateformat_format_object.cpp \
-@@ -89,11 +84,12 @@ if test "$PHP_INTL" != "no"; then
-     breakiterator/rulebasedbreakiterator_methods.cpp \
-     breakiterator/codepointiterator_internal.cpp \
-     breakiterator/codepointiterator_methods.cpp"
--  PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $ICU_CXXFLAGS"
-+
-+  PHP_INTL_CPP_FLAGS="$ICU_CXXFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
-   if test "$ext_shared" = "no"; then
--    PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS)
-+    PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS)
-   else
--    PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS, shared_objects_intl, yes)
-+    PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS, shared_objects_intl, yes)
-   fi
- 
-   PHP_ADD_BUILD_DIR($ext_builddir/collator)
--- 
-2.19.2
-

diff --git a/dev-lang/php/files/php-7.3.2-fix-iptcembed-bug77546.patch b/dev-lang/php/files/php-7.3.2-fix-iptcembed-bug77546.patch
deleted file mode 100644
index e157d250f2f..00000000000
--- a/dev-lang/php/files/php-7.3.2-fix-iptcembed-bug77546.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-https://git.php.net/?p=php-src.git;a=commit;h=f27f9022660d28c13c6209f4679768dcbd961b43
-
---- a/ext/standard/iptc.c
-+++ b/ext/standard/iptc.c
-@@ -273,7 +273,7 @@ PHP_FUNCTION(iptcembed)
- 					iptcdata_len++; /* make the length even */
- 				}
- 
--				psheader[ 2 ] = (char) (iptcdata_len+28)>>8;
-+				psheader[ 2 ] = (char) ((iptcdata_len+28)>>8);
- 				psheader[ 3 ] = (iptcdata_len+28)&0xff;
- 
- 				for (inx = 0; inx < 28; inx++) {
---- /dev/null
-+++ b/ext/standard/tests/image/iptcembed_002.phpt
-@@ -0,0 +1,110 @@
-+--TEST--
-+iptcembed() valid jpg stream
-+--FILE--
-+<?php
-+/*
-+# source code to generate base64 use behind as $base64_1x1_jpeg
-+# we don't want to be gd library dependant for this test
-+$file="1x1.jpg";
-+$ret=imagejpeg(imagecreatetruecolor(1, 1), $file, 100);
-+echo md5(file_get_contents($file)).PHP_EOL;
-+echo base64_encode(file_get_contents($file)).PHP_EOL;
-+unlink($file);
-+*/
-+
-+/*
-+test description :
-+1) create local file 1x1 jpeg (without iptc) (use base64 content to create file)
-+2) generate iptcdata string with function iptc_make_tag describe behind
-+3) use iptcembed php function with our 1x1 jpeg file and our iptcdata string
-+4) write local file2 with iptcembed return content
-+5) various check on file2 to verify that's a valid jpeg file with our tags
-+*/
-+
-+
-+#iptc_make_tag function from http://php.net/iptcembed
-+function iptc_make_tag($rec, $data, $value)
-+  {
-+    $length = strlen($value);
-+    $retval = chr(0x1C) . chr($rec) . chr($data);
-+    if($length < 0x8000) { $retval .= chr($length >> 8) .  chr($length & 0xFF); }
-+    else { $retval .= chr(0x80) .  chr(0x04) .  chr(($length >> 24) & 0xFF) .  chr(($length >> 16) & 0xFF) .  chr(($length >> 8) & 0xFF) .  chr($length & 0xFF); }
-+    return $retval . $value;
-+  }
-+
-+
-+$file="1x1.jpg";
-+$file2="1x1_with_iptc_tags.jpg";
-+$base64_1x1_jpeg="/9j/4AAQSkZJRgABAQEAYABgAAD//gA8Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2ODApLCBxdWFsaXR5ID0gMTAwCv/bAEMAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAAEAAQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP8AP/oA/9k=";
-+#write file
-+$fd=fopen($file,"wb");
-+if ($fd) { fputs($fd,base64_decode($base64_1x1_jpeg)); fclose($fd); }
-+else { echo "error cant write $file".PHP_EOL;exit(1); }
-+#check file md5
-+$md5=md5_file($file);
-+if ($md5!="07dd8594450e8c18ab8a79d7cb4573c7") { echo "md5 error".PHP_EOL;exit(1); }
-+#check jpeg properties
-+list($width, $height, $type, $attr) = getimagesize($file,$info);
-+if ($width!=1) { echo "width error".PHP_EOL;exit(1); }
-+if ($height!=1) { echo "height error".PHP_EOL;exit(1); }
-+if ($type!=2) { echo "type error".PHP_EOL;exit(1); }
-+if (!isset($info["APP0"])) { echo "APP0 error".PHP_EOL;exit(1); }
-+
-+#our iptc tags
-+$tags=array();
-+$tags["2#105"]= "Tauren";
-+$tags["2#120"]= "Tauren with Trunk";
-+$tags["2#110"]= "Copyright 2004-2016, Blizzard";
-+$tags["2#025"]= "Tauren, Chaman, Blizzard";
-+$tags["2#090"]= "Thunder Bluffs";
-+#feed iptc string for iptcembed
-+$iptc='';
-+foreach ($tags as $tag => $string) { $rec=$tag[0]; $tag = substr($tag, 2); $iptc .= iptc_make_tag($rec, $tag, $string); }
-+#check iptc string md5
-+if (md5(base64_encode($iptc))!="7056c4b3060f92a4f9e5b7d0caa61859") { echo "iptc md5 error".PHP_EOL;exit(1); }
-+
-+#use iptcembed to get jpeg stream content with iptc tags
-+$content = iptcembed($iptc, $file,0);
-+
-+#write new image with iptc tags
-+if ($content === false) {echo "iptcembed error".PHP_EOL;exit(1); }
-+$fd=fopen($file2,"wb");
-+if ($fd) { fputs($fd,$content); fclose($fd); }
-+else { echo "error cant write $file2".PHP_EOL;exit(1); }
-+
-+
-+#check jpeg properties for new image with iptc tags
-+echo "new generated image with itpc tags : $file2".PHP_EOL;
-+$ret = getimagesize($file2,$info);
-+if ($ret===false) { echo "getimagesize error".PHP_EOL;exit(1); }
-+list($width, $height, $type, $attr) = $ret;
-+if ($width!=1) { echo "width error".PHP_EOL;exit(1); }
-+if ($height!=1) { echo "height error".PHP_EOL;exit(1); }
-+if ($type!=2) { echo "type error".PHP_EOL;exit(1); }
-+if (!isset($info["APP0"])) { echo "APP0 error".PHP_EOL;exit(1); }
-+if (!isset($info["APP13"])) { echo "APP13 error".PHP_EOL;exit(1); }
-+
-+$error=0;
-+$iptc_data_from_created_image = iptcparse($info['APP13']);
-+foreach ($tags as $tag => $string) {
-+  #check if tag exists
-+  if (!isset($iptc_data_from_created_image[$tag])) {
-+    echo "error iptc tag $tag not found".PHP_EOL;
-+    $error++;
-+  } else {
-+    #check value
-+    if ($iptc_data_from_created_image[$tag][0]!=$string) {
-+      echo "error tag $tag : bad value ($string != ".$iptc_data_from_created_image[$tag][0].")".PHP_EOL;
-+      $error++;
-+    }
-+  }
-+}
-+#clean before exit
-+@unlink($file);
-+@unlink($file2);
-+if ($error==0) { echo "OK".PHP_EOL;exit(0);}
-+echo "something wrong: $error errors".PHP_EOL;
-+?>
-+--EXPECT--
-+new generated image with itpc tags : 1x1_with_iptc_tags.jpg
-+OK
---