summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/qt5/qt5.SlackBuild13
-rw-r--r--libraries/qt5/qt5.info6
2 files changed, 12 insertions, 7 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 4ae5722c02..f82f15d1c3 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for qt5
-# Copyright 2013-2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2013-2015 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,8 +46,8 @@
# tailored to Qt 5. Modified by Larry Hajali.
PRGNAM=qt5
-VERSION=${VERSION:-5.4.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.4.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -91,6 +91,11 @@ cd $TMP
rm -rf ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
tar xvf $CWD/${PRGNAM/5/}-everywhere-opensource-src-$VERSION.tar.xz
cd ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
+# Fix dangling symlinks.
+rm -f qtwebengine/src/3rdparty/chromium/third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api
+rm -f qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/perf
+ln -s ../../../../../tools/perf\
+ qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/perf
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -176,7 +181,7 @@ make install INSTALL_ROOT=$PKG
if [ "${DOCS:-no}" == "yes" ]; then
# Recreate Makefiles in order to use the just compiled qdoc.
for doc in $(find . -name "Makefile*" | xargs egrep "^\s/usr/lib${LIBDIRSUFFIX}/qt5/bin/" \
- | cut -d':' -f1)
+ | cut -d':' -f1 | uniq)
do
rm -fv $doc
done
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index 0dcca5c8ba..3081b91900 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,8 +1,8 @@
PRGNAM="qt5"
-VERSION="5.4.0"
+VERSION="5.4.1"
HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.4/5.4.0/single/qt-everywhere-opensource-src-5.4.0.tar.xz"
-MD5SUM="21843b00ecde8956217faab391bc007b"
+DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.4/5.4.1/single/qt-everywhere-opensource-src-5.4.1.tar.xz"
+MD5SUM="7afb5f9235d8d42b5b6e832442a32a5d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""