From 71212559c9506cdceefcc9b10af7228f8e0837dc Mon Sep 17 00:00:00 2001
From: Larry Hajali
Date: Sun, 28 Jun 2015 11:34:03 +0700
Subject: libraries/qt5: Updated for version 5.4.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/qt5/qt5.SlackBuild | 13 +++++++------
 libraries/qt5/qt5.info       |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'libraries/qt5')

diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index f82f15d1c3..4896c2c8ec 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -46,7 +46,7 @@
 # tailored to Qt 5. Modified by Larry Hajali.
 
 PRGNAM=qt5
-VERSION=${VERSION:-5.4.1}
+VERSION=${VERSION:-5.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -170,6 +170,7 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
   -no-rpath \
   -no-strip \
   -release \
+  -no-use-gold-linker \
   $RELOCATIONS \
   $PULSE \
   $BUILD_EXAMPLES
@@ -250,7 +251,7 @@ sed -i \
   $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc
 
 # While we are at it, there isn't any reason to keep references to $PKG in the *.prl files.
-for PRL in $PKG/usr/lib${LIBDIRSUFFIX}/*.prl; do
+for PRL in $(find $PKG -name "*\.prl"); do
   sed -i '/^QMAKE_PRL_BUILD_DIR/d' $PRL
 done
 
@@ -275,14 +276,14 @@ sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/*
 #done
 
 install -D -m 0644 qttools/src/assistant/assistant/images/assistant-128.png \
-  $PKG/usr/share/icons/hicolor/128x128/apps/assistant.png
+  $PKG/usr/share/icons/hicolor/128x128/apps/assistant-qt5.png
 install -D -m 0644 qttools/src/designer/src/designer/images/designer.png \
-  $PKG/usr/share/icons/hicolor/128x128/apps/designer.png
+  $PKG/usr/share/icons/hicolor/128x128/apps/designer-qt5.png
 install -D -m 0644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-  $PKG/usr/share/icons/hicolor/128x128/apps/qdbusviewer.png
+  $PKG/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt5.png
 for i in 16 32 48 64 128; do
   install -D -m 0644 qttools/src/linguist/linguist/images/icons/linguist-${i}-32.png \
-    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/linguist.png
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/linguist-qt5.png
 done
 
 # Remove executable bits from files.
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index 3081b91900..09e30d0979 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qt5"
-VERSION="5.4.1"
+VERSION="5.4.2"
 HOMEPAGE="http://qt-project.org/"
-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="http://download.qt-project.org/official_releases/qt/5.4/5.4.2/single/qt-everywhere-opensource-src-5.4.2.tar.xz"
+MD5SUM="c23bd0f14d66e7901d24906a1edce9b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3