php7: remove obsolete patch for ICU 68.1

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2020-11-29 21:59:06 +01:00 · 2020-11-29 21:59:06 +01:00 · 110ea1b994
commit 110ea1b994
parent 4fad6e2dc1
2 changed files with 1 additions and 14 deletions
--- a/lang/php7/Makefile
+++ b/lang/php7/Makefile
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=php
 PKG_VERSION:=7.4.13
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 PKG_LICENSE:=PHP-3.01
--- a/lang/php7/patches/1005-support_for_icu4c_68_1.patch
+++ b/lang/php7/patches/1005-support_for_icu4c_68_1.patch
@ -1,13 +0,0 @@
--- a/build/php.m4	2020-10-28 00:01:52.000000000 +0900
-+++ b/build/php.m4	2020-11-13 08:57:27.939303216 +0900
-@@ -1907,6 +1907,10 @@
-   if test "$PKG_CONFIG icu-io --atleast-version=60"; then
-     ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
-   fi
-+
-+  if test "$PKG_CONFIG icu-io --atleast-version=68"; then
-+    ICU_CFLAGS="$ICU_CFLAGS -DU_DEFINE_FALSE_AND_TRUE=1"
-+  fi
- ])
- 
- dnl