summaryrefslogtreecommitdiffstats
path: root/source/l/qt5-webkit/qt5-webkit.SlackBuild
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-11-03 03:31:08 +0000
committer Eric Hameleers <alien@slackware.com>2020-11-03 08:59:53 +0100
commit642e439a17df32296874acb62b85fcb1e11b5ba0 (patch)
tree749619caa261bd89896b4e53fe7b0883f1699af5 /source/l/qt5-webkit/qt5-webkit.SlackBuild
parentaa634efe5a78c33a306ff44591590c32d829de80 (diff)
downloadcurrent-1a77c59868402562046dc1fa641deb7280e273be.tar.gz
current-1a77c59868402562046dc1fa641deb7280e273be.tar.xz
Tue Nov 3 03:31:08 UTC 202020201103033108
ap/man-pages-5.09-noarch-1.txz: Upgraded. d/mercurial-5.6-x86_64-1.txz: Upgraded.
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 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}"