diff options
| author | Remi Collet <remi@remirepo.net> | 2019-09-11 10:15:05 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-09-11 10:15:05 +0200 |
| commit | 1c7d937659c90828a520b152e9ffeddd70a5c9c6 (patch) | |
| tree | 70f4ea9695a23c3978c26ecb3025bb4ba861b933 | |
| parent | f1735bdbf5c52573a480f94c52679c9e6e1b7844 (diff) | |
drop patch merged in new tag
| -rw-r--r-- | c43fc204b1639a8aa6c6212202def29b3c4cf611.patch | 32 | ||||
| -rw-r--r-- | php.spec | 2 |
2 files changed, 0 insertions, 34 deletions
diff --git a/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch b/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch deleted file mode 100644 index c641f80..0000000 --- a/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c43fc204b1639a8aa6c6212202def29b3c4cf611 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Tue, 10 Sep 2019 16:28:35 +0200 -Subject: [PATCH] Raise minimal GCC version, Test with 4.8 is OK With 4.4: - error: #pragma GCC diagnostic not allowed inside functions - ---- - ext/intl/idn/idn.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c -index 60d7b829d84e..96eac77048a0 100644 ---- a/ext/intl/idn/idn.c -+++ b/ext/intl/idn/idn.c -@@ -226,7 +226,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, - #if defined(__clang__) - # pragma clang diagnostic push - # pragma clang diagnostic ignored "-Wdeprecated-declarations" --#elif ZEND_GCC_VERSION >= 4002 -+#elif ZEND_GCC_VERSION >= 4008 - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -@@ -237,7 +237,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, - } - #if defined(__clang__) - # pragma clang diagnostic pop --#elif ZEND_GCC_VERSION >= 4002 -+#elif ZEND_GCC_VERSION >= 4008 - # pragma GCC diagnostic pop - #endif - efree(ustring); @@ -192,7 +192,6 @@ Patch48: php-7.3.3-pdooci.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) -Patch100: https://github.com/php/php-src/commit/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch # Security fixes (200+) @@ -953,7 +952,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .up # security patches |