diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-15 01:14:48 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-15 01:14:48 -0700 |
| commit | 51c18483cd98db045391ee9a0c7b9b6ad5d4ab3a (patch) | |
| tree | 00044126c105926c03e23c9611be579689db2b8b /extra/qtchooser | |
| parent | 2e5b72e5e8dfb5199a9b0da7c76d052a456662c2 (diff) | |
Wed May 15 01:14:48 PDT 2013
Diffstat (limited to 'extra/qtchooser')
| -rw-r--r-- | extra/qtchooser/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/qtchooser/give-home-configs-precedence.patch | 35 |
2 files changed, 47 insertions, 4 deletions
diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD index d288fb09d..a105ed0d0 100644 --- a/extra/qtchooser/PKGBUILD +++ b/extra/qtchooser/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 182622 2013-04-11 12:14:29Z andrea $ +# $Id: PKGBUILD 185512 2013-05-14 12:30:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtchooser pkgver=26 -pkgrel=3 +pkgrel=4 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" - {3,4,5}.conf) + {3,4,5}.conf + 'give-home-configs-precedence.patch') md5sums=('a188a5cb63113130e0d05fe4d5bf4e95' '7c5da2b7911d1c4fabc63d6ef00f0020' 'aa4d49b269e1b806f5eea170801f0aa6' - 'cf83f09a9a5a44d898b93f624d74dd11') + 'cf83f09a9a5a44d898b93f624d74dd11' + '13478e4685804c9f79e824b4220bbc2c') + +prepare() { + cd ${pkgname}-${pkgver}-g97962d2 + + patch -p1 -i "${srcdir}"/give-home-configs-precedence.patch +} build() { cd ${pkgname}-${pkgver}-g97962d2 diff --git a/extra/qtchooser/give-home-configs-precedence.patch b/extra/qtchooser/give-home-configs-precedence.patch new file mode 100644 index 000000000..d9575e937 --- /dev/null +++ b/extra/qtchooser/give-home-configs-precedence.patch @@ -0,0 +1,35 @@ +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 + |