diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-02-24 17:43:15 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-02-24 17:43:15 +0000 |
| commit | 5d37cbce506eb27993a20a063f96ed8781eee272 (patch) | |
| tree | d67cef6ff4c2f02e371967db40ff4ea3da047d66 /qt5 | |
| parent | d1ddbed941057390f5ce41dd5eaa0a266ab33223 (diff) | |
| download | asb-5d37cbce506eb27993a20a063f96ed8781eee272.tar.gz asb-5d37cbce506eb27993a20a063f96ed8781eee272.tar.xz | |
qt5: fix .desktop files, apply patch to support newer mariadb versions
Diffstat (limited to 'qt5')
| -rwxr-xr-x | qt5/build/qt5.SlackBuild | 13 |
1 files changed, 9 insertions, 4 deletions
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 |