diff options
| -rw-r--r-- | libraries/qt5/qt5.SlackBuild | 17 | ||||
| -rw-r--r-- | libraries/qt5/qt5.info | 6 |
2 files changed, 14 insertions, 9 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild index 26a2c2d7c302e..7b829ff5f3de4 100644 --- a/libraries/qt5/qt5.SlackBuild +++ b/libraries/qt5/qt5.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for qt5 -# Copyright 2013-2015 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com> # Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -46,7 +46,7 @@ # tailored to Qt 5. Modified by Larry Hajali. PRGNAM=qt5 -VERSION=${VERSION:-5.6.1} +VERSION=${VERSION:-5.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -93,7 +93,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf ${PRGNAM/5/}-everywhere-opensource-src-$VERSION -tar xvf $CWD/${PRGNAM/5/}-everywhere-opensource-src-$VERSION-1.tar.xz +tar xvf $CWD/${PRGNAM/5/}-everywhere-opensource-src-$VERSION.tar.xz cd ${PRGNAM/5/}-everywhere-opensource-src-$VERSION chown -R root:root . find -L . \ @@ -186,7 +186,7 @@ mkdir -p $PKG/usr/bin for BIN in $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin/*; do TMP_FILE=$(echo $BIN | sed -e "s|$PKG||") case $(basename $BIN) in - syncqt.pl) + syncqt.pl|fixqt4headers.pl) ln -s $TMP_FILE $PKG/usr/bin/$(basename $BIN) ;; *) @@ -227,8 +227,10 @@ Version: $VERSION EOF # Fix internal linking for Qt5WebEngineCore.pc. - -sed -i 's|-Wl,--whole-archive.*-Wl,--no-whole-archive||' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc +sed -i \ + -e 's|-Wl,--start-group.* -Wl,--end-group||' \ + -e "s|-L${PWD}/qtwebengine/src/core/api/Release||" \ + $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc # While we are at it, there isn't any reason to keep references to $PKG in the *.prl files. for PRL in $(find $PKG -name "*\.prl"); do @@ -239,6 +241,9 @@ done sed -i "s|$PWD/qtbase|/usr/lib${LIBDIRSUFFIX}/$PRGNAM|" \ $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/mkspecs/modules/qt_lib_bootstrap_private.pri +sed -i "s|-L${PWD}/\w*/lib ||g" \ + $PKG/usr/lib${LIBDIRSUFFIX}/libqgsttools_p.prl + for i in $CWD/desktop/*.desktop; do install -D -m 0644 $i $PKG/usr/share/applications/$(basename $i) done diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info index 6166fadf28cfd..277f0fb44fc9a 100644 --- a/libraries/qt5/qt5.info +++ b/libraries/qt5/qt5.info @@ -1,8 +1,8 @@ PRGNAM="qt5" -VERSION="5.6.1" +VERSION="5.7.1" HOMEPAGE="http://qt-project.org/" -DOWNLOAD="http://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.xz" -MD5SUM="f44fd4fcae71087f90d9c68e9d8be449" +DOWNLOAD="http://download.qt.io/official_releases/qt/5.7/5.7.1/single/qt-everywhere-opensource-src-5.7.1.tar.xz" +MD5SUM="7524ffba8411119d867f673155ec91bc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libxkbcommon" |