aboutsummaryrefslogtreecommitdiff
path: root/libraries/qt5/qt5.SlackBuild
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja@gmail.com>2014-03-09 21:02:03 +0700
committerErik Hanson <erik@slackbuilds.org>2014-03-12 12:42:49 -0500
commitd12fae17df32c71b2ff3b9e8947f3b13c2e2df75 (patch)
treebf820e84d106b6e25a51f4e6fc04d1524728eb32 /libraries/qt5/qt5.SlackBuild
parent54953c193ca5086831dc387a8328e2369508f940 (diff)
libraries/qt5: Updated for version 5.2.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/qt5/qt5.SlackBuild')
-rw-r--r--libraries/qt5/qt5.SlackBuild9
1 files changed, 3 insertions, 6 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index a321974f8ad98..14f7cc7f77313 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.2.0}
+VERSION=${VERSION:-5.2.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -94,7 +94,7 @@ cd ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
@@ -105,9 +105,6 @@ patch -p1 < $CWD/patches/qt5.mysql.h.diff
# https://bugs.webkit.org/show_bug.cgi?id=117077
patch -p1 < $CWD/patches/platformplugin-install-path-fix.patch
-# fix build with -system-harfbuzz
-patch -p1 -d qtbase < $CWD/patches/qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch
-
if echo "$ARCH" | grep -q "i.86" 2>/dev/null; then
sed -i "/^QMAKE_CFLAGS_RELEASE/ s|+=.*|+= $SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf
fi
@@ -244,7 +241,7 @@ for i in $(find . -name "assistant.ico" -o -name "designer.ico" \
for j in 16 24 32 48 64 96 128; do
convert $i -resize ${j}x${j}! $(basename $i)-$j.png
install -D -m 0644 $(basename $i)-$j-0.png \
- $PKG/usr/share/icons/hicolor/${j}x${j}/apps/$PRGNAM-$(basename $i | sed 's|.ico||').png
+ $PKG/usr/share/icons/hicolor/${j}x${j}/apps/$(basename $i | sed 's|.ico||')-$PRGNAM.png
done
done