| Message ID | 87jzkp549r.fsf@163.com |
|---|---|
| State | New |
| Headers | show |
| Series | [bug#70523] gnu: slim: Update to 1.4.1. | expand |
Feng Shu <tumashu@163.com> writes: > From ce899e40d18bd64f9f94bf549a235d17b3a874d7 Mon Sep 17 00:00:00 2001 > From: Feng Shu <tumashu@163.com> > Date: Tue, 23 Apr 2024 08:00:27 +0800 > Subject: [PATCH] gnu: slim: Update to 1.4.1. > > * gnu/packages/display-managers.scm (slim): Update to 1.4.1. > [arguments]: Do not install systemd files again. > > Change-Id: Ida6ed99dad7293dc64d91eb4dec0870608afffbe > --- > gnu/packages/display-managers.scm | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm > index e3381a1665..3ff8fa5b65 100644 > --- a/gnu/packages/display-managers.scm > +++ b/gnu/packages/display-managers.scm > @@ -483,14 +483,14 @@ (define-public lightdm-gtk-greeter > (define-public slim > (package > (name "slim") > - (version "1.4.0") > + (version "1.4.1") > (source > (origin > (method url-fetch) > (uri (string-append "mirror://sourceforge/slim-fork/slim-" version > ".tar.gz")) > (sha256 > - (base32 "011jfmksy0kgw4z0y70mc80bm5kmz5i1sgm6krrfj0h00zak22rm")) > + (base32 "06r47ypf9lsy76jikrvihw8ka9j2wbrnn8g3sbxp819hcbqxg22z")) > (patches (search-patches "slim-config.patch" > "slim-login.patch" > "slim-display.patch")))) > @@ -516,7 +516,11 @@ (define-public slim > (lambda _ > (substitute* "CMakeLists.txt" > (("/etc") > - (string-append #$output "/etc")))))) > + (string-append #$output "/etc")) > + (("install.*SYSTEMDDIR.*") > + ;; The build system's logic here is: if "Linux", then > + ;; "systemd". Strip that. > + ""))))) > #:configure-flags > #~(list "-DUSE_PAM=yes" "-DUSE_CONSOLEKIT=no") > #:tests? #f)) > -- > 2.39.2 LGTM, push. see https://git.savannah.gnu.org/cgit/guix.git/commit/?id=bb398fe6a923d6499092376b898e86bf7aa7006f
Feng Shu <tumashu@163.com> writes: > From ce899e40d18bd64f9f94bf549a235d17b3a874d7 Mon Sep 17 00:00:00 2001 > From: Feng Shu <tumashu@163.com> > Date: Tue, 23 Apr 2024 08:00:27 +0800 > Subject: [PATCH] gnu: slim: Update to 1.4.1. > > * gnu/packages/display-managers.scm (slim): Update to 1.4.1. > [arguments]: Do not install systemd files again. > > Change-Id: Ida6ed99dad7293dc64d91eb4dec0870608afffbe > --- > gnu/packages/display-managers.scm | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm > index e3381a1665..3ff8fa5b65 100644 > --- a/gnu/packages/display-managers.scm > +++ b/gnu/packages/display-managers.scm > @@ -483,14 +483,14 @@ (define-public lightdm-gtk-greeter > (define-public slim > (package > (name "slim") > - (version "1.4.0") > + (version "1.4.1") > (source > (origin > (method url-fetch) > (uri (string-append "mirror://sourceforge/slim-fork/slim-" version > ".tar.gz")) > (sha256 > - (base32 "011jfmksy0kgw4z0y70mc80bm5kmz5i1sgm6krrfj0h00zak22rm")) > + (base32 "06r47ypf9lsy76jikrvihw8ka9j2wbrnn8g3sbxp819hcbqxg22z")) > (patches (search-patches "slim-config.patch" > "slim-login.patch" > "slim-display.patch")))) > @@ -516,7 +516,11 @@ (define-public slim > (lambda _ > (substitute* "CMakeLists.txt" > (("/etc") > - (string-append #$output "/etc")))))) > + (string-append #$output "/etc")) > + (("install.*SYSTEMDDIR.*") > + ;; The build system's logic here is: if "Linux", then > + ;; "systemd". Strip that. > + ""))))) > #:configure-flags > #~(list "-DUSE_PAM=yes" "-DUSE_CONSOLEKIT=no") > #:tests? #f)) > -- > 2.39.2 LGTM, push. see https://git.savannah.gnu.org/cgit/guix.git/commit/?id=bb398fe6a923d6499092376b898e86bf7aa7006f
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index e3381a1665..3ff8fa5b65 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -483,14 +483,14 @@ (define-public lightdm-gtk-greeter (define-public slim (package (name "slim") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/slim-fork/slim-" version ".tar.gz")) (sha256 - (base32 "011jfmksy0kgw4z0y70mc80bm5kmz5i1sgm6krrfj0h00zak22rm")) + (base32 "06r47ypf9lsy76jikrvihw8ka9j2wbrnn8g3sbxp819hcbqxg22z")) (patches (search-patches "slim-config.patch" "slim-login.patch" "slim-display.patch")))) @@ -516,7 +516,11 @@ (define-public slim (lambda _ (substitute* "CMakeLists.txt" (("/etc") - (string-append #$output "/etc")))))) + (string-append #$output "/etc")) + (("install.*SYSTEMDDIR.*") + ;; The build system's logic here is: if "Linux", then + ;; "systemd". Strip that. + ""))))) #:configure-flags #~(list "-DUSE_PAM=yes" "-DUSE_CONSOLEKIT=no") #:tests? #f))
From ce899e40d18bd64f9f94bf549a235d17b3a874d7 Mon Sep 17 00:00:00 2001 From: Feng Shu <tumashu@163.com> Date: Tue, 23 Apr 2024 08:00:27 +0800 Subject: [PATCH] gnu: slim: Update to 1.4.1. * gnu/packages/display-managers.scm (slim): Update to 1.4.1. [arguments]: Do not install systemd files again. Change-Id: Ida6ed99dad7293dc64d91eb4dec0870608afffbe --- gnu/packages/display-managers.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)