php7: remove obsolete patch for ICU 68.1
authorMichael Heimpold <mhei@heimpold.de>
Sun, 29 Nov 2020 20:59:06 +0000 (21:59 +0100)
committerMichael Heimpold <mhei@heimpold.de>
Sun, 29 Nov 2020 20:59:06 +0000 (21:59 +0100)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
lang/php7/Makefile
lang/php7/patches/1005-support_for_icu4c_68_1.patch [deleted file]

index 725c15c876db328d865f27d4d0c3c64d0093b4f0..762ae268b17e423543c675f82567d5e2c3c6cf7d 100644 (file)
@@ -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
diff --git a/lang/php7/patches/1005-support_for_icu4c_68_1.patch b/lang/php7/patches/1005-support_for_icu4c_68_1.patch
deleted file mode 100644 (file)
index 040dc77..0000000
+++ /dev/null
@@ -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