Added upstream pull requests for improved xdg handling (Closes: #883032).

ubuntu/cosmic debian/0.12.0-2
Alf Gaida 7 years ago
parent 86a331dfe6
commit 662e42e610

6
debian/changelog vendored

@ -1,3 +1,9 @@
lxqt-session (0.12.0-2) experimental; urgency=medium
* Added upstream pull requests for improved xdg handling (Closes: #883032).
-- Alf Gaida <agaida@siduction.org> Fri, 01 Dec 2017 21:50:55 +0100
lxqt-session (0.12.0-1) experimental; urgency=medium lxqt-session (0.12.0-1) experimental; urgency=medium
* Cherry-picking upstream release 0.12.0. * Cherry-picking upstream release 0.12.0.

@ -0,0 +1,36 @@
From 3653bb1a1fcfd04da0d1c90dd588c0c067d72db1 Mon Sep 17 00:00:00 2001
From: Palo Kisa <palo.kisa@gmail.com>
Date: Wed, 22 Nov 2017 08:06:48 +0100
Subject: [PATCH] startlxqt: Add /usr/share & /etc into XDG_CONFIG_DIRS
---
CMakeLists.txt | 1 +
startlxqt.in | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cd4112..b9fd3d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,7 @@ if(NOT("${LXQT_DATA_DIR}" MATCHES "^/usr(/local)?/share$"))
set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:${LXQT_DATA_DIR}")
endif()
set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:/usr/local/share:/usr/share")
+set(PREDEF_XDG_CONFIG_DIRS "/etc:${LXQT_ETC_XDG_DIR}:/usr/share")
configure_file(startlxqt.in startlxqt @ONLY)
install(PROGRAMS
"${CMAKE_CURRENT_BINARY_DIR}/startlxqt"
diff --git a/startlxqt.in b/startlxqt.in
index 02ef0c2..ae0569e 100755
--- a/startlxqt.in
+++ b/startlxqt.in
@@ -24,7 +24,7 @@ fi
export XDG_DATA_DIRS
if [ -z "$XDG_CONFIG_DIRS" ]; then
- export XDG_CONFIG_DIRS="@LXQT_ETC_XDG_DIR@"
+ 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@"

@ -0,0 +1,23 @@
From ca88cb247bd3856792daefcaf5a04bd0231c036b Mon Sep 17 00:00:00 2001
From: Alf Gaida <agaida@siduction.org>
Date: Wed, 29 Nov 2017 00:24:41 +0100
Subject: [PATCH] install session configs in /usr/share/lxqt
---
config/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index caabdf2..4b12525 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -3,7 +3,7 @@ install(FILES
lxqt.conf
session.conf
windowmanagers.conf
- DESTINATION "${LXQT_ETC_XDG_DIR}/lxqt"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/lxqt"
COMPONENT Runtime
)
install(DIRECTORY openbox

@ -0,0 +1,2 @@
pr-114.patch
pr-115.patch
Loading…
Cancel
Save