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.

29 files changed, 243 insertions, 21 deletions

diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index a99d414f5..39972ad3e 100755
--- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=aaa_elflibs
 VERSION=${VERSION:-15.0}
-BUILD=${BUILD:-26}
+BUILD=${BUILD:-27}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
index e2c9ff00a..0a9289aea 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
@@ -28,3 +28,10 @@
 # openexr:
 /usr/lib/libIlmImf-2_2.so.22
 /usr/lib/libIlmImfUtil-2_2.so.22
+# icu4c:
+/usr/lib/libicudata.so.67
+/usr/lib/libicui18n.so.67
+/usr/lib/libicuio.so.67
+/usr/lib/libicutest.so.67
+/usr/lib/libicutu.so.67
+/usr/lib/libicuuc.so.67
diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild
index fe5d5e8f9..1fbf978d3 100755
--- a/source/a/xfsprogs/xfsprogs.SlackBuild
+++ b/source/a/xfsprogs/xfsprogs.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfsprogs
 VERSION=${VERSION:-$(echo xfsprogs-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild
index 6e4df6f07..781f7d40a 100755
--- a/source/ap/sqlite/sqlite.SlackBuild
+++ b/source/ap/sqlite/sqlite.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sqlite
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # First, convert the .zip file if needed:
 if ls *.zip 1> /dev/null 2> /dev/null ; then
diff --git a/source/ap/tmux/tmux.url b/source/ap/tmux/tmux.url
new file mode 100644
index 000000000..199925668
--- /dev/null
+++ b/source/ap/tmux/tmux.url
@@ -0,0 +1 @@
+https://github.com/tmux/tmux
diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild
index 6fc50899b..6e0faba19 100755
--- a/source/d/meson/meson.SlackBuild
+++ b/source/d/meson/meson.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=meson
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index e15dc8cf2..55fdfaffa 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,6 @@
+Fri Oct 30 22:06:27 UTC 2020
+  Add libnsl. Thanks to Olek.
++--------------------------+
 Thu Oct 29 21:50:02 UTC 2020
   Don't build the inetd busybox applet.
 +--------------------------+
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 48268c98c..6c78239ae 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -919,6 +919,7 @@ l/keyutils \
 l/libaio \
 l/libcap \
 l/libidn2 \
+l/libnsl \
 l/libunistring \
 l/libusb \
 l/lzo \
@@ -1235,6 +1236,7 @@ cp  -fa${VERBOSE1} \
         libkrb5support.so* \
         liblzma*so* \
         libmount.so* \
+        libnsl.so* \
         libpam*.so* \
         libpcre.so* \
         libpopt*.so* \
diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild
index 80d32a63e..ebe48488e 100755
--- a/source/l/boost/boost.SlackBuild
+++ b/source/l/boost/boost.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=boost
 VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 PKG_VERSION=$(echo $VERSION | tr _ .)	# Leave this alone
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild
index 4ba20e714..803507eb6 100755
--- a/source/l/harfbuzz/harfbuzz.SlackBuild
+++ b/source/l/harfbuzz/harfbuzz.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=harfbuzz
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild
index 56d880002..85589cc75 100755
--- a/source/l/libical/libical.SlackBuild
+++ b/source/l/libical/libical.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libical
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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
@@ -86,6 +86,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+zcat $CWD/libical.true.false.diff.gz | patch -p1 --verbose || exit 1
+
 mkdir build
 cd build
 cmake \
diff --git a/source/l/libical/libical.true.false.diff b/source/l/libical/libical.true.false.diff
new file mode 100644
index 000000000..c1dda350b
--- /dev/null
+++ b/source/l/libical/libical.true.false.diff
@@ -0,0 +1,17 @@
+--- ./src/libical/icalrecur.c.orig	2020-03-07 08:42:42.000000000 -0600
++++ ./src/libical/icalrecur.c	2020-10-30 03:56:12.509914568 -0500
+@@ -142,6 +142,14 @@
+ #include <stddef.h>     /* For offsetof() macro */
+ #include <stdlib.h>
+ 
++#ifndef FALSE
++#define FALSE (0)
++#endif
++
++#ifndef TRUE
++#define TRUE (!FALSE)
++#endif
++
+ #if defined(HAVE_LIBICU)
+ #include <unicode/ucal.h>
+ #include <unicode/ustring.h>
diff --git a/source/l/libvisio/libvisio.SlackBuild b/source/l/libvisio/libvisio.SlackBuild
index 1e3caad9f..9b39c2d9c 100755
--- a/source/l/libvisio/libvisio.SlackBuild
+++ b/source/l/libvisio/libvisio.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libvisio
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/qt/qt-nowebkit.SlackBuild b/source/l/qt/qt-nowebkit.SlackBuild
index b29a32a2c..f9e08a396 100755
--- a/source/l/qt/qt-nowebkit.SlackBuild
+++ b/source/l/qt/qt-nowebkit.SlackBuild
@@ -43,7 +43,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qt
 VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-16}
+BUILD=${BUILD:-17}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild
index 120b55249..6717b45bd 100755
--- a/source/l/qt5-webkit/qt5-webkit.SlackBuild
+++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild
@@ -28,7 +28,7 @@ PKGNAM=qt5-webkit
 SRCNAM=qtwebkit
 SRCVER=${SRCVER:-5.212.0-alpha4}
 VERSION=$(echo $SRCVER | tr - _)
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -97,6 +97,12 @@ else
   RELOCATIONS=""
 fi
 
+# Fix for icu 68.1 no longer defining TRUE and FALSE externally:
+zcat $CWD/qt5-webkit.icu68_1.diff.gz | patch -p1 --verbose || exit 1
+
+# Fix for bison 3.7.x:
+zcat $CWD/qt5-webkit.bison27.patch.gz | patch -p1 --verbose || exit 1
+
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing"
 export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing"
diff --git a/source/l/qt5-webkit/qt5-webkit.bison27.patch b/source/l/qt5-webkit/qt5-webkit.bison27.patch
new file mode 100644
index 000000000..e8f66ab14
--- /dev/null
+++ b/source/l/qt5-webkit/qt5-webkit.bison27.patch
@@ -0,0 +1,46 @@
+From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Tue, 4 Aug 2020 21:04:06 +0300
+Subject: [PATCH] Let Bison generate the header directly, to fix build with
+ Bison 3.7
+
+Starting with Bison 3.7, the generated C++ file #include's the header
+by default, instead of duplicating it. So we should not delete it.
+
+Remove the code to add #ifdef guards to the header, since Bison adds
+them itself since version 2.6.3.
+---
+ Source/WebCore/css/makegrammar.pl | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl
+index 5d63b08102eb..9435701c7061 100644
+--- a/Source/WebCore/css/makegrammar.pl
++++ b/Source/WebCore/css/makegrammar.pl
+@@ -73,25 +73,6 @@
+ }
+
+ my $fileBase = File::Spec->join($outputDir, $filename);
+-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
+ push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
+ system(@bisonCommand) == 0 or die;
+-
+-open HEADER, ">$fileBase.h" or die;
+-print HEADER << "EOF";
+-#ifndef CSSGRAMMAR_H
+-#define CSSGRAMMAR_H
+-EOF
+-
+-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
+-while (<HPP>) {
+-    print HEADER;
+-}
+-close HPP;
+-
+-print HEADER "#endif\n";
+-close HEADER;
+-
+-unlink("$fileBase.cpp.h");
+-unlink("$fileBase.hpp");
+-
diff --git a/source/l/qt5-webkit/qt5-webkit.icu68_1.diff b/source/l/qt5-webkit/qt5-webkit.icu68_1.diff
new file mode 100644
index 000000000..c15d33aa1
--- /dev/null
+++ b/source/l/qt5-webkit/qt5-webkit.icu68_1.diff
@@ -0,0 +1,34 @@
+--- ./Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 11:16:37.000000000 -0600
++++ ./Source/WebCore/platform/text/icu/UTextProvider.h	2020-10-30 13:33:29.455998691 -0500
+@@ -28,6 +28,14 @@
+ 
+ #include <unicode/utext.h>
+ 
++#ifndef FALSE
++#define FALSE (0)
++#endif
++
++#ifndef TRUE
++#define TRUE (!FALSE)
++#endif
++
+ namespace WebCore {
+ 
+ enum class UTextProviderContext {
+--- ./Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 11:16:37.000000000 -0600
++++ ./Source/WebCore/platform/text/TextCodecICU.cpp	2020-10-30 13:34:33.196995165 -0500
+@@ -39,6 +39,14 @@
+ #include <wtf/text/StringBuilder.h>
+ #include <wtf/unicode/CharacterNames.h>
+ 
++#ifndef FALSE
++#define FALSE (0)
++#endif
++
++#ifndef TRUE
++#define TRUE (!FALSE)
++#endif
++
+ namespace WebCore {
+ 
+ const size_t ConversionBufferSize = 16384;
diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild
index a1c5466d8..fef415dd1 100755
--- a/source/l/qt5/qt5.SlackBuild
+++ b/source/l/qt5/qt5.SlackBuild
@@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qt5
 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 PKGSRC=$(echo $VERSION | cut -d - -f 1)
 PKGVER=$(echo $VERSION | tr - _)
 
diff --git a/source/l/raptor2/raptor2.SlackBuild b/source/l/raptor2/raptor2.SlackBuild
index 18cd705a5..1153263c3 100755
--- a/source/l/raptor2/raptor2.SlackBuild
+++ b/source/l/raptor2/raptor2.SlackBuild
@@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=raptor2
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild
index 9937c9789..2b6d20762 100755
--- a/source/l/vte/vte.SlackBuild
+++ b/source/l/vte/vte.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=vte
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
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
diff --git a/source/t/texlive/texlive.SlackBuild b/source/t/texlive/texlive.SlackBuild
index a9a1b94d7..e0b08a34a 100755
--- a/source/t/texlive/texlive.SlackBuild
+++ b/source/t/texlive/texlive.SlackBuild
@@ -33,7 +33,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=texlive
 SOURCEVERSION=${SOURCEVERSION:-20200327}
 VERSION=${VERSION:-2020.200608}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-texlive
diff --git a/source/x/x11-skel/scripts/xwmconfig b/source/x/x11-skel/scripts/xwmconfig
index a81232f24..3ddbec0b1 100644
--- a/source/x/x11-skel/scripts/xwmconfig
+++ b/source/x/x11-skel/scripts/xwmconfig
@@ -106,7 +106,7 @@ fi
 
 # Add KDE as the first and default entry:
 if [ -r /etc/X11/xinit/xinitrc.kde ]; then
-  echo "\"xinitrc.kde\" \"KDE: K Desktop Environment\" \\" >> $TMP/tmpscript.sh
+  echo "\"xinitrc.kde\" \"KDE: KDE Plasma Desktop\" \\" >> $TMP/tmpscript.sh
 fi
 
 # Then, we add GNOME:
diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild
index 3b2891dba..553e77664 100755
--- a/source/x/x11-skel/x11-skel.SlackBuild
+++ b/source/x/x11-skel/x11-skel.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=x11-skel
 VERSION=7.7
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then