From 7f4dc719f82c5b246e3402e37d730920c722dcb7 Mon Sep 17 00:00:00 2001 From: Dave Woodfall Date: Fri, 10 Apr 2020 15:31:17 +0100 Subject: libraries/qt5-webkit: Updated for version 5.212.0_alpha4. Signed-off-by: Willy Sudiarto Raharjo --- .../platformplugin-install-path-fix.patch | 13 ------ libraries/qt5-webkit/qt5-webkit.SlackBuild | 51 ++++++++-------------- libraries/qt5-webkit/qt5-webkit.info | 8 ++-- 3 files changed, 21 insertions(+), 51 deletions(-) delete mode 100644 libraries/qt5-webkit/platformplugin-install-path-fix.patch diff --git a/libraries/qt5-webkit/platformplugin-install-path-fix.patch b/libraries/qt5-webkit/platformplugin-install-path-fix.patch deleted file mode 100644 index 022166de66905..0000000000000 --- a/libraries/qt5-webkit/platformplugin-install-path-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro ---- qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2013-04-09 00:11:38.000000000 +0000 -+++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2013-05-31 01:18:29.157175082 +0000 -@@ -20,7 +20,8 @@ - } - } - --DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit -+target.path = $$[QT_INSTALL_PLUGINS]/webkit -+INSTALLS += target - - SOURCES += \ - WebPlugin.cpp \ diff --git a/libraries/qt5-webkit/qt5-webkit.SlackBuild b/libraries/qt5-webkit/qt5-webkit.SlackBuild index a13f448a54f72..6255e395b9fd4 100644 --- a/libraries/qt5-webkit/qt5-webkit.SlackBuild +++ b/libraries/qt5-webkit/qt5-webkit.SlackBuild @@ -27,8 +27,10 @@ # Adapted for 5.9.0 by David Woodfall PRGNAM=qt5-webkit -SRCNAM=qtwebkit-opensource-src -VERSION=${VERSION:-5.9.0} +SRCNAM=qtwebkit +VERSION=${VERSION:-5.212.0_alpha4} +SRCDIR=${SRCNAM}-$(echo $VERSION | sed -r "s,\.[[:digit:]]+_.*,,") +SRCVERSION=$(echo v$VERSION | tr -s '_' '-') BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,9 +66,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-$VERSION +rm -rf $SRCDIR +tar xvf $CWD/$SRCNAM-$SRCVERSION.tar.gz +cd $SRCDIR chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -80,40 +82,21 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5" export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" -# Install path fix for libplatformplugin.so. -# https://bugs.webkit.org/show_bug.cgi?id=117077 -patch -p2 < $CWD/platformplugin-install-path-fix.patch - -if [ -d include ]; then - syncqt.pl -version $VERSION Source/sync.profile -fi - -qmake-qt5 PREFIX="/usr" QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \ - -o Makefile WebKit.pro - -make -make install INSTALL_ROOT=$PKG +mkdir -p build +cd build + cmake \ + -DPORT=Qt \ + -DQt5_DIR=$QTDIR \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Fix internal linking for Qt5WebKit.pc -sed -i \ - -e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/Source/WebKit[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/Source/WebKit2[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L${PWD}/Source/WebCore[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/Source/ThirdParty/ANGLE[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/Source/ThirdParty/leveldb[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/Source/JavaScriptCore[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/Source/WTF[^ ]* ||" \ - $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc - -# Fix the path in prl files: -find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ChangeLog* LICENSE* VERSION $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE* README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/qt5-webkit/qt5-webkit.info b/libraries/qt5-webkit/qt5-webkit.info index b53918b710c6c..ecf711f6219cb 100644 --- a/libraries/qt5-webkit/qt5-webkit.info +++ b/libraries/qt5-webkit/qt5-webkit.info @@ -1,10 +1,10 @@ PRGNAM="qt5-webkit" -VERSION="5.9.0" +VERSION="5.212.0_alpha4" HOMEPAGE="https://www.qt.io" -DOWNLOAD="https://download.qt.io/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-5.9.0.tar.xz" -MD5SUM="1fc0ed873cc9326b823a8a83126714f5" +DOWNLOAD="https://github.com/qt/qtwebkit/archive/5.212/qtwebkit-v5.212.0-alpha4.tar.gz" +MD5SUM="cd77f90cbf312f88d23699a65cd76ee4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="qt5" +REQUIRES="qt5 hyphen" MAINTAINER="Dave Woodfall" EMAIL="dave@slackbuilds.org" -- cgit v1.2.3