From: Michael Heimpold Date: Sun, 29 Nov 2020 20:59:06 +0000 (+0100) Subject: php7: remove obsolete patch for ICU 68.1 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=110ea1b994484592b1567f1a6239760b396638c6;p=feed%2Fpackages.git php7: remove obsolete patch for ICU 68.1 Signed-off-by: Michael Heimpold --- diff --git a/lang/php7/Makefile b/lang/php7/Makefile index 725c15c876..762ae268b1 100644 --- 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 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 index 040dc77762..0000000000 --- a/lang/php7/patches/1005-support_for_icu4c_68_1.patch +++ /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