8 files changed, 46 insertions, 25 deletions
diff --git a/libraries/qt5/README b/libraries/qt5/README
index 92d8c5704bbb4..ce753e2d88d38 100644
--- a/libraries/qt5/README
+++ b/libraries/qt5/README
@@ -1,8 +1,8 @@
 Qt is a cross-platform C++ application framework. Qt's primary feature
 is its rich set of widgets that provide standard GUI functionality.
 
-Optional dependencies: unixODBC, libxkbcommon, freetds, pulseaudio,
-and postgresql.
+Optional dependencies: unixodbc, libxkbcommon, freetds, pulseaudio,
+OpenAL, libwebp and postgresql
 
-Optional dependencies not available at SlackBuilds.org: wayland,
-openvg and firebird.
+Optional dependencies: wayland, openvg and firebird (not available at
+slackbuilds.org)
diff --git a/libraries/qt5/desktop/assistant-qt5.desktop b/libraries/qt5/desktop/assistant-qt5.desktop
new file mode 100644
index 0000000000000..86f5701e34829
--- /dev/null
+++ b/libraries/qt5/desktop/assistant-qt5.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Qt5 Assistant
+Comment=Shows Qt5 documentation and examples
+Exec=/usr/lib@LIBDIR@/qt5/bin/assistant
+Icon=assistant-qt5
+Terminal=false
+Type=Application
+Categories=Qt;Development;Documentation;
diff --git a/libraries/qt5/desktop/designer-qt5.desktop b/libraries/qt5/desktop/designer-qt5.desktop
new file mode 100644
index 0000000000000..16b91b8cb0b00
--- /dev/null
+++ b/libraries/qt5/desktop/designer-qt5.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt5 Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt5 applications
+Exec=/usr/lib@LIBDIR@/qt5/bin/designer
+Icon=designer-qt5
+MimeType=application/x-designer;
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/libraries/qt5/desktop/linquist-qt5.desktop b/libraries/qt5/desktop/linquist-qt5.desktop
new file mode 100644
index 0000000000000..9ef2f0fbcb4d3
--- /dev/null
+++ b/libraries/qt5/desktop/linquist-qt5.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt5 Linguist
+Comment=Add translations to Qt5 applications
+Exec=/usr/lib@LIBDIR@/qt5/bin/linguist
+Icon=linguist-qt5
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/libraries/qt5/desktop/qdbusviewer-qt5.desktop b/libraries/qt5/desktop/qdbusviewer-qt5.desktop
new file mode 100644
index 0000000000000..46947f092d335
--- /dev/null
+++ b/libraries/qt5/desktop/qdbusviewer-qt5.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt5 QDbusViewer 
+GenericName=Qt5 D-Bus Debugger
+Comment=Debug D-Bus applications
+Exec=/usr/lib@LIBDIR@/qt5/bin/qdbusviewer
+Icon=qdbusviewer-qt5
+Terminal=false
+Type=Application
+Categories=Qt;Development;Debugger;
diff --git a/libraries/qt5/patches/qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch b/libraries/qt5/patches/qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch
deleted file mode 100644
index 57a044ed92ad4..0000000000000
--- a/libraries/qt5/patches/qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp.harfbuzz qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp
---- qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp.harfbuzz	2013-09-27 06:05:10.000000000 -0500
-+++ qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp	2013-10-01 12:20:23.089054279 -0500
-@@ -1098,7 +1098,7 @@ int QTextEngine::shapeTextWithHarfbuzzNG
-         hb_buffer_set_segment_properties(buffer, &props);
-         hb_buffer_guess_segment_properties(buffer);
- 
--        uint buffer_flags = HB_BUFFER_FLAG_DEFAULT;
-+        uint buffer_flags = HB_BUFFER_FLAGS_DEFAULT;
-         // Symbol encoding used to encode various crap in the 32..255 character code range,
-         // and thus might override U+00AD [SHY]; avoid hiding default ignorables
-         if (actualFontEngine->symbol)
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
 
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index db68ea8233796..8b5546967dc10 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qt5"
-VERSION="5.2.0"
+VERSION="5.2.1"
 HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.2/5.2.0/single/qt-everywhere-opensource-src-5.2.0.tar.xz"
-MD5SUM="8f60b47ca9461831d940f579ee90517e"
+DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.2/5.2.1/single/qt-everywhere-opensource-src-5.2.1.tar.xz"
+MD5SUM="0c8d2aa45f38be9c3f7c9325eb059d9d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""