From 5d37cbce506eb27993a20a063f96ed8781eee272 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 24 Feb 2018 17:43:15 +0000
Subject: qt5: fix .desktop files, apply patch to support newer mariadb
 versions

---
 qt5/build/qt5.SlackBuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'qt5')

diff --git a/qt5/build/qt5.SlackBuild b/qt5/build/qt5.SlackBuild
index b06e42ca..a94224c9 100755
--- a/qt5/build/qt5.SlackBuild
+++ b/qt5/build/qt5.SlackBuild
@@ -57,9 +57,9 @@
 
 PKGNAM=qt5
 VERSION=${VERSION:-5.9.4}
+BUILD=${BUILD:-2}
 PKGSRC=$(echo $VERSION |cut -d- -f1)
 PKGVER=$(echo $VERSION |tr - _)
-BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
 
@@ -144,6 +144,11 @@ cd qtbase
   cat $CWD/patches/qt5.qtbug-66103.patch | patch -p1 --verbose || exit 1
 cd -
 
+# Extend the MariaDB define check to cover the later versions too:
+cd qtbase
+  cat $CWD/patches/qt5.cr206850.patch | patch -p1 --verbose || exit 1
+cd -
+
 # Fix missing private includes: QTBUG-37417
 sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \
   -i qtbase/mkspecs/features/create_cmake.prf
@@ -276,7 +281,7 @@ cat <<EOF > $PKG/usr/share/applications/qt5-designer.desktop
 Name=Qt5 Designer
 GenericName=Interface Designer
 Comment=Design GUIs for Qt5 applications
-Exec=designer-qt5 -qt=5
+Exec=designer-qt5
 Icon=qt5-designer
 MimeType=application/x-designer;
 Terminal=false
@@ -288,7 +293,7 @@ cat <<EOF > $PKG/usr/share/applications/qt5-assistant.desktop
 [Desktop Entry]
 Name=Qt5 Assistant 
 Comment=Shows Qt5 documentation and examples
-Exec=assistant-qt5 -qt=5
+Exec=assistant-qt5
 Icon=qt5-assistant
 Terminal=false
 Encoding=UTF-8
@@ -299,7 +304,7 @@ cat <<EOF > $PKG/usr/share/applications/qt5-linguist.desktop
 [Desktop Entry]
 Name=Qt5 Linguist 
 Comment=Add translations to Qt5 applications
-Exec=linguist-qt5 -qt=5
+Exec=linguist-qt5
 Icon=qt5-linguist
 MimeType=text/vnd.trolltech.linguist;application/x-linguist;
 Terminal=false
-- 
cgit v1.2.3-79-gdb01