[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#57257] [PATCH 17/31] gnu: lxqt-session: Update to 1.1.1, don't hard
From: |
iyzsong |
Subject: |
[bug#57257] [PATCH 17/31] gnu: lxqt-session: Update to 1.1.1, don't hardcode /run/current-system. |
Date: |
Wed, 17 Aug 2022 11:24:46 +0800 |
From: 宋文武 <iyzsong@member.fsf.org>
* gnu/packages/lxqt.scm (lxqt-session): Update to 1.1.1.
[inputs]: Add qtxdg-tools, remove libqtxdg.
[arguments]<phases>: Remove patching of LXQT_ETC_XDG_DIR and
LXQT_TRANSLATIONS_DIR. Remove wrap-program.
[native-search-paths]: Add 'XDG_CONFIG_DIRS'.
---
gnu/packages/lxqt.scm | 44 ++++++++++++++++---------------------------
1 file changed, 16 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 3c8d4fc8b7..9fea479605 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -698,20 +698,20 @@ (define-public lxqt-runner
(define-public lxqt-session
(package
(name "lxqt-session")
- (version "0.17.1")
+ (version "1.1.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name
"/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0iwwfyngpbhs2dwvbw0cci0bf3qbqcpjjw7h5vm46nimvgp8q1fr"))))
+ (base32 "0j8q5jfpb2l0vvji3xs8y0jcr792z6sxzj111qqvmdrbpxrkwxnw"))))
(build-system cmake-build-system)
(inputs
(list eudev
kwindowsystem
liblxqt
- libqtxdg
+ qtxdg-tools
procps
qtbase-5
qtsvg-5
@@ -725,40 +725,28 @@ (define-public lxqt-session
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda* (#:key outputs #:allow-other-keys)
- (substitute* '("autostart/CMakeLists.txt"
- "config/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
- "DESTINATION \"etc/xdg"))
(let ((out (assoc-ref outputs "out")))
(substitute* '("xsession/lxqt.desktop.in")
(("Exec=startlxqt") (string-append "Exec=" out
"/bin/startlxqt"))
- (("TryExec=lxqt-session") (string-append "TryExec=" out
"/bin/startlxqt")))
- #t)))
- ;; add write permission to lxqt-rc.xml file which is stored as
read-only in store
+ (("TryExec=lxqt-session") (string-append "TryExec=" out
"/bin/startlxqt"))))))
+
(add-after 'unpack 'patch-openbox-permission
(lambda _
(substitute* "startlxqt.in"
+ ;; Don't add 'etc/xdg' to XDG_CONFIG_DIRS, and 'share' to
XDG_DATA_DIRS.
+ (("! contains .*;") "false;")
+ ;; Add write permission to lxqt-rc.xml file which is stored as
+ ;; read-only in store.
(("cp \"\\$LXQT_DEFAULT_OPENBOX_CONFIG\"
\"\\$XDG_CONFIG_HOME/openbox\"")
(string-append "cp \"$LXQT_DEFAULT_OPENBOX_CONFIG\"
\"$XDG_CONFIG_HOME/openbox\"\n"
" # fix openbox permission issue\n"
- " chmod u+w
\"$XDG_CONFIG_HOME/openbox\"/*")))
- #t))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* '("lxqt-config-session/CMakeLists.txt"
- "lxqt-leave/CMakeLists.txt"
- "lxqt-session/CMakeLists.txt")
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
- #t))
- (add-after 'install 'wrap-program
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/startlxqt")
- `("XDG_CONFIG_DIRS" ":" suffix
("/run/current-system/profile/share"
-
"/run/current-system/profile/share/pcmanfm-qt")))
- #t))))))
+ " chmod u+w
\"$XDG_CONFIG_HOME/openbox\"/*"))))))))
+ (native-search-paths
+ (list (search-path-specification
+ ;; LXQt applications install their default config files into
+ ;; 'share/lxqt' and search them from XDG_CONFIG_DIRS/lxqt.
+ (variable "XDG_CONFIG_DIRS")
+ (files '("share")))))
(home-page "https://lxqt-project.org")
(synopsis "Session manager for LXQt")
(description "lxqt-session provides the standard session manager
--
2.37.2
- [bug#57257] [PATCH 06/31] gnu: lxqt-about: Update to 1.1.0., (continued)
- [bug#57257] [PATCH 06/31] gnu: lxqt-about: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 09/31] gnu: lxqt-globalkeys: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 10/31] gnu: lxqt-notificationd: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 11/31] gnu: lxqt-openssh-askpass: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 12/31] gnu: lxqt-panel: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 13/31] gnu: lxqt-policykit: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 14/31] gnu: lxqt-powermanagement: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 15/31] gnu: lxqt-qtplugin: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 16/31] gnu: lxqt-runner: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 18/31] gnu: lxqt-sudo: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 17/31] gnu: lxqt-session: Update to 1.1.1, don't hardcode /run/current-system.,
iyzsong <=
- [bug#57257] [PATCH 19/31] gnu: lxqt-themes: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 20/31] gnu: libfm-qt: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 22/31] gnu: compton-conf: Remove patch-source phase., iyzsong, 2022/08/16
- [bug#57257] [PATCH 24/31] gnu: obconf-qt: Update to 0.16.2., iyzsong, 2022/08/16
- [bug#57257] [PATCH 27/31] gnu: qtermwidget: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 21/31] gnu: pcmanfm-qt: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 23/31] gnu: lximage-qt: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 25/31] gnu: pavucontrol-qt: Update to 1.1.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 26/31] gnu: qps: Update 2.5.0., iyzsong, 2022/08/16
- [bug#57257] [PATCH 31/31] gnu: lxqt-connman-applet: Remove patch-translations-dir phase., iyzsong, 2022/08/16