Sat Oct 31 01:29:37 UTC 202020201031012937

a/aaa_elflibs-15.0-x86_64-27.txz:  Rebuilt.
  More temporary additions:
  libicudata.so.67.1, libicui18n.so.67.1, libicuio.so.67.1, libicutest.so.67.1,
  libicutu.so.67.1, libicuuc.so.67.1.
a/xfsprogs-5.9.0-x86_64-2.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
ap/sqlite-3.33.0-x86_64-2.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
ap/tmux-3.1c-x86_64-1.txz:  Upgraded.
d/git-2.29.2-x86_64-1.txz:  Upgraded.
d/meson-0.56.0-x86_64-1.txz:  Upgraded.
l/boost-1.74.0-x86_64-3.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
l/harfbuzz-2.7.2-x86_64-2.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
l/icu4c-68.1-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/libical-3.0.8-x86_64-3.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
l/libvisio-0.1.7-x86_64-4.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
l/qt-4.8.7-x86_64-17.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
l/qt5-5.15.1-x86_64-3.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
l/qt5-webkit-5.212.0_alpha4-x86_64-4.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
l/raptor2-2.0.15-x86_64-10.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
l/vte-0.60.3-x86_64-2.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
n/dovecot-2.3.11.3-x86_64-2.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
n/ipset-7.7-x86_64-1.txz:  Upgraded.
n/php-7.4.12-x86_64-2.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
n/postfix-3.5.7-x86_64-3.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
n/samba-4.13.1-x86_64-2.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
n/tin-2.4.4-x86_64-3.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
t/texlive-2020.200608-x86_64-2.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
x/x11-skel-7.7-x86_64-5.txz:  Rebuilt.
  xwmconfig: change blurb from "K Desktop Environment" to "KDE Plasma Desktop".
extra/brltty/brltty-6.1-x86_64-3.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
extra/pure-alsa-system/qt5-5.15.1-x86_64-3_alsa.txz:  Rebuilt.
  Recompiled against icu4c-68.1.
isolinux/initrd.img:  Rebuilt.
  Added libnsl.so.2. Thanks to Olek.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
  Added libnsl.so.2. Thanks to Olek.

2 files changed, 105 insertions, 1 deletions

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))