[SCM] qtchooser packaging branch, master, updated. d9c6a1653f193fd4260d99c04eb68a21316454a2

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtchooser.git;a=commitdiff;h=d9c6a16

The following commit has been merged in the master branch:
commit d9c6a1653f193fd4260d99c04eb68a21316454a2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Mar 20 18:15:07 2013 -0300

    Update create-a-system-default-path.patch.
    
    This patch has not been accepted upstream (see link below), but
    we are able to ship it until we create a better patch for our use case.
---
 debian/patches/create-a-system-default-path.patch |   41 +++++++--------------
 1 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/debian/patches/create-a-system-default-path.patch b/debian/patches/create-a-system-default-path.patch
index caf3ca8..602d1b1 100644
--- a/debian/patches/create-a-system-default-path.patch
+++ b/debian/patches/create-a-system-default-path.patch
@@ -1,4 +1,3 @@
-From 3451e47a279e6810b91b48fb2ea7c9a3e8e08b5e Mon Sep 17 00:00:00 2001
 From: Sune Vuorela <sune at vuorela.dk>
 Date: Sat, 29 Dec 2012 23:56:27 +0100
 Subject: create a system default path
@@ -8,17 +7,13 @@ Make it possible to build qtchooser with a system default search path
 build using make QTCHOOSER_GLOBAL_DIR=/usr/share/ will make qtchooser
 fall back to search in /usr/share/qtchooser/ as a last option
 
-Change-Id: Ie0d438ddc1e259d4c5fb70aa332bd6bfef2448e5
+Modified by Lisandro Damián Nicanor Pérez Meyer.
+This patch has not been accepted upstream (see link below), but
+we are able to ship it until we create a better patch for our use case.
 
 Origin: upstream, https://codereview.qt-project.org/#change,44027
-Last-Update: 2013-01-06
----
- src/qtchooser/Makefile |    8 ++++++--
- src/qtchooser/main.cpp |    6 +++++-
- 2 files changed, 11 insertions(+), 3 deletions(-)
+Last-Update: 2013-03-20
 
-diff --git a/src/qtchooser/Makefile b/src/qtchooser/Makefile
-index fcff0ce..6ad619a 100644
 --- a/src/qtchooser/Makefile
 +++ b/src/qtchooser/Makefile
 @@ -17,6 +17,10 @@ TARGET        = qtchooser
@@ -45,26 +40,18 @@ index fcff0ce..6ad619a 100644
  
  ####### Install
  
-diff --git a/src/qtchooser/main.cpp b/src/qtchooser/main.cpp
-index 9b7688c..09a536b 100644
 --- a/src/qtchooser/main.cpp
 +++ b/src/qtchooser/main.cpp
-@@ -177,10 +177,14 @@ static vector<string> stringSplit(const char *source)
- vector<string> ToolWrapper::searchPaths() const
- {
-     vector<string> paths;
+@@ -265,6 +265,12 @@ vector<string> ToolWrapper::searchPaths(
+     // search the XDG config location directories
+     paths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str());
+ 
 +#if defined(QTCHOOSER_GLOBAL_DIR)
-+    paths = stringSplit(QTCHOOSER_GLOBAL_DIR);
++    // Add QTCHOOSER_GLOBAL_DIR at the beginning.
++    vector<string> globalDir = stringSplit(QTCHOOSER_GLOBAL_DIR);
++    paths.insert(paths.begin(), globalDir.begin(), globalDir.end());
 +#endif
++
+     string localDir = qgetenv("XDG_CONFIG_HOME", userHome() + PATH_SEP ".config");
+     paths.push_back(localDir);
  
-     // search the XDG config location directories
-     const char *globalDirs = getenv("XDG_CONFIG_DIRS");
--    paths = stringSplit(!globalDirs || !*globalDirs ? "/etc/xdg" : globalDirs);
-+    vector<string> globalDirsSplit = stringSplit(!globalDirs || !*globalDirs ? "/etc/xdg" : globalDirs);
-+    paths.insert(paths.end(),globalDirsSplit.begin(),globalDirsSplit.end());
- 
-     string localDir;
-     const char *localDirEnv = getenv("XDG_CONFIG_HOME");
--- 
-1.7.10.4
-

-- 
qtchooser packaging