Date: Monday, June 24, 2013 @ 16:42:37 Author: andrea Revision: 188895
cleanup Deleted: qtchooser/repos/extra-i686/give-home-configs-precedence.patch qtchooser/repos/extra-x86_64/give-home-configs-precedence.patch qtchooser/trunk/give-home-configs-precedence.patch -------------------------------------------------------+ repos/extra-i686/give-home-configs-precedence.patch | 35 ---------------- repos/extra-x86_64/give-home-configs-precedence.patch | 35 ---------------- trunk/give-home-configs-precedence.patch | 35 ---------------- 3 files changed, 105 deletions(-) Deleted: repos/extra-i686/give-home-configs-precedence.patch =================================================================== --- repos/extra-i686/give-home-configs-precedence.patch 2013-06-24 14:42:11 UTC (rev 188894) +++ repos/extra-i686/give-home-configs-precedence.patch 2013-06-24 14:42:37 UTC (rev 188895) @@ -1,35 +0,0 @@ -From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001 -From: Andrea Scarpino <[email protected]> -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 <[email protected]> ---- - 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: repos/extra-x86_64/give-home-configs-precedence.patch =================================================================== --- repos/extra-x86_64/give-home-configs-precedence.patch 2013-06-24 14:42:11 UTC (rev 188894) +++ repos/extra-x86_64/give-home-configs-precedence.patch 2013-06-24 14:42:37 UTC (rev 188895) @@ -1,35 +0,0 @@ -From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001 -From: Andrea Scarpino <[email protected]> -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 <[email protected]> ---- - 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: trunk/give-home-configs-precedence.patch =================================================================== --- trunk/give-home-configs-precedence.patch 2013-06-24 14:42:11 UTC (rev 188894) +++ trunk/give-home-configs-precedence.patch 2013-06-24 14:42:37 UTC (rev 188895) @@ -1,35 +0,0 @@ -From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001 -From: Andrea Scarpino <[email protected]> -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 <[email protected]> ---- - 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 -
