Package: guix-patches;
Reported by: Jakob Kirsch <jakob.kirsch <at> web.de>
Date: Tue, 25 Mar 2025 20:49:01 UTC
Severity: normal
Tags: patch
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Jakob Kirsch <jakob.kirsch <at> web.de> To: guix-patches <at> gnu.org Subject: [PATCH] gnu: swww: Update to 0.9.5. Date: Tue, 25 Mar 2025 21:47:47 +0100
From 839cf3065e734d2b60ca2b24eea0dfd1aeabbf9d Mon Sep 17 00:00:00 2001
Message-ID: <839cf3065e734d2b60ca2b24eea0dfd1aeabbf9d.1742935604.git.jakob.kirsch <at> web.de>
From: Jakob Kirsch <jakob.kirsch <at> web.de>
Date: Tue, 25 Mar 2025 21:46:36 +0100
Subject: [PATCH] gnu: swww: Update to 0.9.5.
* gnu/packages/wm.scm (swww): Update to 0.9.5.
[native-inputs]: Add pkg-config.
Change-Id: Ie261b08f5682c1971e49cb2169f36aefb308cb3b
---
gnu/packages/wm.scm | 89 +++++++++++++++++++--------------------------
1 file changed, 37 insertions(+), 52 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 2eefdb4c64..e52924c9f6 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2342,46 +2342,29 @@ (define-public swaybg
(define-public swww
(package
(name "swww")
- (version "0.8.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/LGFae/swww")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ps10dv6a8a0hiw7p8kg64mf81pvavskmyn5xpbfw6hrc991vdlz"))
- (modules '((guix build utils)))
- (snippet
- '(begin (substitute* "utils/Cargo.toml"
- (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
- (string-append "\"^" version)))))))
+ (version "0.9.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/LGFae/swww")
+ ; latest upstream commit that fixes some build issues, bump when the next release comes
+ (commit "412326e")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1djic60jl7kxrfp6p24hzfcqd0hd9m9i4r9z2ydnfi5w4ck69dvf"))
+ (modules '((guix build utils)))))
(build-system cargo-build-system)
(arguments
(list
#:install-source? #f
- #:cargo-inputs
- `(("rust-log" ,rust-log-0.4)
- ("rust-simplelog" ,rust-simplelog-0.12)
- ("rust-wayland-client" ,rust-wayland-client-0.31)
- ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.18)
- ("rust-nix" ,rust-nix-0.27)
- ("rust-keyframe" ,rust-keyframe-1)
- ("rust-rkyv" ,rust-rkyv-0.7)
- ("rust-rayon" ,rust-rayon-1)
- ("rust-spin-sleep" ,rust-spin-sleep-1)
- ("rust-sd-notify" ,rust-sd-notify-0.4)
- ("rust-image" ,rust-image-0.24)
- ("rust-fast-image-resize" ,rust-fast-image-resize-2)
- ("rust-clap" ,rust-clap-4)
- ("rust-rand" ,rust-rand-0.8)
- ("rust-lazy-static" ,rust-lazy-static-1)
- ("rust-lzzzz" ,rust-lzzzz-1))
- #:cargo-development-inputs
- `(("rust-rand" ,rust-rand-0.8)
- ("rust-assert-cmd" ,rust-assert-cmd-2)
- ("rust-criterion" ,rust-criterion-0.5))
+ #:cargo-inputs `(("rust-rustix" ,rust-rustix-0.38)
+ ("rust-fast-image-resize" ,rust-fast-image-resize-5)
+ ("rust-keyframe" ,rust-keyframe-1)
+ ("rust-sd-notify" ,rust-sd-notify-0.4))
+ #:cargo-development-inputs `(("rust-fastrand" ,rust-fastrand-2)
+ ("rust-criterion" ,rust-criterion-0.5)
+ ("rust-assert-cmd" ,rust-assert-cmd-2))
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'build-documentation
@@ -2395,14 +2378,14 @@ (define-public swww
(man1 (string-append share "/man/man1"))
(swww (car (find-files "target" "^swww$")))
(swww-daemon (car (find-files "target" "^swww-daemon$")))
- (bash-completions-dir
- (string-append share "/bash-completion/completions"))
- (zsh-completions-dir
- (string-append share "/zsh/site-functions"))
- (fish-completions-dir
- (string-append share "/fish/vendor_completions.d"))
- (elvish-completions-dir
- (string-append share "/elvish/lib")))
+ (bash-completions-dir (string-append share
+ "/bash-completion/completions"))
+ (zsh-completions-dir (string-append share
+ "/zsh/site-functions"))
+ (fish-completions-dir (string-append share
+ "/fish/vendor_completions.d"))
+ (elvish-completions-dir (string-append share
+ "/elvish/lib")))
(install-file swww bin)
(install-file swww-daemon bin)
(copy-recursively "doc/generated" man1)
@@ -2411,14 +2394,16 @@ (define-public swww
(install-file "completions/swww.fish" fish-completions-dir)
(install-file "completions/swww.elv" elvish-completions-dir))))
(add-after 'install 'wrap-binaries
- (lambda* (#:key outputs inputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (lz4 (assoc-ref inputs "lz4")))
- (wrap-program (string-append out "/bin/swww")
- `("PATH" prefix (,(string-append lz4 "/bin"))))
- (wrap-program (string-append out "/bin/swww-daemon")
- `("PATH" prefix (,(string-append lz4 "/bin"))))))))))
- (native-inputs (list scdoc))
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (lz4 (assoc-ref inputs "lz4")))
+ (wrap-program (string-append out "/bin/swww")
+ `("PATH" prefix
+ (,(string-append lz4 "/bin"))))
+ (wrap-program (string-append out "/bin/swww-daemon")
+ `("PATH" prefix
+ (,(string-append lz4 "/bin"))))))))))
+ (native-inputs (list scdoc pkg-config))
(inputs (list bash-minimal lz4))
(home-page "https://github.com/LGFae/swww")
(synopsis
base-commit: 744cf07005745312ccddb549bb1bab5ab7031106
--
2.49.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.