[SCM] qtchooser packaging branch, master, updated. debian/31-g980c64c-4-6-gb776e4b

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit b776e4b269e94e12919675633d771a9fd6ac5d9e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Dec 9 20:50:23 2013 -0300

    Add the patch that I should have added in a previous commit.
---
 .../patches/ensure_harcoded_paths_are_found.patch  | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/debian/patches/ensure_harcoded_paths_are_found.patch b/debian/patches/ensure_harcoded_paths_are_found.patch
new file mode 100644
index 0000000..16e61ef
--- /dev/null
+++ b/debian/patches/ensure_harcoded_paths_are_found.patch
@@ -0,0 +1,27 @@
+From 3e6fea3d94db12b242e0bf2b3c1c024197a5c695 Mon Sep 17 00:00:00 2001
+From: Sune Vuorela <sune at vuorela.dk>
+Date: Sat, 7 Dec 2013 21:19:50 +0100
+Subject: [PATCH] Always ensure that the hardcoded paths are found
+
+Practice has shown that quite many sets XDG dirs for various purposes
+and that spoils qtchooser finding the distro provided Qt without adding
+like /usr to the XDG dirs variable which kind of kills performance.
+
+Provide a dedicated variable to disable a global installation.
+
+Change-Id: I58953e3b2b3cf43cb67d4c367312e83cfa9ad2b3
+---
+ src/qtchooser/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/qtchooser/main.cpp
++++ b/src/qtchooser/main.cpp
+@@ -280,7 +280,7 @@ vector<string> ToolWrapper::searchPaths(
+     paths.insert(paths.end(), xdgPaths.begin(), xdgPaths.end());
+ 
+ #if defined(QTCHOOSER_GLOBAL_DIR)
+-    if (qgetenv("XDG_CONFIG_DIRS").empty()) {
++    if (qgetenv("QTCHOOSER_NO_GLOBAL_DIR").empty()) {
+         vector<string> globalPaths = stringSplit(QTCHOOSER_GLOBAL_DIR);
+         paths.insert(paths.end(), globalPaths.begin(), globalPaths.end());
+     }

-- 
qtchooser packaging