diff --git a/lxqt-0.13.0-xdg-config-dir.patch b/lxqt-0.13.0-xdg-config-dir.patch new file mode 100644 index 0000000..bb94460 --- /dev/null +++ b/lxqt-0.13.0-xdg-config-dir.patch @@ -0,0 +1,32 @@ +Added because of: https://bugzilla.suse.com/show_bug.cgi?id=1099800 +This patch was proposed by Simon Quigly and was declined by upstream. +See discussion at: https://github.com/lxqt/lxqt-session/pull/126/files + +From e76f0ebf14b2d54495b3fa27fe751b229b15f6d8 Mon Sep 17 00:00:00 2001 +From: Simon Quigley +Date: Fri, 25 May 2018 22:57:21 -0500 +Subject: [PATCH] Ensure all paths are added to $XDG_CONFIG_DIRS. + +--- + startlxqt.in | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/startlxqt.in b/startlxqt.in +index ae0569e..58b2b25 100755 +--- 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/lxqt-session.changes b/lxqt-session.changes index af0be18..e15380f 100644 --- a/lxqt-session.changes +++ b/lxqt-session.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 24 08:52:28 UTC 2018 - mvetter@suse.com + +- bsc#1099800: Various LXQt components weren't able to find + their config files +- Add lxqt-0.13.0-xdg-config-dir.patch + ------------------------------------------------------------------- Wed Jun 20 13:14:01 UTC 2018 - mvetter@suse.com diff --git a/lxqt-session.spec b/lxqt-session.spec index 277896a..ce38c2f 100644 --- a/lxqt-session.spec +++ b/lxqt-session.spec @@ -26,6 +26,8 @@ URL: http://www.lxqt.org Source: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring +# FIX-OPENSUSE mvetter@suse.com bsc#1099800 +Patch0: lxqt-0.13.0-xdg-config-dir.patch BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -53,6 +55,7 @@ use when a user logs out and to restart them the next time the user logs in. %prep %setup -q +%patch0 -p1 # Changing LXQt into X-LXQt in desktop files to be freedesktop compliant and shut rpmlint warnings #find -name '*desktop.in*' -exec sed -ri 's/(LXQt;)/X-\1/' {} +