2 files changed, 5 insertions, 40 deletions
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;