Tue Jun 25 01:24:57 PDT 2013

2 files changed, 10 insertions, 52 deletions

diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD
index a105ed0d0..97e5cd836 100644
--- a/extra/qtchooser/PKGBUILD
+++ b/extra/qtchooser/PKGBUILD
@@ -1,36 +1,29 @@
-# $Id: PKGBUILD 185512 2013-05-14 12:30:57Z andrea $
+# $Id: PKGBUILD 188894 2013-06-24 14:42:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtchooser
-pkgver=26
-pkgrel=4
+pkgver=31
+pkgrel=1
 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')
+backup=('etc/xdg/qtchooser/default.conf')
 depends=('gcc-libs')
-source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g97962d2.tar.gz"
-        {3,4,5}.conf
-        'give-home-configs-precedence.patch')
-md5sums=('a188a5cb63113130e0d05fe4d5bf4e95'
+source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g980c64c.tar.gz"
+        {3,4,5}.conf)
+md5sums=('36497558a0266dcbe4cccb6477bfc158'
          '7c5da2b7911d1c4fabc63d6ef00f0020'
          'aa4d49b269e1b806f5eea170801f0aa6'
-         'cf83f09a9a5a44d898b93f624d74dd11'
-         '13478e4685804c9f79e824b4220bbc2c')
-
-prepare() {
-  cd ${pkgname}-${pkgver}-g97962d2
-
-  patch -p1 -i "${srcdir}"/give-home-configs-precedence.patch
-}
+         'cf83f09a9a5a44d898b93f624d74dd11')
 
 build() {
-  cd ${pkgname}-${pkgver}-g97962d2
+  cd ${pkgname}-${pkgver}-g980c64c
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}-g97962d2
+  cd ${pkgname}-${pkgver}-g980c64c
   make INSTALL_ROOT="${pkgdir}" install
 
   install -d "${pkgdir}"/etc/xdg/qtchooser
diff --git a/extra/qtchooser/give-home-configs-precedence.patch b/extra/qtchooser/give-home-configs-precedence.patch
deleted file mode 100644
index d9575e937..000000000
--- a/extra/qtchooser/give-home-configs-precedence.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001
-From: Andrea Scarpino <andrea@archlinux.org>
-Date: Mon, 15 Apr 2013 23:19:39 +0200
-Subject: [PATCH] Give home configurations precedence over system ones
-
-Change-Id: Ib0c4cf47c0ff5f716949cc5653ba27dad3558489
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/qtchooser/main.cpp |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/qtchooser/main.cpp b/src/qtchooser/main.cpp
-index da54b16..514503d 100644
---- a/src/qtchooser/main.cpp
-+++ b/src/qtchooser/main.cpp
-@@ -272,12 +272,13 @@ vector<string> ToolWrapper::searchPaths() const
- {
-     vector<string> paths;
- 
--    // search the XDG config location directories
--    paths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str());
--
-     string localDir = qgetenv("XDG_CONFIG_HOME", userHome() + PATH_SEP ".config");
-     paths.push_back(localDir);
- 
-+    // search the XDG config location directories
-+    vector<string> xdgPaths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str());
-+    paths.insert(paths.end(), xdgPaths.begin(), xdgPaths.end());
-+
-     for (vector<string>::iterator it = paths.begin(); it != paths.end(); ++it)
-         *it += "/qtchooser/";
- 
--- 
-1.7.1
-