summaryrefslogtreecommitdiffstats
path: root/deps
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-07-11 23:50:39 +0200
committer Eric Hameleers <alien@slackware.com>2019-07-11 23:50:39 +0200
commitc7ef9543e025cdce7621138115d0bde6514c63d4 (patch)
tree48c2ba1fb1430c7897971c7bff7f5ba2e009a50b /deps
parent536c9463ecba71c4759f0c17c975a2d58b65542e (diff)
downloadktown-c7ef9543e025cdce7621138115d0bde6514c63d4.tar.gz
ktown-c7ef9543e025cdce7621138115d0bde6514c63d4.tar.xz
Deps: update qt5-webkit
Diffstat (limited to 'deps')
-rw-r--r--deps/qt5-webkit/.deps3
-rw-r--r--deps/qt5-webkit/.url2
-rwxr-xr-xdeps/qt5-webkit/qt5-webkit.SlackBuild19
3 files changed, 7 insertions, 17 deletions
diff --git a/deps/qt5-webkit/.deps b/deps/qt5-webkit/.deps
new file mode 100644
index 0000000..14ae13d
--- /dev/null
+++ b/deps/qt5-webkit/.deps
@@ -0,0 +1,3 @@
+qt5
+hyphen
+woff2
diff --git a/deps/qt5-webkit/.url b/deps/qt5-webkit/.url
index 43978c6..0037258 100644
--- a/deps/qt5-webkit/.url
+++ b/deps/qt5-webkit/.url
@@ -1 +1 @@
-https://github.com/annulen/webkit/releases/download/qtwebkit-5.212.0-alpha2/qtwebkit-5.212.0-alpha2.tar.xz
+https://github.com/annulen/webkit/releases/download/qtwebkit-5.212.0-alpha3/qtwebkit-5.212.0-alpha3.tar.xz
diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild
index 31e6608..d343a87 100755
--- a/deps/qt5-webkit/qt5-webkit.SlackBuild
+++ b/deps/qt5-webkit/qt5-webkit.SlackBuild
@@ -25,9 +25,9 @@
# Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1, 5.9.0, 5.9.1, 5.212 2016, 2017, 2018, 2019 by Eric Hameleers, Eindhoven, NL
PKGNAM=qt5-webkit
-SRCVER=${SRCVER:-"5.212.0-alpha2"}
+SRCVER=${SRCVER:-"5.212.0-alpha3"}
VERSION=$(echo $SRCVER | tr - _)
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
@@ -82,9 +82,6 @@ echo "Extracting qtwebkit-$SRCVER.tar.xz"
tar xf $CWD/qtwebkit-$SRCVER.tar.xz || exit 1
cd qtwebkit-$SRCVER || exit 1
-# Prevent crashes when compiled with gcc7:
-cat $CWD/patches/qt5-webkit.gcc7.patch | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -111,7 +108,7 @@ cd build
cmake .. \
-DPORT=Qt \
-DQt5_DIR=$QTDIR \
- -DCMAKE_BUILD_TYPE=Release
+ || exit 1
make ${NUMJOBS} || make || exit 1
make install DESTDIR=$PKG || exit 1
cd ..
@@ -124,16 +121,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-# Fix pkgconfig files:
-sed \
- -e 's|qt5/Qt5WebKit|qt5/QtWebKit|' \
- -e '/Name/a Description: Qt WebKit module' \
- -i $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc
-sed \
- -e 's|qt5/Qt5WebKitWidgets|qt5/QtWebKitWidgets|' \
- -e '/Name/a Description: Qt WebKitWidgets module' \
- -i $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKitWidgets.pc
-
# Add a documentation directory:
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \