From 642e439a17df32296874acb62b85fcb1e11b5ba0 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 3 Nov 2020 03:31:08 +0000
Subject: Tue Nov  3 03:31:08 UTC 2020

ap/man-pages-5.09-noarch-1.txz:  Upgraded.
d/mercurial-5.6-x86_64-1.txz:  Upgraded.
---
 source/l/libical/libical.SlackBuild         |  6 ++---
 source/l/libical/libical.true.false.diff    | 17 ---------------
 source/l/qt5-webkit/qt5-webkit.SlackBuild   | 11 +++++-----
 source/l/qt5-webkit/qt5-webkit.icu68_1.diff | 34 -----------------------------
 4 files changed, 8 insertions(+), 60 deletions(-)
 delete mode 100644 source/l/libical/libical.true.false.diff
 delete mode 100644 source/l/qt5-webkit/qt5-webkit.icu68_1.diff

(limited to 'source/l')

diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild
index 85589cc75..64225acc9 100755
--- a/source/l/libical/libical.SlackBuild
+++ b/source/l/libical/libical.SlackBuild
@@ -86,13 +86,13 @@ 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
+# -DU_DEFINE_FALSE_AND_TRUE=1 since recent icu4c no longer defines these otherwise.
 
 mkdir build
 cd build
 cmake \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DMAN_INSTALL_DIR=/usr/man \
   -DSYSCONF_INSTALL_DIR=/etc \
diff --git a/source/l/libical/libical.true.false.diff b/source/l/libical/libical.true.false.diff
deleted file mode 100644
index c1dda350b..000000000
--- a/source/l/libical/libical.true.false.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./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/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild
index 6717b45bd..9f56e5c90 100755
--- a/source/l/qt5-webkit/qt5-webkit.SlackBuild
+++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild
@@ -97,15 +97,14 @@ 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"
+# -DU_DEFINE_FALSE_AND_TRUE=1 since recent icu4c no longer defines these otherwise.
+
+export CFLAGS="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1"
+export CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing -DU_DEFINE_FALSE_AND_TRUE=1"
+export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing -DU_DEFINE_FALSE_AND_TRUE=1"
 export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5"
 export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
 
diff --git a/source/l/qt5-webkit/qt5-webkit.icu68_1.diff b/source/l/qt5-webkit/qt5-webkit.icu68_1.diff
deleted file mode 100644
index c15d33aa1..000000000
--- a/source/l/qt5-webkit/qt5-webkit.icu68_1.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./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;
-- 
cgit v1.2.3