summaryrefslogtreecommitdiff
path: root/libraries/qt4
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-03-02 16:17:11 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-03-03 15:56:43 +0700
commitb049b0a6b1cb3ff7cb9e6322d3338173e17d1b09 (patch)
treeaa834903c63290f4fc5caa738a14fefee9351876 /libraries/qt4
parent8825b64bb78b4b0ca1ede23aa91420e32c6511fd (diff)
downloadslackbuilds-b049b0a6b1cb3ff7cb9e6322d3338173e17d1b09.tar.gz
libraries/qt4: Explicitly disable webkit (it was already missing).
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/qt4')
-rw-r--r--libraries/qt4/README5
-rw-r--r--libraries/qt4/README_SBo.txt14
-rw-r--r--libraries/qt4/qt4.SlackBuild18
3 files changed, 23 insertions, 14 deletions
diff --git a/libraries/qt4/README b/libraries/qt4/README
index 9f12d84edc..a8beb2faee 100644
--- a/libraries/qt4/README
+++ b/libraries/qt4/README
@@ -9,3 +9,8 @@ this for developing new code.
If you're a SBo maintainer working on a script that requires qt4, see
README_SBo.txt for some helpful hints.
+
+This qt4 does *not* include qt4-webkit, and there is no separate
+qt4-webkit SlackBuild. qt4-webkit is outdated, EOLed, and has security
+issues that will never be fixed. Nobody should still be using it at
+this late date.
diff --git a/libraries/qt4/README_SBo.txt b/libraries/qt4/README_SBo.txt
index 869e1c1cde..84ab12b44d 100644
--- a/libraries/qt4/README_SBo.txt
+++ b/libraries/qt4/README_SBo.txt
@@ -19,11 +19,17 @@ What it means for the maintainers of SBo builds that use qt4:
cmake is smart enough to find Qt4 without help from the environment.
For instance, quazip-qt4 didn't need any changes.
-2. Your script should "source /etc/profile.d/qt4.sh" before it
- compiles anything. I recommend putting it right after the "set -e"
- line in the template. An example script that uses this is kardsgt.
+2. If your script uses qmake, replace the qmake command with qmake-qt4.
+ If it also uses lrelease, moc, and/or uic, replace those with the
+ -qt4 versions as well.
-3. If your script refers to any files in $PKG/usr/lib$LIBDIRSUFFIX/qt,
+3. If the above doesn't work, your script should run
+ source /etc/profile.d/qt4.sh
+ before it compiles anything. I recommend putting it right after the
+ "set -e" line in the template. An example script that uses this
+ is kardsgt.
+
+4. If your script refers to any files in $PKG/usr/lib$LIBDIRSUFFIX/qt,
you'll have to change the 'qt' part to 'qt4'. The best way to do
this is to use the $QT4DIR variable: it's defined in qt4.sh (which
you already sourced), and in the unlikely event the qt4 directory
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 \