summaryrefslogtreecommitdiffstats
path: root/deps/qt5
diff options
context:
space:
mode:
Diffstat (limited to 'deps/qt5')
-rw-r--r--deps/qt5/doinst.sh9
-rw-r--r--deps/qt5/doinst.sh.gzbin172 -> 0 bytes
-rwxr-xr-xdeps/qt5/qt5.SlackBuild11
3 files changed, 18 insertions, 2 deletions
diff --git a/deps/qt5/doinst.sh b/deps/qt5/doinst.sh
new file mode 100644
index 0000000..3e5691a
--- /dev/null
+++ b/deps/qt5/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/deps/qt5/doinst.sh.gz b/deps/qt5/doinst.sh.gz
deleted file mode 100644
index e17bef4..0000000
--- a/deps/qt5/doinst.sh.gz
+++ /dev/null
Binary files differ
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index a76d018..06608fc 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -43,9 +43,10 @@
# Modifications for qt 5.2.1 2014 by Eric Hameleers, Eindhoven, NL
# Modifications for qt 5.3.1 2014 by Eric Hameleers, Eindhoven, NL
# Modifications for qt 5.4.0 2015 by Eric Hameleers, Eindhoven, NL
+# Modifications for qt 5.4.1 2015 by Eric Hameleers, Eindhoven, NL
PKGNAM=qt5
-VERSION=${VERSION:-5.4.0}
+VERSION=${VERSION:-5.4.1}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
@@ -111,6 +112,12 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix dangling symlinks, thanks Larry Hajali:
+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/
+
# Fix path to mysql header:
cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
@@ -282,8 +289,8 @@ if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt5/doc/html ]; then
fi
mkdir -p $PKG/install
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz