[arch-commits] Commit in qt4/trunk (6 files)

[Andrea Scarpino]

    Date: Wednesday, March 6, 2013 @ 10:27:20
  Author: andrea
Revision: 179539

Do not export /usr/lib/bin/qt4 in PATH so 'qmake' always refers to the qt5 version; Ship desktop files for the Qt GUI tools (FS#34139)

Added:
  qt4/trunk/assistant.desktop
  qt4/trunk/designer.desktop
  qt4/trunk/linguist.desktop
Modified:
  qt4/trunk/PKGBUILD
  qt4/trunk/qtconfig.desktop
Deleted:
  qt4/trunk/qt4.profile

-------------------+
 PKGBUILD          |   22 +++++++++++-----------
 assistant.desktop |    9 +++++++++
 designer.desktop  |   11 +++++++++++
 linguist.desktop  |   10 ++++++++++
 qt4.profile       |    1 -
 qtconfig.desktop  |    2 +-
 6 files changed, 42 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-06 08:17:34 UTC (rev 179538)
+++ PKGBUILD	2013-03-06 09:27:20 UTC (rev 179539)
@@ -4,7 +4,7 @@
 
 pkgname=qt4
 pkgver=4.8.4
-pkgrel=13
+pkgrel=14
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -12,10 +12,10 @@
 depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
         'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
         'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
+makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
              'mesa-libgl')
 optdepends=('postgresql-libs: PostgreSQL driver'
-            'libmysqlclient: MySQL driver'
+            'libmariadbclient: MariaDB driver'
             'unixodbc: ODBC driver'
             'libfbclient: Firebird/iBase driver'
             'libxinerama: Xinerama support'
@@ -28,11 +28,13 @@
 conflicts=('qt')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
-        'qtconfig.desktop' 'qt4.profile'
+        'qtconfig.desktop' 'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'improve-cups-support.patch')
 md5sums=('89c5ecba180cae74c66260ac732dc5cb'
-         '20ca06ef59775d749b9451ce7437fa9a'
-         '4ed0bd79a310e2b5d34fc71760b99139'
+         'a16638f4781e56e7887ff8212a322ecc'
+         '4f0152ba6d645e81218b23ba8beeb42d'
+         '283a00ff7f662dca481b70d6daa826e0'
+         '027683880235708d4bc270a7ef961183'
          'c439c7731c25387352d8453ca7574971')
 
 build() {
@@ -86,12 +88,10 @@
     # install missing icons and desktop files
     install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
       "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png"
-    install -Dm644 "${srcdir}"/qtconfig.desktop \
-      "${pkgdir}/usr/share/applications/qtconfig4.desktop"
+    install -d "${pkgdir}"/usr/share/applications
+    install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}.desktop \
+      "${pkgdir}/usr/share/applications/"
 
-    # install the profile
-    install -D -m755 "${srcdir}"/qt4.profile "${pkgdir}"/etc/profile.d/qt4.sh
-
     # Useful symlinks for cmake and configure scripts
     install -d "${pkgdir}"/usr/bin
     for b in "${pkgdir}"/usr/lib/qt4/bin/*; do

Added: assistant.desktop
===================================================================
--- assistant.desktop	                        (rev 0)
+++ assistant.desktop	2013-03-06 09:27:20 UTC (rev 179539)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt4 Assistant 
+Comment=Shows Qt4 documentation and examples
+Exec=assistant-qt4
+Icon=assistant
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;

Added: designer.desktop
===================================================================
--- designer.desktop	                        (rev 0)
+++ designer.desktop	2013-03-06 09:27:20 UTC (rev 179539)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Qt4 Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt4 applications
+Exec=designer-qt4
+Icon=designer
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;

Added: linguist.desktop
===================================================================
--- linguist.desktop	                        (rev 0)
+++ linguist.desktop	2013-03-06 09:27:20 UTC (rev 179539)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt4 Linguist 
+Comment=Add translations to Qt4 applications
+Exec=linguist-qt4
+Icon=linguist
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;

Deleted: qt4.profile
===================================================================
--- qt4.profile	2013-03-06 08:17:34 UTC (rev 179538)
+++ qt4.profile	2013-03-06 09:27:20 UTC (rev 179539)
@@ -1 +0,0 @@
-export PATH=$PATH:/usr/lib/qt4/bin

Modified: qtconfig.desktop
===================================================================
--- qtconfig.desktop	2013-03-06 08:17:34 UTC (rev 179538)
+++ qtconfig.desktop	2013-03-06 09:27:20 UTC (rev 179539)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt4 Config 
 Comment=Configure Qt4 behavior, styles, fonts
-Exec=/usr/lib/qt4/bin/qtconfig
+Exec=qtconfig-qt4
 Icon=qt4logo
 Terminal=false
 Type=Application