diff options
Diffstat (limited to 'libraries/qt5/qt5.SlackBuild')
| -rw-r--r-- | libraries/qt5/qt5.SlackBuild | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild index e0d820ba7d..493de8d248 100644 --- a/libraries/qt5/qt5.SlackBuild +++ b/libraries/qt5/qt5.SlackBuild @@ -46,8 +46,8 @@ # tailored to Qt 5. Modified by Larry Hajali. PRGNAM=qt5 -VERSION=${VERSION:-5.5.1} -BUILD=${BUILD:-3} +VERSION=${VERSION:-5.6.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -101,13 +101,6 @@ find -L . \ # Slackware patch to build against MySQL/MariaDB. patch -p1 < $CWD/patches/qt5.mysql.h.diff -# Install path fix for libplatformplugin.so. -# https://bugs.webkit.org/show_bug.cgi?id=117077 -patch -p1 < $CWD/patches/platformplugin-install-path-fix.patch - -# Prevent cropped video in full-screen mode (QTBUG-48321). -patch -p1 < $CWD/patches/qt5.whandle.patch - # Patch for the newer mozilla-nss patch -p1 < $CWD/patches/nss-update-sslv3-nonce.patch @@ -227,16 +220,7 @@ Description: Qt5 Configuration Version: $VERSION EOF -# Fix internal linking for Qt5WebKit.pc and Qt5WebEngineCore.pc. -sed -i \ - -e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit2[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebCore[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/ANGLE[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/JavaScriptCore[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WTF[^ ]* ||" \ - -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \ - $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc +# Fix internal linking for Qt5WebEngineCore.pc. sed -i 's|-Wl,--whole-archive.*-Wl,--no-whole-archive||' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc |