[arch-commits] Commit in qtchooser/repos (20 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Mon Jun 24 14:42:11 UTC 2013
Date: Monday, June 24, 2013 @ 16:42:11
Author: andrea
Revision: 188894
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qtchooser/repos/extra-i686/3.conf
(from rev 188893, qtchooser/trunk/3.conf)
qtchooser/repos/extra-i686/4.conf
(from rev 188893, qtchooser/trunk/4.conf)
qtchooser/repos/extra-i686/5.conf
(from rev 188893, qtchooser/trunk/5.conf)
qtchooser/repos/extra-i686/PKGBUILD
(from rev 188893, qtchooser/trunk/PKGBUILD)
qtchooser/repos/extra-i686/give-home-configs-precedence.patch
(from rev 188893, qtchooser/trunk/give-home-configs-precedence.patch)
qtchooser/repos/extra-x86_64/3.conf
(from rev 188893, qtchooser/trunk/3.conf)
qtchooser/repos/extra-x86_64/4.conf
(from rev 188893, qtchooser/trunk/4.conf)
qtchooser/repos/extra-x86_64/5.conf
(from rev 188893, qtchooser/trunk/5.conf)
qtchooser/repos/extra-x86_64/PKGBUILD
(from rev 188893, qtchooser/trunk/PKGBUILD)
qtchooser/repos/extra-x86_64/give-home-configs-precedence.patch
(from rev 188893, qtchooser/trunk/give-home-configs-precedence.patch)
Deleted:
qtchooser/repos/extra-i686/3.conf
qtchooser/repos/extra-i686/4.conf
qtchooser/repos/extra-i686/5.conf
qtchooser/repos/extra-i686/PKGBUILD
qtchooser/repos/extra-i686/give-home-configs-precedence.patch
qtchooser/repos/extra-x86_64/3.conf
qtchooser/repos/extra-x86_64/4.conf
qtchooser/repos/extra-x86_64/5.conf
qtchooser/repos/extra-x86_64/PKGBUILD
qtchooser/repos/extra-x86_64/give-home-configs-precedence.patch
-------------------------------------------------+
/3.conf | 4 +
/4.conf | 4 +
/5.conf | 4 +
/PKGBUILD | 72 ++++++++++++++++++++++
/give-home-configs-precedence.patch | 70 +++++++++++++++++++++
extra-i686/3.conf | 2
extra-i686/4.conf | 2
extra-i686/5.conf | 2
extra-i686/PKGBUILD | 43 -------------
extra-i686/give-home-configs-precedence.patch | 35 ----------
extra-x86_64/3.conf | 2
extra-x86_64/4.conf | 2
extra-x86_64/5.conf | 2
extra-x86_64/PKGBUILD | 43 -------------
extra-x86_64/give-home-configs-precedence.patch | 35 ----------
15 files changed, 154 insertions(+), 168 deletions(-)
Deleted: extra-i686/3.conf
===================================================================
--- extra-i686/3.conf 2013-06-24 14:41:59 UTC (rev 188893)
+++ extra-i686/3.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -1,2 +0,0 @@
-/usr/lib/qt3/bin
-/usr/lib
Copied: qtchooser/repos/extra-i686/3.conf (from rev 188893, qtchooser/trunk/3.conf)
===================================================================
--- extra-i686/3.conf (rev 0)
+++ extra-i686/3.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -0,0 +1,2 @@
+/usr/lib/qt3/bin
+/usr/lib
Deleted: extra-i686/4.conf
===================================================================
--- extra-i686/4.conf 2013-06-24 14:41:59 UTC (rev 188893)
+++ extra-i686/4.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -1,2 +0,0 @@
-/usr/lib/qt4/bin
-/usr/lib
Copied: qtchooser/repos/extra-i686/4.conf (from rev 188893, qtchooser/trunk/4.conf)
===================================================================
--- extra-i686/4.conf (rev 0)
+++ extra-i686/4.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -0,0 +1,2 @@
+/usr/lib/qt4/bin
+/usr/lib
Deleted: extra-i686/5.conf
===================================================================
--- extra-i686/5.conf 2013-06-24 14:41:59 UTC (rev 188893)
+++ extra-i686/5.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -1,2 +0,0 @@
-/usr/lib/qt/bin
-/usr/lib
Copied: qtchooser/repos/extra-i686/5.conf (from rev 188893, qtchooser/trunk/5.conf)
===================================================================
--- extra-i686/5.conf (rev 0)
+++ extra-i686/5.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -0,0 +1,2 @@
+/usr/lib/qt/bin
+/usr/lib
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-06-24 14:41:59 UTC (rev 188893)
+++ extra-i686/PKGBUILD 2013-06-24 14:42:11 UTC (rev 188894)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qtchooser
-pkgver=26
-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
- 'give-home-configs-precedence.patch')
-md5sums=('a188a5cb63113130e0d05fe4d5bf4e95'
- '7c5da2b7911d1c4fabc63d6ef00f0020'
- 'aa4d49b269e1b806f5eea170801f0aa6'
- 'cf83f09a9a5a44d898b93f624d74dd11'
- '13478e4685804c9f79e824b4220bbc2c')
-
-prepare() {
- cd ${pkgname}-${pkgver}-g97962d2
-
- patch -p1 -i "${srcdir}"/give-home-configs-precedence.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}-g97962d2
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}-g97962d2
- make INSTALL_ROOT="${pkgdir}" install
-
- install -d "${pkgdir}"/etc/xdg/qtchooser
- install -m644 "${srcdir}"/{3,4,5}.conf \
- "${pkgdir}"/etc/xdg/qtchooser/
-
- # Set the default Qt
- ln -s /etc/xdg/qtchooser/5.conf \
- "${pkgdir}"/etc/xdg/qtchooser/default.conf
-}
Copied: qtchooser/repos/extra-i686/PKGBUILD (from rev 188893, qtchooser/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-06-24 14:42:11 UTC (rev 188894)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qtchooser
+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}-g980c64c.tar.gz"
+ {3,4,5}.conf)
+md5sums=('36497558a0266dcbe4cccb6477bfc158'
+ '7c5da2b7911d1c4fabc63d6ef00f0020'
+ 'aa4d49b269e1b806f5eea170801f0aa6'
+ 'cf83f09a9a5a44d898b93f624d74dd11')
+
+build() {
+ cd ${pkgname}-${pkgver}-g980c64c
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}-g980c64c
+ make INSTALL_ROOT="${pkgdir}" install
+
+ install -d "${pkgdir}"/etc/xdg/qtchooser
+ install -m644 "${srcdir}"/{3,4,5}.conf \
+ "${pkgdir}"/etc/xdg/qtchooser/
+
+ # Set the default Qt
+ ln -s /etc/xdg/qtchooser/5.conf \
+ "${pkgdir}"/etc/xdg/qtchooser/default.conf
+}
Deleted: extra-i686/give-home-configs-precedence.patch
===================================================================
--- extra-i686/give-home-configs-precedence.patch 2013-06-24 14:41:59 UTC (rev 188893)
+++ extra-i686/give-home-configs-precedence.patch 2013-06-24 14:42:11 UTC (rev 188894)
@@ -1,35 +0,0 @@
-From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001
-From: Andrea Scarpino <andrea at 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 at 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
-
Copied: qtchooser/repos/extra-i686/give-home-configs-precedence.patch (from rev 188893, qtchooser/trunk/give-home-configs-precedence.patch)
===================================================================
--- extra-i686/give-home-configs-precedence.patch (rev 0)
+++ extra-i686/give-home-configs-precedence.patch 2013-06-24 14:42:11 UTC (rev 188894)
@@ -0,0 +1,35 @@
+From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001
+From: Andrea Scarpino <andrea at 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 at 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
+
Deleted: extra-x86_64/3.conf
===================================================================
--- extra-x86_64/3.conf 2013-06-24 14:41:59 UTC (rev 188893)
+++ extra-x86_64/3.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -1,2 +0,0 @@
-/usr/lib/qt3/bin
-/usr/lib
Copied: qtchooser/repos/extra-x86_64/3.conf (from rev 188893, qtchooser/trunk/3.conf)
===================================================================
--- extra-x86_64/3.conf (rev 0)
+++ extra-x86_64/3.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -0,0 +1,2 @@
+/usr/lib/qt3/bin
+/usr/lib
Deleted: extra-x86_64/4.conf
===================================================================
--- extra-x86_64/4.conf 2013-06-24 14:41:59 UTC (rev 188893)
+++ extra-x86_64/4.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -1,2 +0,0 @@
-/usr/lib/qt4/bin
-/usr/lib
Copied: qtchooser/repos/extra-x86_64/4.conf (from rev 188893, qtchooser/trunk/4.conf)
===================================================================
--- extra-x86_64/4.conf (rev 0)
+++ extra-x86_64/4.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -0,0 +1,2 @@
+/usr/lib/qt4/bin
+/usr/lib
Deleted: extra-x86_64/5.conf
===================================================================
--- extra-x86_64/5.conf 2013-06-24 14:41:59 UTC (rev 188893)
+++ extra-x86_64/5.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -1,2 +0,0 @@
-/usr/lib/qt/bin
-/usr/lib
Copied: qtchooser/repos/extra-x86_64/5.conf (from rev 188893, qtchooser/trunk/5.conf)
===================================================================
--- extra-x86_64/5.conf (rev 0)
+++ extra-x86_64/5.conf 2013-06-24 14:42:11 UTC (rev 188894)
@@ -0,0 +1,2 @@
+/usr/lib/qt/bin
+/usr/lib
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-06-24 14:41:59 UTC (rev 188893)
+++ extra-x86_64/PKGBUILD 2013-06-24 14:42:11 UTC (rev 188894)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qtchooser
-pkgver=26
-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
- 'give-home-configs-precedence.patch')
-md5sums=('a188a5cb63113130e0d05fe4d5bf4e95'
- '7c5da2b7911d1c4fabc63d6ef00f0020'
- 'aa4d49b269e1b806f5eea170801f0aa6'
- 'cf83f09a9a5a44d898b93f624d74dd11'
- '13478e4685804c9f79e824b4220bbc2c')
-
-prepare() {
- cd ${pkgname}-${pkgver}-g97962d2
-
- patch -p1 -i "${srcdir}"/give-home-configs-precedence.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}-g97962d2
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}-g97962d2
- make INSTALL_ROOT="${pkgdir}" install
-
- install -d "${pkgdir}"/etc/xdg/qtchooser
- install -m644 "${srcdir}"/{3,4,5}.conf \
- "${pkgdir}"/etc/xdg/qtchooser/
-
- # Set the default Qt
- ln -s /etc/xdg/qtchooser/5.conf \
- "${pkgdir}"/etc/xdg/qtchooser/default.conf
-}
Copied: qtchooser/repos/extra-x86_64/PKGBUILD (from rev 188893, qtchooser/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-06-24 14:42:11 UTC (rev 188894)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qtchooser
+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}-g980c64c.tar.gz"
+ {3,4,5}.conf)
+md5sums=('36497558a0266dcbe4cccb6477bfc158'
+ '7c5da2b7911d1c4fabc63d6ef00f0020'
+ 'aa4d49b269e1b806f5eea170801f0aa6'
+ 'cf83f09a9a5a44d898b93f624d74dd11')
+
+build() {
+ cd ${pkgname}-${pkgver}-g980c64c
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}-g980c64c
+ make INSTALL_ROOT="${pkgdir}" install
+
+ install -d "${pkgdir}"/etc/xdg/qtchooser
+ install -m644 "${srcdir}"/{3,4,5}.conf \
+ "${pkgdir}"/etc/xdg/qtchooser/
+
+ # Set the default Qt
+ ln -s /etc/xdg/qtchooser/5.conf \
+ "${pkgdir}"/etc/xdg/qtchooser/default.conf
+}
Deleted: extra-x86_64/give-home-configs-precedence.patch
===================================================================
--- extra-x86_64/give-home-configs-precedence.patch 2013-06-24 14:41:59 UTC (rev 188893)
+++ extra-x86_64/give-home-configs-precedence.patch 2013-06-24 14:42:11 UTC (rev 188894)
@@ -1,35 +0,0 @@
-From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001
-From: Andrea Scarpino <andrea at 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 at 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
-
Copied: qtchooser/repos/extra-x86_64/give-home-configs-precedence.patch (from rev 188893, qtchooser/trunk/give-home-configs-precedence.patch)
===================================================================
--- extra-x86_64/give-home-configs-precedence.patch (rev 0)
+++ extra-x86_64/give-home-configs-precedence.patch 2013-06-24 14:42:11 UTC (rev 188894)
@@ -0,0 +1,35 @@
+From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001
+From: Andrea Scarpino <andrea at 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 at 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
+
More information about the arch-commits
mailing list