mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
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>
This commit is contained in:
parent
6d75813aa6
commit
6a0e3f33e9
3 changed files with 27 additions and 17 deletions
|
@ -1836,6 +1836,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/lugaru-fix-sound.patch \
|
%D%/packages/patches/lugaru-fix-sound.patch \
|
||||||
%D%/packages/patches/luit-posix.patch \
|
%D%/packages/patches/luit-posix.patch \
|
||||||
%D%/packages/patches/lxc-no-static-bin.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/mactelnet-remove-init.patch \
|
||||||
%D%/packages/patches/mailutils-variable-lookup.patch \
|
%D%/packages/patches/mailutils-variable-lookup.patch \
|
||||||
%D%/packages/patches/mandoc-support-zstd-compression.patch \
|
%D%/packages/patches/mandoc-support-zstd-compression.patch \
|
||||||
|
|
|
@ -553,30 +553,24 @@ in LXDE.")
|
||||||
(define-public lxsession
|
(define-public lxsession
|
||||||
(package
|
(package
|
||||||
(name "lxsession")
|
(name "lxsession")
|
||||||
(version "0.5.5")
|
(version "0.5.6")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method git-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/lxde/"
|
(uri
|
||||||
"LXSession%20%28session%20manager%29/"
|
(git-reference
|
||||||
"LXSession%200.5.x/"
|
(url "https://github.com/lxde/lxsession")
|
||||||
"lxsession-" version ".tar.xz"))
|
(commit version)))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4"))
|
(base32 "0mgykzhd5n11mfcbpaqb841f4jwy1yhmd1xn49dxc2hci8bx26fx"))
|
||||||
|
;; Fix https://github.com/lxde/lxsession/issues/42
|
||||||
|
(patches (search-patches "lxsession-potfiles-ignore.patch"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet delete-generated-c-files)))
|
(snippet delete-generated-c-files)))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags (list "--enable-gtk3"
|
`(#: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"))))))
|
|
||||||
(inputs
|
(inputs
|
||||||
(list gtk+
|
(list gtk+
|
||||||
polkit))
|
polkit))
|
||||||
|
|
15
gnu/packages/patches/lxsession-potfiles-ignore.patch
Normal file
15
gnu/packages/patches/lxsession-potfiles-ignore.patch
Normal file
|
@ -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
|
Loading…
Add table
Add a link
Reference in a new issue