summaryrefslogtreecommitdiffstats
path: root/source/l/qt5-webkit/qt5-webkit.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/qt5-webkit/qt5-webkit.SlackBuild')
-rwxr-xr-xsource/l/qt5-webkit/qt5-webkit.SlackBuild11
1 files changed, 5 insertions, 6 deletions
diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild
index 6717b45b..9f56e5c9 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}"