[arch-commits] Commit in qtchooser/trunk (PKGBUILD qt3.conf qt4.conf qt5.conf)

[Andrea Scarpino]

    Date: Wednesday, April 10, 2013 @ 15:59:37
  Author: andrea
Revision: 182424

upgpkg: qtchooser 26-2

Set the default Qt to Qt5 (so we don't change our current layout)

Added:
  qtchooser/trunk/qt3.conf
  qtchooser/trunk/qt4.conf
  qtchooser/trunk/qt5.conf
Modified:
  qtchooser/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++++-----
 qt3.conf |    2 ++
 qt4.conf |    2 ++
 qt5.conf |    2 ++
 4 files changed, 18 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-10 13:47:55 UTC (rev 182423)
+++ PKGBUILD	2013-04-10 13:59:37 UTC (rev 182424)
@@ -3,14 +3,18 @@
 
 pkgname=qtchooser
 pkgver=26
-pkgrel=1
+pkgrel=2
 pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system'
 arch=('i686' 'x86_64')
 url='http://qt.gitorious.org/qt/qtchooser'
 license=('GPL')
 depends=('gcc-libs')
-source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g97962d2.tar.gz")
-md5sums=('a188a5cb63113130e0d05fe4d5bf4e95')
+source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g97962d2.tar.gz"
+        qt{3,4,5}.conf)
+md5sums=('a188a5cb63113130e0d05fe4d5bf4e95'
+         '7c5da2b7911d1c4fabc63d6ef00f0020'
+         'aa4d49b269e1b806f5eea170801f0aa6'
+         'cf83f09a9a5a44d898b93f624d74dd11')
 
 build() {
   cd ${pkgname}-${pkgver}-g97962d2
@@ -22,7 +26,10 @@
   make INSTALL_ROOT="${pkgdir}" install
 
   install -d "${pkgdir}"/etc/xdg/qtchooser
-  # Upstream wants qt4 to be the default
-  ln -s /etc/xdg/qtchooser/qt4.conf \
+  install -m644 "${srcdir}"/qt{3,4,5}.conf \
+    "${pkgdir}"/etc/xdg/qtchooser/
+  
+  # Set the default Qt
+  ln -s /etc/xdg/qtchooser/qt5.conf \
     "${pkgdir}"/etc/xdg/qtchooser/default.conf
 }

Added: qt3.conf
===================================================================
--- qt3.conf	                        (rev 0)
+++ qt3.conf	2013-04-10 13:59:37 UTC (rev 182424)
@@ -0,0 +1,2 @@
+/usr/lib/qt3/bin
+/usr/lib

Added: qt4.conf
===================================================================
--- qt4.conf	                        (rev 0)
+++ qt4.conf	2013-04-10 13:59:37 UTC (rev 182424)
@@ -0,0 +1,2 @@
+/usr/lib/qt4/bin
+/usr/lib

Added: qt5.conf
===================================================================
--- qt5.conf	                        (rev 0)
+++ qt5.conf	2013-04-10 13:59:37 UTC (rev 182424)
@@ -0,0 +1,2 @@
+/usr/lib/qt/bin
+/usr/lib