From a8146db941f543c1c17ac26110abb2eadeb7afd0 Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Wed, 30 May 2018 17:35:01 -0500
Subject: [PATCH] Ensure all proper paths are added to $XDG_CONFIG_DIRS.

---
 debian/changelog                              |  6 +++++
 ...sure-necessary-paths-are-pulled-from.patch | 25 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 32 insertions(+)
 create mode 100644 debian/patches/ensure-necessary-paths-are-pulled-from.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index c2bcaf0..6e49988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lxqt-session (0.13.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Ensure all proper paths are added to $XDG_CONFIG_DIRS.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 30 May 2018 17:34:55 -0500
+
 lxqt-session (0.13.0-0ubuntu1) cosmic; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/ensure-necessary-paths-are-pulled-from.patch b/debian/patches/ensure-necessary-paths-are-pulled-from.patch
new file mode 100644
index 0000000..fcef683
--- /dev/null
+++ b/debian/patches/ensure-necessary-paths-are-pulled-from.patch
@@ -0,0 +1,25 @@
+Description: startlxqt: Ensure all paths are added to $XDG_CONFIG_DIRS
+ If we expect to pull settings from /usr/share and /etc, let's make sure that
+ these are in $XDG_CONFIG_DIRS before we try to pull from them.
+ .
+ Upstream wouldn't accept this; see the pull request for details.
+Author: Simon Quigley <tsimonq2@ubuntu.com>
+Bug: https://github.com/lxqt/lxqt-session/pull/126
+Last-Update: 2018-05-30
+--- a/startlxqt.in
++++ b/startlxqt.in
+@@ -26,9 +26,11 @@ export XDG_DATA_DIRS
+ if [ -z "$XDG_CONFIG_DIRS" ]; then
+     export XDG_CONFIG_DIRS="@PREDEF_XDG_CONFIG_DIRS@"
+ else
+-    if ! contains "$XDG_CONFIG_DIRS" '@LXQT_ETC_XDG_DIR@'; then
+-        XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@LXQT_ETC_XDG_DIR@"
+-    fi
++    for directory in "/etc" "@LXQT_ETC_XDG_DIR@" "/usr/share"; do
++        if ! contains "$XDG_CONFIG_DIRS" "$directory"; then
++            XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:$directory"
++        fi
++    done
+ fi
+ 
+ if [ -z "$XDG_CACHE_HOME" ]; then
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0ed5a23
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ensure-necessary-paths-are-pulled-from.patch