diff options
Diffstat (limited to 'source/n')
| -rwxr-xr-x | source/n/php/php.SlackBuild | 9 | ||||
| -rw-r--r-- | source/n/php/php.icu_68_1.diff | 101 |
2 files changed, 4 insertions, 106 deletions
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index d842f3be..2e00ce2e 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -155,9 +155,6 @@ zcat $CWD/php-fpm.conf.diff.gz | patch -p1 --verbose || exit 1 # Fix for imap API change: zcat $CWD/php.imap.api.diff.gz | patch -p1 --verbose || exit 1 -# Fix for icu 68.1 no longer defining TRUE and FALSE externally: -zcat $CWD/php.icu_68_1.diff.gz | patch -p1 --verbose || exit 1 - # Install the build folder into /usr/lib$LIBDIRSUFFIX/php/build # and adapt phpize accordingly: sed -i "s|build$|php/build|" scripts/Makefile.frag @@ -167,11 +164,13 @@ sed -i "s|build\"$|php/build\"|" scripts/phpize.in # requirement. See the link below: # http://site.icu-project.org/download/61#TOC-Migration-Issues +# -DU_DEFINE_FALSE_AND_TRUE=1 since recent icu4c no longer defines these otherwise. + # Generic "kitchen sink" configure function, with as many things as possible (and # maybe then some ;-) compiled as shared extensions: EXTENSION_DIR=/usr/lib${LIBDIRSUFFIX}/php/extensions \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \ +CFLAGS="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" \ +CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1 -DU_DEFINE_FALSE_AND_TRUE=1" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/n/php/php.icu_68_1.diff b/source/n/php/php.icu_68_1.diff deleted file mode 100644 index 95e0c8b0..00000000 --- a/source/n/php/php.icu_68_1.diff +++ /dev/null @@ -1,101 +0,0 @@ ---- ./ext/intl/timezone/timezone_class.cpp.orig 2020-10-27 10:01:59.000000000 -0500 -+++ ./ext/intl/timezone/timezone_class.cpp 2020-10-30 04:10:46.429866229 -0500 -@@ -37,6 +37,14 @@ - #include <ext/date/php_date.h> - } - -+#ifndef FALSE -+#define FALSE (0) -+#endif -+ -+#ifndef TRUE -+#define TRUE (!FALSE) -+#endif -+ - using icu::Calendar; - - /* {{{ Global variables */ ---- ./ext/intl/timezone/timezone_methods.cpp.orig 2020-10-27 10:01:59.000000000 -0500 -+++ ./ext/intl/timezone/timezone_methods.cpp 2020-10-30 04:11:06.722865106 -0500 -@@ -38,6 +38,14 @@ - } - #include "common/common_enum.h" - -+#ifndef FALSE -+#define FALSE (0) -+#endif -+ -+#ifndef TRUE -+#define TRUE (!FALSE) -+#endif -+ - using icu::Locale; - using icu::Calendar; - ---- ./ext/intl/normalizer/normalizer_normalize.c.orig 2020-10-27 10:01:59.000000000 -0500 -+++ ./ext/intl/normalizer/normalizer_normalize.c 2020-10-30 04:09:56.149869010 -0500 -@@ -30,6 +30,13 @@ - #include "intl_convert.h" - #include <unicode/utf8.h> - -+#ifndef FALSE -+#define FALSE (0) -+#endif -+ -+#ifndef TRUE -+#define TRUE (!FALSE) -+#endif - - #if U_ICU_VERSION_MAJOR_NUM >= 56 - static const UNormalizer2 *intl_get_normalizer(zend_long form, UErrorCode *err) ---- ./ext/intl/collator/collator_sort.c.orig 2020-10-27 10:01:59.000000000 -0500 -+++ ./ext/intl/collator/collator_sort.c 2020-10-30 04:09:12.468871426 -0500 -@@ -26,6 +26,14 @@ - #include "collator_convert.h" - #include "intl_convert.h" - -+#ifndef FALSE -+#define FALSE (0) -+#endif -+ -+#ifndef TRUE -+#define TRUE (!FALSE) -+#endif -+ - #if !defined(HAVE_PTRDIFF_T) && !defined(_PTRDIFF_T_DEFINED) - typedef zend_long ptrdiff_t; - #endif ---- ./ext/intl/dateformat/dateformat_attr.c.orig 2020-10-27 10:01:59.000000000 -0500 -+++ ./ext/intl/dateformat/dateformat_attr.c 2020-10-30 04:10:23.069867521 -0500 -@@ -26,6 +26,14 @@ - #include <unicode/ustring.h> - #include <unicode/udat.h> - -+#ifndef FALSE -+#define FALSE (0) -+#endif -+ -+#ifndef TRUE -+#define TRUE (!FALSE) -+#endif -+ - /* {{{ proto unicode IntlDateFormatter::getDateType( ) - * Get formatter datetype. }}} */ - /* {{{ proto string datefmt_get_datetype( IntlDateFormatter $mf ) ---- ./ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2020-10-27 10:01:59.000000000 -0500 -+++ ./ext/intl/breakiterator/codepointiterator_internal.cpp 2020-10-30 04:11:32.563863677 -0500 -@@ -27,6 +27,14 @@ - void *t3; - } UAlignedMemory; - -+#ifndef FALSE -+#define FALSE (0) -+#endif -+ -+#ifndef TRUE -+#define TRUE (!FALSE) -+#endif -+ - #define U_POINTER_MASK_LSB(ptr, mask) (((ptrdiff_t)(char *)(ptr)) & (mask)) - #define U_ALIGNMENT_OFFSET(ptr) U_POINTER_MASK_LSB(ptr, sizeof(UAlignedMemory) - 1) - #define U_ALIGNMENT_OFFSET_UP(ptr) (sizeof(UAlignedMemory) - U_ALIGNMENT_OFFSET(ptr)) |