[PATCH 00/31] Update LXQt to 1.1.0

  • Done
  • quality assurance status badge
Details
3 participants
  • iyzsong
  • (
  • Ricardo Wurmus
Owner
unassigned
Submitted by
iyzsong
Severity
normal

Debbugs page

iyzsong wrote 3 years ago
(address . guix-patches@gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032024.29955-1-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

Hello list, those patches update LXQt to 1.1.0, and all applications in
lxqt.scm to their latest versions.

A big change is patching lxqt-build-tools's LXQtConfigVars.cmake to use
relative paths, so that other packages don't need to patch their cmake files.
Also /run/current-system/profile is not hardcoded by lxqt-session now, so
install lxqt into the user profile (or its home profile) will works.

Sou Bunnbu (宋文武) (31):
gnu: lxqt-build-tools: Update to 0.11.0.
gnu: libqtxdg: Update to 3.9.1.
gnu: Add qtxdg-tools.
gnu: liblxqt: Update to 1.1.0.
gnu: libsysstat: Update to 0.4.6.
gnu: lxqt-about: Update to 1.1.0.
gnu: lxqt-admin: Update to 1.1.0.
gnu: lxqt-config: Update to 1.1.0.
gnu: lxqt-globalkeys: Update to 1.1.0.
gnu: lxqt-notificationd: Update to 1.1.0.
gnu: lxqt-openssh-askpass: Update to 1.1.0.
gnu: lxqt-panel: Update to 1.1.0.
gnu: lxqt-policykit: Update to 1.1.0.
gnu: lxqt-powermanagement: Update to 1.1.0.
gnu: lxqt-qtplugin: Update to 1.1.0.
gnu: lxqt-runner: Update to 1.1.0.
gnu: lxqt-session: Update to 1.1.1, don't hardcode
/run/current-system.
gnu: lxqt-sudo: Update to 1.1.0.
gnu: lxqt-themes: Update to 1.1.0.
gnu: libfm-qt: Update to 1.1.0.
gnu: pcmanfm-qt: Update to 1.1.0.
gnu: compton-conf: Remove patch-source phase.
gnu: lximage-qt: Update to 1.1.0.
gnu: obconf-qt: Update to 0.16.2.
gnu: pavucontrol-qt: Update to 1.1.0.
gnu: qps: Update 2.5.0.
gnu: qtermwidget: Update to 1.1.0.
gnu: qterminal: Update to 1.1.0.
gnu: screengrab: Update to 2.4.0.
gnu: lxqt-archiver: Update to 0.6.0.
gnu: lxqt-connman-applet: Remove patch-translations-dir phase.

gnu/packages/lxqt.scm | 443 +++++++++++++-----------------------------
1 file changed, 140 insertions(+), 303 deletions(-)

--
2.37.2
iyzsong wrote 3 years ago
[PATCH 01/31] gnu: lxqt-build-tools: Update to 0.11.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-1-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-build-tools)
[version]: Update to 0.11.0.
[arguments]: Configure LXQtConfigVars.cmake to use relative paths.
---
gnu/packages/lxqt.scm | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)

Toggle diff (69 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index eab9a24d1d..29ed90a462 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2015, 2022 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is>
@@ -31,6 +31,7 @@ (define-module (gnu packages lxqt)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
@@ -129,7 +130,7 @@ (define-public libstatgrab
(define-public lxqt-build-tools
(package
(name "lxqt-build-tools")
- (version "0.9.0")
+ (version "0.11.0")
(source
(origin
(method url-fetch)
@@ -137,16 +138,29 @@ (define-public lxqt-build-tools
"/download/" version
"/lxqt-build-tools-" version ".tar.xz"))
(sha256
- (base32 "0kayad5l72h8n90zkf3hy8fxy72n4b1mrkjglpa9dj0cdj6qg0lp"))))
+ (base32 "1ff1pkrlxd8h0j8v49p6wrfhnqrz8s5b53hi835m41cvkzjljpfx"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; no tests
- #:configure-flags
- ;; 'startlxqt' will add LXQT_DATA_DIR to XDG_DATA_DIRS,
- ;; LXQT_ETC_XDG_DIR to XDG_CONFIG_DIRS, and 'lxqt-about' will report
- ;; LXQT_ETC_XDG_DIR in its "Technical Info".
- '("-DLXQT_DATA_DIR=/run/current-system/profile/share"
- "-DLXQT_ETC_XDG_DIR=/run/current-system/profile/etc/xdg")))
+ (list
+ #:tests? #f ; no tests
+ #:modules `((ice-9 regex)
+ (guix build cmake-build-system)
+ (guix build utils))
+ ;; In phases and configure-flags: Set LXQT_TRANSLATIONS_DIR,
+ ;; LXQT_DATA_DIR, etc. to relative paths, so that packages using
+ ;; LXQtConfigVars.cmake from lxqt-build-tools will install translations
+ ;; and data files into their outputs, remove the need to patch their
+ ;; cmake files.
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'patch-LXQtConfigVars.cmake
+ (lambda _
+ (substitute* (string-append #$output
+ "/share/cmake/lxqt-build-tools"
+ "/modules/LXQtConfigVars.cmake")
+ (((regexp-quote (string-append #$output "/"))) "")))))
+ #:configure-flags
+ #~(list "-DLXQT_ETC_XDG_DIR=etc/xdg")))
(native-inputs
(list pkg-config glib))
(inputs
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 03/31] gnu: Add qtxdg-tools.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-3-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (qtxdg-tools): New variable.
---
gnu/packages/lxqt.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)

Toggle diff (36 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index d2f9cc89ac..387caa06c0 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -210,6 +210,29 @@ (define-public libqtxdg
in Qt.")
(license license:lgpl2.1+)))
+(define-public qtxdg-tools
+ (package
+ (name "qtxdg-tools")
+ (version "3.9.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/lxqt/qtxdg-tools/releases/download/"
+ version "/qtxdg-tools-" version ".tar.xz"))
+ (sha256
+ (base32 "0qn35v4dv71g0a4cqkbikppwmihxmfa560q9kw5pwk2y0xiwpncr"))))
+ (build-system cmake-build-system)
+ (arguments '(#:tests? #f)) ; no tests
+ (propagated-inputs (list libqtxdg))
+ (native-inputs (list lxqt-build-tools))
+ (home-page "https://github.com/lxqt/qtxdg-tools")
+ (synopsis "User tools for libqtxdg")
+ (description "This package contains a CLI MIME tool, @command{qtxdg-mat},
+for handling file associations and opening files with their default
+applications.")
+ (license license:lgpl2.1+)))
+
(define-public liblxqt
(package
(name "liblxqt")
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 02/31] gnu: libqtxdg: Update to 3.9.1.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-2-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (libqtxdg): Update to 3.9.1.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 29ed90a462..d2f9cc89ac 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -178,7 +178,7 @@ (define-public lxqt-build-tools
(define-public libqtxdg
(package
(name "libqtxdg")
- (version "3.7.1")
+ (version "3.9.1")
(source
(origin
(method url-fetch)
@@ -186,7 +186,7 @@ (define-public libqtxdg
"https://github.com/lxqt/libqtxdg/releases/download/"
version "/libqtxdg-" version ".tar.xz"))
(sha256
- (base32 "16wav2b948c837cpbvdr6hs1zifwrpdk3yjvbzzp2l1hndvbwz27"))))
+ (base32 "1kh4hv59bkjifq20ksh1mizf9mp7x30v6fpwccr45mi7hasqvvfi"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 04/31] gnu: liblxqt: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-4-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (liblxqt): Update to 1.1.0.
[arguments]: Remove patch-translations-dir phase.
---
gnu/packages/lxqt.scm | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)

Toggle diff (38 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 387caa06c0..de6ce0e010 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -236,7 +236,7 @@ (define-public qtxdg-tools
(define-public liblxqt
(package
(name "liblxqt")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
@@ -244,7 +244,7 @@ (define-public liblxqt
"https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0ay3j6zdgffw3mzaq3wdq96la7fnn2dw52ij6987slv31563nknl"))))
+ (base32 "1fickg1q54pcb8bv3x0ydg4xx02cqykibnjcq09as2kws6xbhk9n"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests
@@ -255,13 +255,6 @@ (define-public liblxqt
(substitute* "CMakeLists.txt"
(("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
"DESTINATION \"share/polkit-1/actions"))
- #t))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
#t)))))
(inputs
(list kwindowsystem
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 05/31] gnu: libsysstat: Update to 0.4.6.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-5-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (libsysstat): Update 0.4.6.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index de6ce0e010..e2a1fe4c5f 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -274,14 +274,14 @@ (define-public liblxqt
(define-public libsysstat
(package
(name "libsysstat")
- (version "0.4.5")
+ (version "0.4.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "1ljy5ggvqvpm3k6kfy03dn47ygr9lzi8hmqws4dcqfc9sx86b6zi"))))
+ (base32 "1ghkzgz3ypjii08f00g26pnmw0s5naf344p83dwnf3kfdlykiip6"))))
(build-system cmake-build-system)
(arguments '(#:tests? #f)) ; no tests
(inputs
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 07/31] gnu: lxqt-admin: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-7-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-admin): Update to 1.1.0.
[arguments]: Remove patch-translations-dir phase.
---
gnu/packages/lxqt.scm | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)

Toggle diff (38 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 329e1fca8c..57f7c541a3 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -335,14 +335,14 @@ (define-public lxqt-about
(define-public lxqt-admin
(package
(name "lxqt-admin")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "07fkn3zmpfxjzzsv1hyv50sx0359n10lxjil35qn266nz165wj43"))))
+ (base32 "1zah3xdnif9miaq52mmfbbzvqjhca7w7h81ngrn25j9pvd2bflm8"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@@ -363,14 +363,6 @@ (define-public lxqt-admin
"lxqt-admin-time/CMakeLists.txt")
(("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
"DESTINATION \"share/polkit-1/actions"))
- #t))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* '("lxqt-admin-time/CMakeLists.txt"
- "lxqt-admin-user/CMakeLists.txt")
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
#t)))))
(home-page "https://lxqt-project.org")
(synopsis "LXQt system administration tool")
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 06/31] gnu: lxqt-about: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-6-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-about): Update to 1.1.0.
[arguments]: Remove patch-translations-dir phase.
---
gnu/packages/lxqt.scm | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)

Toggle diff (37 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index e2a1fe4c5f..329e1fca8c 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -300,14 +300,14 @@ (define-public libsysstat
(define-public lxqt-about
(package
(name "lxqt-about")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "04riqf2xgbcnq67l5zb0dfnnmc4a2zljx8zfn3jlvxirnd73l0zm"))))
+ (base32 "03bqhbpdnfpan3l4snzzz6j0054m4r9zcgygcg21znslwicbqnw3"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@@ -325,13 +325,6 @@ (define-public lxqt-about
(add-before 'build 'setenv
(lambda _
(setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")
- #t))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
#t)))))
(home-page "https://lxqt-project.org")
(synopsis "Provides information about LXQt and the system")
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 08/31] gnu: lxqt-config: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-8-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-config): Update to 1.1.0.
[arguments]: Remove patch-source and patch-translations-dir phases.
---
gnu/packages/lxqt.scm | 26 +++-----------------------
1 file changed, 3 insertions(+), 23 deletions(-)

Toggle diff (59 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 57f7c541a3..56284bc638 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -373,14 +373,14 @@ (define-public lxqt-admin
(define-public lxqt-config
(package
(name "lxqt-config")
- (version "0.17.1")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0nr43d6fyc5zg4b3iwpca2cy58ry8q0rahrk6ixm7wrvmaiwkh93"))))
+ (base32 "0f0x82qma86kjdvn08qlg0ydxh9fnqikijfhnicynxdqfnp50ia5"))))
(build-system cmake-build-system)
(inputs
(list eudev
@@ -406,12 +406,6 @@ (define-public lxqt-config
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda _
- (substitute* '("src/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
- "DESTINATION \"etc/xdg"))
- #t))
(add-after 'unpack 'set-xkeyboard-config-file-name
(lambda* (#:key inputs #:allow-other-keys)
;; Set the file name to xkeyboard-config.
@@ -419,21 +413,7 @@ (define-public lxqt-config
(substitute* "lxqt-config-input/keyboardlayoutconfig.h"
(("/usr/share/X11/xkb/rules/base.lst")
(string-append xkb "/share/X11/xkb/rules/base.lst")))
- #t)))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* '("lxqt-config-file-associations/CMakeLists.txt"
- "lxqt-config-brightness/CMakeLists.txt"
- "lxqt-config-appearance/CMakeLists.txt"
- "lxqt-config-locale/CMakeLists.txt"
- "lxqt-config-monitor/CMakeLists.txt"
- "lxqt-config-input/CMakeLists.txt"
- "liblxqt-config-cursor/CMakeLists.txt"
- "src/CMakeLists.txt")
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
- #t)))))
+ #t))))))
(home-page "https://lxqt-project.org")
(synopsis "Tools to configure LXQt and the underlying operating system")
(description "lxqt-config is providing several tools involved in the
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 09/31] gnu: lxqt-globalkeys: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-9-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-globalkeys): Update to 1.1.0.
[arguments]: Remove phases.
---
gnu/packages/lxqt.scm | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)

Toggle diff (50 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 56284bc638..2d249f4ed1 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -423,7 +423,7 @@ (define-public lxqt-config
(define-public lxqt-globalkeys
(package
(name "lxqt-globalkeys")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
@@ -431,7 +431,7 @@ (define-public lxqt-globalkeys
"releases/download/" version "/"
"lxqt-globalkeys-" version ".tar.xz"))
(sha256
- (base32 "0pnyqiqhaawrnyvw3ljp850d911abaalnl4rgvl2xyzybvlhki4h"))))
+ (base32 "0bbw85aa59w0qnvkdggm3hbacps6yfcvcrs32d34mvvhc7d6g04l"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@@ -442,24 +442,7 @@ (define-public lxqt-globalkeys
qtx11extras))
(native-inputs
(list pkg-config qttools-5 lxqt-build-tools))
- (arguments
- '(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda _
- (substitute* '("autostart/CMakeLists.txt"
- "xdg/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
- "DESTINATION \"etc/xdg"))
- #t))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "config/CMakeLists.txt"
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
- #t)))))
+ (arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "Daemon used to register global keyboard shortcuts")
(description "lxqt-globalkeys is providing tools to set global keyboard
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 10/31] gnu: lxqt-notificationd: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-10-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-notificationd): Update to 1.1.0.
[arguments]: Remove phases.
---
gnu/packages/lxqt.scm | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)

Toggle diff (49 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 2d249f4ed1..c2f1c054e1 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -453,14 +453,14 @@ (define-public lxqt-globalkeys
(define-public lxqt-notificationd
(package
(name "lxqt-notificationd")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "1dyal7brmfnydfgb6lpxnqww8fj5gzixs7s3wf5nn2ihsz1wm4nk"))))
+ (base32 "0bz3qdvv591zvpkxqzqqmh1yq5icc3iinmjr13qzws3ajlj19z44"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@@ -471,24 +471,7 @@ (define-public lxqt-notificationd
qtx11extras))
(native-inputs
(list lxqt-build-tools qttools-5))
- (arguments
- '(#:tests? #f ; no test target
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda _
- (substitute* '("autostart/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
- "DESTINATION \"etc/xdg"))
- #t))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* '("config/CMakeLists.txt"
- "src/CMakeLists.txt")
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
- #t)))))
+ (arguments '(#:tests? #f)) ; no test target
(home-page "https://lxqt-project.org")
(synopsis "The LXQt notification daemon")
(description "lxqt-notificationd is LXQt's implementation of a daemon
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 11/31] gnu: lxqt-openssh-askpass: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-11-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-openssh-askpass): Update to 1.1.0.
[arguments]: Remove phases.
---
gnu/packages/lxqt.scm | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)

Toggle diff (42 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index c2f1c054e1..dc0c7b9e44 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -481,14 +481,14 @@ (define-public lxqt-notificationd
(define-public lxqt-openssh-askpass
(package
(name "lxqt-openssh-askpass")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0gdcy8c21sbfrlfz9c3zqw4dvdwf309flkjgqanwwl9i8hr26chr"))))
+ (base32 "1hxix513z2sanmygfzq1fgx30kaxw5rjmmklbyyzl8bv1xzjcwk7"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@@ -499,17 +499,7 @@ (define-public lxqt-openssh-askpass
qtx11extras))
(native-inputs
(list lxqt-build-tools qttools-5))
- (arguments
- '(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
- #t)))))
+ (arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "GUI to query passwords on behalf of SSH agents")
(description "lxqt-openssh-askpass is a GUI to query credentials on behalf
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 12/31] gnu: lxqt-panel: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-12-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-panel): Update to 1.1.0.
[inputs]: Add libxtst and xcb-util-image.
[arguments]: Remove patch-source and patch-translations-dir phases.
---
gnu/packages/lxqt.scm | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)

Toggle diff (61 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index dc0c7b9e44..aee43b32bb 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -509,14 +509,14 @@ (define-public lxqt-openssh-askpass
(define-public lxqt-panel
(package
(name "lxqt-panel")
- (version "0.17.1")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "1k2cfs1mhad486kh93vbxma3jpjksp4hzjv1xmp1g5alb5dgnc0q"))))
+ (base32 "11dg18ac6kj8qkkrg940bzpykjih6nnw8y3hfww3wiyg6dka9gd7"))))
(build-system cmake-build-system)
(inputs
(list alsa-lib
@@ -530,6 +530,7 @@ (define-public lxqt-panel
libxdamage
libxkbcommon
libxrender
+ libxtst
`(,lm-sensors "lib")
lxqt-globalkeys
pcre
@@ -539,6 +540,7 @@ (define-public lxqt-panel
qtx11extras
solid
xcb-util
+ xcb-util-image
xkeyboard-config))
(native-inputs
(list pkg-config lxqt-build-tools qttools-5))
@@ -550,21 +552,6 @@ (define-public lxqt-panel
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda _
- (substitute* '("autostart/CMakeLists.txt"
- "menu/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
- "DESTINATION \"etc/xdg"))
- #t))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* '("cmake/BuildPlugin.cmake"
- "panel/CMakeLists.txt")
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
- #t))
(add-after 'unpack 'set-xkeyboard-config-file-path
(lambda* (#:key inputs #:allow-other-keys)
;; Set the path to xkeyboard-config.
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 13/31] gnu: lxqt-policykit: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-13-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-policykit): Update to 1.1.0.
[arguments]: Remove phases.
---
gnu/packages/lxqt.scm | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)

Toggle diff (48 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index aee43b32bb..da2a1f5cce 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -568,14 +568,14 @@ (define-public lxqt-panel
(define-public lxqt-policykit
(package
(name "lxqt-policykit")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "119bjhx208g7wxmr8r0ajb3wl6vagq1aks6zz07df4bgjs3nnpli"))))
+ (base32 "150ggcfprascnwgsz721vnmay9cbar9annlhp6h2yzkl69iyc49r"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@@ -588,23 +588,7 @@ (define-public lxqt-policykit
qtx11extras))
(native-inputs
(list pkg-config polkit lxqt-build-tools qttools-5))
- (arguments
- '(#:tests? #f ; no test target
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda _
- (substitute* '("autostart/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
- "DESTINATION \"etc/xdg"))
- #t))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
- #t)))))
+ (arguments '(#:tests? #f)) ; no test target
(home-page "https://lxqt-project.org")
(synopsis "The LXQt PolicyKit agent")
(description "lxqt-policykit is the polkit authentication agent of
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 14/31] gnu: lxqt-powermanagement: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-14-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-powermanagement): Update to 1.1.0.
[arguments]: Remove phases.
---
gnu/packages/lxqt.scm | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)

Toggle diff (49 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index da2a1f5cce..cccfb9d77b 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -598,14 +598,14 @@ (define-public lxqt-policykit
(define-public lxqt-powermanagement
(package
(name "lxqt-powermanagement")
- (version "0.17.1")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "00njx8a8cs0zzpz798qc9j16k7i4y0ydy1xmmcq9yv0wawh4gqck"))))
+ (base32 "0zy6abbf3iwrxsr18gbxidb4m5spsigpa2778xg7y9r7fwgmqqkk"))))
(build-system cmake-build-system)
(inputs
(list kidletime
@@ -619,24 +619,7 @@ (define-public lxqt-powermanagement
solid))
(native-inputs
(list lxqt-build-tools qttools-5))
- (arguments
- '(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda _
- (substitute* '("autostart/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
- "DESTINATION \"etc/xdg"))
- #t))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* '("config/CMakeLists.txt"
- "src/CMakeLists.txt")
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
- #t)))))
+ (arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "Power management module for LXQt")
(description "lxqt-powermanagement is providing tools to monitor power
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 15/31] gnu: lxqt-qtplugin: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-15-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-qtplugin): Update to 1.1.0.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index cccfb9d77b..d9bf4fc65d 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -630,14 +630,14 @@ (define-public lxqt-powermanagement
(define-public lxqt-qtplugin
(package
(name "lxqt-qtplugin")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "14c6abxfg3vda333wrvb5lk45c45hnb66jclbs3vsmrjxdb13vv5"))))
+ (base32 "1zw79lnm35gj3dyd4vlnk08n1lnr8391n36nbn81d0fgmvs21yx4"))))
(build-system cmake-build-system)
(inputs
(list libdbusmenu-qt
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 16/31] gnu: lxqt-runner: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-16-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-runner): Update to 1.1.0.
[arguments]: Remove phases.
---
gnu/packages/lxqt.scm | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)

Toggle diff (48 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index d9bf4fc65d..3c8d4fc8b7 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -667,14 +667,14 @@ (define-public lxqt-qtplugin
(define-public lxqt-runner
(package
(name "lxqt-runner")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0n53jbvkmp4vgi21a720gsvi407m4ybqk8xrpnm5f48yjr88r9i4"))))
+ (base32 "1wfng8g28mq97ibrgpfbj353i15vdimmjp83pfqrmkddx0yvzcdv"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@@ -688,23 +688,7 @@ (define-public lxqt-runner
qtx11extras))
(native-inputs
(list pkg-config qttools-5 lxqt-build-tools))
- (arguments
- '(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda _
- (substitute* '("autostart/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
- "DESTINATION \"etc/xdg"))
- #t))
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
- #t)))))
+ (arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "Tool used to launch programs quickly by typing their names")
(description "lxqt-runner provides a GUI that comes up on the desktop and
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 18/31] gnu: lxqt-sudo: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-18-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-sudo): Update to 1.1.0.
[arguments]: Remove phases.
---
gnu/packages/lxqt.scm | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)

Toggle diff (42 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 9fea479605..5b3625bd08 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -756,14 +756,14 @@ (define-public lxqt-session
(define-public lxqt-sudo
(package
(name "lxqt-sudo")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "02s38m0ywp0gjkjczvrc4r1ignshbajlj084xd61d3rcm7vahhic"))))
+ (base32 "064w40v43m91y9aywxxf2pj5rpcl4gbsgj7dv97pg4vhj9s790b8"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@@ -775,17 +775,7 @@ (define-public lxqt-sudo
sudo))
(native-inputs
(list pkg-config qttools-5 lxqt-build-tools))
- (arguments
- '(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations")))
- #t)))))
+ (arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "GUI frontend for sudo/su")
(description "lxqt-sudo is a graphical front-end of commands sudo and su
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 17/31] gnu: lxqt-session: Update to 1.1.1, don't hardcode /run/current-system.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-17-iyzsong@envs.net
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(-)

Toggle diff (84 lines)
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
iyzsong wrote 3 years ago
[PATCH 19/31] gnu: lxqt-themes: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-19-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-themes): Update to 1.1.0.
[arguments]: Remove phases.
---
gnu/packages/lxqt.scm | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)

Toggle diff (40 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 5b3625bd08..0f123e5a2d 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -786,30 +786,18 @@ (define-public lxqt-sudo
(define-public lxqt-themes
(package
(name "lxqt-themes")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0kmvcz6rxghxxgb0m264zbvycc1zjma8mr4cpwg5kyrzb47rdw9z"))))
+ (base32 "18zrp2j0xpsrzy6m2dw8k55zczcc9jzavncasrp5j1dxscnzwrcr"))))
(build-system cmake-build-system)
(native-inputs
(list lxqt-build-tools))
- (arguments
- `(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda _
- (substitute* '("CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_GRAPHICS_DIR\\}")
- "DESTINATION \"share/lxqt/graphics"))
- (substitute* '("themes/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}")
- "DESTINATION \"share/lxqt"))
- #t)))))
+ (arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "Themes, graphics and icons for LXQt")
(description "This package comprises a number of graphic files and themes
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 21/31] gnu: pcmanfm-qt: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-21-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (pcmanfm-qt)
[version]: Update to 1.1.0.
[inputs]: Add lxqt-themes.
[arguments]: Remove patch-source phase. Add patch-settings.conf.in phase.
---
gnu/packages/lxqt.scm | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)

Toggle diff (54 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 08e33ca0e3..d2cbd1e131 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -843,32 +843,31 @@ (define-public libfm-qt
(define-public pcmanfm-qt
(package
(name "pcmanfm-qt")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "1axs7dnh2z08ygy28iipfbgfck15k2i2pwlf0v8d8axjrmavzb3l"))))
+ (base32 "0pwl2j5kbs86vmq86phavq89bl2i82ic839bjk0v8kmxm9q2mrh9"))))
(build-system cmake-build-system)
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'patch-settings.conf.in
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((wallpaper (search-input-file inputs
+ "share/lxqt/wallpapers/waves-logo.png")))
+ (substitute* "config/pcmanfm-qt/lxqt/settings.conf.in"
+ (("Wallpaper=.*")
+ (string-append "Wallpaper=" wallpaper "\n")))))))))
(inputs
- (list libfm-qt qtbase-5 qtx11extras))
+ (list libfm-qt qtbase-5 qtx11extras lxqt-themes))
(native-inputs
(list pkg-config qttools-5 lxqt-build-tools))
- (arguments
- '(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda _
- (substitute* '("autostart/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
- "DESTINATION \"etc/xdg"))
- (substitute* '("config/pcmanfm-qt/lxqt/settings.conf.in")
- (("@LXQT_SHARE_DIR@")
- "/run/current-system/profile/share/lxqt" ))
- #t)))))
(home-page "https://lxqt-project.org")
(synopsis "File manager and desktop icon manager")
(description "PCManFM-Qt is the Qt port of PCManFM, the file manager of
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 20/31] gnu: libfm-qt: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-20-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (libfm-qt): Update to 1.1.0.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 0f123e5a2d..08e33ca0e3 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -812,14 +812,14 @@ (define-public lxqt-themes
(define-public libfm-qt
(package
(name "libfm-qt")
- (version "0.17.1")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "1991lm1gnw9s5wwn1yf3vba63bfmrrgsxc70h3nhdl9mh16qygxa"))))
+ (base32 "0m2fq1wh553yqi64a5nrdvm57fk3jnc3kxgaf0ja7h95jw6czvm5"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; no tests
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 22/31] gnu: compton-conf: Remove patch-source phase.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-22-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (compton-conf)[arguments]: Remove patch-source phase.
---
gnu/packages/lxqt.scm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index d2cbd1e131..4de5bd944c 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -893,16 +893,7 @@ (define-public compton-conf
(list libconfig qtbase-5))
(native-inputs
(list lxqt-build-tools pkg-config qttools-5))
- (arguments
- '(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda _
- (substitute* '("autostart/CMakeLists.txt")
- (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
- "DESTINATION \"etc/xdg"))
- #t)))))
+ (arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "GUI configuration tool for compton X composite manager")
(description "@code{compton-conf} is a configuration tool for X composite
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 23/31] gnu: lximage-qt: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-23-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lximage-qt): Update to 1.1.0.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 4de5bd944c..65f5921f4e 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -903,14 +903,14 @@ (define-public compton-conf
(define-public lximage-qt
(package
(name "lximage-qt")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0g6hs41xfw2ghhwpj0rqr2ciri0x9v984689yrnmnvah88zlya1f"))))
+ (base32 "0nal8n7nmkafapdbcs9c8rk313md2fak4xjl9m56n10dxcjpi2wb"))))
(build-system cmake-build-system)
(inputs
(list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras))
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 24/31] gnu: obconf-qt: Update to 0.16.2.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-24-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (obconf-qt): Update to 0.16.2.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 65f5921f4e..c8258a6773 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -927,14 +927,14 @@ (define-public lximage-qt
(define-public obconf-qt
(package
(name "obconf-qt")
- (version "0.16.1")
+ (version "0.16.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0hlbivdbiw7wjhwrp8qfmq50ks19v0q21m3pyjj0k2na7nv9d3a5"))))
+ (base32 "0q29f77dkwy005gzrmn2wj2ga1hdnfd2gwp05h72i2dj0qbdla3k"))))
(build-system cmake-build-system)
(inputs
(list imlib2
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 25/31] gnu: pavucontrol-qt: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-25-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (pavucontrol-qt): Update to 1.1.0.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index c8258a6773..a6c374e137 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -960,14 +960,14 @@ (define-public obconf-qt
(define-public pavucontrol-qt
(package
(name "pavucontrol-qt")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0w51dpjayav78lmhw966fz3gvypkmv64xgsd7x5rqs8am39lq9vc"))))
+ (base32 "0y3ql25cmg1cmzjvadf7zcb58hh69gcslvr944sxxhaqp4daz10v"))))
(build-system cmake-build-system)
(inputs
(list glib pcre pulseaudio qtbase-5 qtx11extras))
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 26/31] gnu: qps: Update 2.5.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-26-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (qps): Update to 2.5.0.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index a6c374e137..97ead5b36e 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -984,14 +984,14 @@ (define-public pavucontrol-qt
(define-public qps
(package
(name "qps")
- (version "2.3.0")
+ (version "2.5.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0zg0czrh3dlbnl5smxamhkdbj1g0szm47w1c0fwpaplgc1vv5lfq"))))
+ (base32 "16ybq07xpkl22mszakc1175xlqcayyj21i2h6wlxb8bmb7csg30n"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 27/31] gnu: qtermwidget: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-27-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (qtermwidget): Update to 1.1.0.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 97ead5b36e..cdcb386f34 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -1013,14 +1013,14 @@ (define-public qps
(define-public qtermwidget
(package
(name "qtermwidget")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "10lv475qj0x3c3vl4yhjyr6y10qj5pq8n5pal5k24f6pf7xv412f"))))
+ (base32 "1m64c1m8dkb06fgfk09da2anjspphph6qdk41rqhds2qymh090v4"))))
(build-system cmake-build-system)
(inputs
(list qtbase-5 utf8proc))
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 28/31] gnu: qterminal: Update to 1.1.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-28-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (qterminal): Update to 1.1.0.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index cdcb386f34..489908cf3d 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -1036,14 +1036,14 @@ (define-public qtermwidget
(define-public qterminal
(package
(name "qterminal")
- (version "0.17.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0rfv7a6ncm8fs8aicinh9l29w4636gxzcqz735jmch2r41v9i1d9"))))
+ (base32 "1b9568y5xyxymk8r7pkz878ba24dyaxql2sfiy6blr8szf308c5l"))))
(build-system cmake-build-system)
(inputs
(list qtbase-5 qtx11extras qtermwidget))
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 29/31] gnu: screengrab: Update to 2.4.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-29-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (screengrab): Update to 2.4.0.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 489908cf3d..81754dd8a6 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -1060,14 +1060,14 @@ (define-public qterminal
(define-public screengrab
(package
(name "screengrab")
- (version "2.2.0")
+ (version "2.4.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/screengrab/releases/download/"
version "/screengrab-" version ".tar.xz"))
(sha256
- (base32 "0cilzw7rz5m2klzpax7rrs5rr6whfda2svwzsn2jvmrirmh5by7r"))))
+ (base32 "14kh287d70v1lpd5w8pji88nmw3jd44q4h927vnszrkv6bwplzx7"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras))
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 30/31] gnu: lxqt-archiver: Update to 0.6.0.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-30-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-archiver): Update to 0.6.0.
---
gnu/packages/lxqt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 81754dd8a6..4eebf95be9 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -1085,14 +1085,14 @@ (define-public screengrab
(define-public lxqt-archiver
(package
(name "lxqt-archiver")
- (version "0.4.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0fzgq7cyr7hx8qmq84xfgbsdx04mc1r7vzq5mz79j7bp2ysh134z"))))
+ (base32 "1cxxr7rpflh2ki272pac927gzcw2w1lp3qz8vplflf148laigwc0"))))
(build-system cmake-build-system)
(inputs
(list glib json-glib libfm-qt qtbase-5 qtx11extras))
--
2.37.2
iyzsong wrote 3 years ago
[PATCH 31/31] gnu: lxqt-connman-applet: Remove patch-translations-dir phase.
(address . 57257@debbugs.gnu.org)(name . 宋文武)(address . iyzsong@member.fsf.org)
20220817032500.30011-31-iyzsong@envs.net
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/lxqt.scm (lxqt-connman-applet)[arguments]:
Remove patch-translations-dir phase.
---
gnu/packages/lxqt.scm | 8 --------
1 file changed, 8 deletions(-)

Toggle diff (21 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 4eebf95be9..dbc41a7221 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -1139,14 +1139,6 @@ (define-public lxqt-connman-applet
`(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-translations-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
- (string-append (assoc-ref outputs "out")
- "/share/lxqt/translations"))
- (("\\$\\{LXQT_ETC_XDG_DIR\\}") "etc/xdg"))
- #t))
(add-after 'unpack 'remove-definitions
(lambda _
(substitute* "CMakeLists.txt"
--
2.37.2
Ricardo Wurmus wrote 3 years ago
[PATCH 00/31] Update LXQt to 1.1.0
877d313lpw.fsf@elephly.net
Hi,

overall this looks good to me. Thank you for working on it!

There are just a few questions:

- does it really work to use relative file names? Would it be possible
to test this roughly in a system test?

- you’re removing a lot of patch-source phases. Why are these no longer
needed?

- you’re also removing patch-translations-dir phases. Do translations
still work after applying these changes?

- this diff looks wrong to me:

Toggle snippet (20 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 08e33ca0e3..d2cbd1e131 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -843,32 +843,31 @@ (define-public libfm-qt
(define-public pcmanfm-qt
(package
(name "pcmanfm-qt")
[…]
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'patch-settings.conf.in
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((wallpaper (search-input-file inputs
+ "share/lxqt/wallpapers/waves-logo.png")))

Shouldn’t it be "/share/lxqt…"?


Feel free to push this!

--
Ricardo
( wrote 3 years ago
CMBNNFRCREYU.3CAMETDP00FVO@guix-aspire
On Sun Aug 21, 2022 at 11:55 AM BST, Ricardo Wurmus wrote:
Toggle quote (25 lines)
> - this diff looks wrong to me:
>
> --8<---------------cut here---------------start------------->8---
> diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
> index 08e33ca0e3..d2cbd1e131 100644
> --- a/gnu/packages/lxqt.scm
> +++ b/gnu/packages/lxqt.scm
> @@ -843,32 +843,31 @@ (define-public libfm-qt
> (define-public pcmanfm-qt
> (package
> (name "pcmanfm-qt")
> […]
> + (arguments
> + (list
> + #:tests? #f ; no tests
> + #:phases
> + #~(modify-phases %standard-phases
> + (add-before 'configure 'patch-settings.conf.in
> + (lambda* (#:key inputs #:allow-other-keys)
> + (let ((wallpaper (search-input-file inputs
> + "share/lxqt/wallpapers/waves-logo.png")))
> --8<---------------cut here---------------end--------------->8---
>
> Shouldn’t it be "/share/lxqt…"?

No, this use of search-input-file is correct.

-- (
宋文武 wrote 3 years ago
Re: [PATCH 00/31] Update LXQt to 1.1.0
(name . Ricardo Wurmus)(address . rekado@elephly.net)
87r119jdw8.fsf@envs.net
Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (8 lines)
> Hi,
>
> overall this looks good to me. Thank you for working on it!
>
> There are just a few questions:
>
> - does it really work to use relative file names? Would it be possible
> to test this roughly in a system test?
Yes, the relative file names are for install, at runtime most things
works as designed with XDG_DATA_DIRS and XDG_CONFIG_DIRS.

A system test could verify items in lxqt-config, will look it later...

Toggle quote (4 lines)
>
> - you’re removing a lot of patch-source phases. Why are these no longer
> needed?

Yeah, I find that use relative file names in LXQtConfigVars.cmake remove
the need of patching other cmake files.
Toggle quote (4 lines)
>
> - you’re also removing patch-translations-dir phases. Do translations
> still work after applying these changes?

Yes, at runtime they are found under XDG_DATA_DIRS, by
lxqttranslator.cpp:

*searchPath << XdgDirs::dataDirs(QL1C('/') + QL1S(LXQT_RELATIVE_SHARE_TRANSLATIONS_DIR));

Toggle quote (4 lines)
> [...]
>
> Feel free to push this!

Okay, thanks for the review!
宋文武 wrote 3 years ago
Re: bug#57257: [PATCH 00/31] Update LXQt to 1.1.0
(address . 57257-done@debbugs.gnu.org)
87fshphyr1.fsf@envs.net
Pushed now!
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 57257@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 57257
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help