diff options
Diffstat (limited to 'libraries/qt4/qt4.SlackBuild')
| -rw-r--r-- | libraries/qt4/qt4.SlackBuild | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libraries/qt4/qt4.SlackBuild b/libraries/qt4/qt4.SlackBuild index 50f83718e3..1e813addc3 100644 --- a/libraries/qt4/qt4.SlackBuild +++ b/libraries/qt4/qt4.SlackBuild @@ -36,6 +36,11 @@ # template, and to make it install to /usr/lib(64)?/qt4/ to stay out of # the way. +# 20220302 bkw: webkit already wasn't being built, even with the +# -webkit option passed to configure, so update the script to remove +# the option to disable it (it's always disabled), and update the +# README to document that fact. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qt4 @@ -119,17 +124,10 @@ sed -n -e 's/#.*//' -e '/./p' $CWD/patches/series | while read diff; do patch -p1 < $CWD/patches/$diff done -# 20220124 bkw: allow building without webkit, for my own testing -# (makes the build run a lot faster). I don't support this as a user -# option. If you're clever enough to find this option, you're clever -# enough to know not to complain if it breaks some other builds, right? -WEBKITOPT="-webkit" -[ "${WEBKIT:-yes}" = "no" ] && WEBKITOPT="-no-webkit" -echo "@@@ WEBKITOPT=$WEBKITOPT" - export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks" -export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks" +export OPENSOURCE_CXXFLAGS="$CXXFLAGS" + ./configure \ -confirm-license \ -opensource \ @@ -142,7 +140,7 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -std=gnu++98 -fpermissive -fno-delete-nul -system-sqlite \ -plugin-sql-sqlite \ -dbus \ - -webkit \ + -no-webkit \ -no-phonon \ -nomake examples \ -nomake demos \ |