diff options
Diffstat (limited to 'source/n')
| -rwxr-xr-x | source/n/dovecot/dovecot.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/n/php/php.SlackBuild | 5 | ||||
| -rw-r--r-- | source/n/php/php.icu_68_1.diff | 101 | ||||
| -rwxr-xr-x | source/n/postfix/postfix.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/n/samba/samba.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/n/tin/tin.SlackBuild | 2 |
6 files changed, 109 insertions, 5 deletions
diff --git a/source/n/dovecot/dovecot.SlackBuild b/source/n/dovecot/dovecot.SlackBuild index 1c5dfaff9..7993a195e 100755 --- a/source/n/dovecot/dovecot.SlackBuild +++ b/source/n/dovecot/dovecot.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dovecot VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index 99caf8b78..d842f3bee 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=php VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ALPINE=2.23.2 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -155,6 +155,9 @@ 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 diff --git a/source/n/php/php.icu_68_1.diff b/source/n/php/php.icu_68_1.diff new file mode 100644 index 000000000..95e0c8b0f --- /dev/null +++ b/source/n/php/php.icu_68_1.diff @@ -0,0 +1,101 @@ +--- ./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)) diff --git a/source/n/postfix/postfix.SlackBuild b/source/n/postfix/postfix.SlackBuild index 3cc6375a9..aa8c7ffa7 100755 --- a/source/n/postfix/postfix.SlackBuild +++ b/source/n/postfix/postfix.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=postfix VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index 854483e34..8c09f50cf 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=samba VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -e $CWD/machine.conf ]; then . $CWD/machine.conf ] diff --git a/source/n/tin/tin.SlackBuild b/source/n/tin/tin.SlackBuild index 0fa8b83c6..69a47bd8c 100755 --- a/source/n/tin/tin.SlackBuild +++ b/source/n/tin/tin.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |