diff options
| author | John Khoo <johnkhootf@gmail.com> | 2025-08-25 22:23:16 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2025-08-30 10:29:20 +0800 |
| commit | 6a0e3f33e95cb50098f7d4647268714d0d2f652c (patch) | |
| tree | 61bfeb8b45b5f1d12a4b9abd9ee8926703bd9d46 | |
| parent | 6d75813aa66adb989237a451f39e214ff11c9d87 (diff) | |
gnu: lxsession: Update to 0.5.6.
* gnu/packages/patches/lxsession-potfiles-ignore.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register patch.
* gnu/packages/lxde.scm (lxsession): Update to 0.5.6.
[source]: Switch to git-fetch. Add patch.
Closes: #2268
Change-Id: I9b33123dfbfb6beb53178caeb6c531d9ef1b7a94
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/lxde.scm | 28 | ||||
| -rw-r--r-- | gnu/packages/patches/lxsession-potfiles-ignore.patch | 15 |
3 files changed, 27 insertions, 17 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index abaf016c8c..6dec1030c5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1836,6 +1836,7 @@ dist_patch_DATA = \ %D%/packages/patches/lugaru-fix-sound.patch \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/lxc-no-static-bin.patch \ + %D%/packages/patches/lxsession-potfiles-ignore.patch \ %D%/packages/patches/mactelnet-remove-init.patch \ %D%/packages/patches/mailutils-variable-lookup.patch \ %D%/packages/patches/mandoc-support-zstd-compression.patch \ diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index fefc215fc6..4623871309 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -553,30 +553,24 @@ in LXDE.") (define-public lxsession (package (name "lxsession") - (version "0.5.5") + (version "0.5.6") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXSession%20%28session%20manager%29/" - "LXSession%200.5.x/" - "lxsession-" version ".tar.xz")) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxsession") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4")) + (base32 "0mgykzhd5n11mfcbpaqb841f4jwy1yhmd1xn49dxc2hci8bx26fx")) + ;; Fix https://github.com/lxde/lxsession/issues/42 + (patches (search-patches "lxsession-potfiles-ignore.patch")) (modules '((guix build utils))) (snippet delete-generated-c-files))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list "--enable-gtk3" - ;; Fix build with GCC 14. - "CFLAGS=-Wno-error=incompatible-pointer-types") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'rm-stamp - (lambda _ - (for-each delete-file (find-files "." "\\.stamp$")) - ;; Force regeneration of configure script. - (delete-file "configure")))))) + `(#:configure-flags (list "--enable-gtk3"))) (inputs (list gtk+ polkit)) diff --git a/gnu/packages/patches/lxsession-potfiles-ignore.patch b/gnu/packages/patches/lxsession-potfiles-ignore.patch new file mode 100644 index 0000000000..ddf45cf506 --- /dev/null +++ b/gnu/packages/patches/lxsession-potfiles-ignore.patch @@ -0,0 +1,15 @@ +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +index 353b0ec..adbe1d6 100644 +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -1,7 +1,10 @@ + # Autogenerated files with translatable strings. + lxsession-default-apps/main.c + lxsession-default-apps/combobox.c ++lxpolkit/main.c ++lxsession/app.c + # This is a source file for configure, output will be translated instead. + data/lxpolkit.desktop.in.in + # bug of intltool with automake 1.15 + sub/data/lxpolkit.desktop.in ++data/lxpolkit.desktop.in |