From patchwork Tue Mar 25 20:47:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakob Kirsch X-Patchwork-Id: 40827 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D327327BBEA; Tue, 25 Mar 2025 20:49:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D8DF827BBE2 for ; Tue, 25 Mar 2025 20:49:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txBCq-0001oO-UD; Tue, 25 Mar 2025 16:49:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txBCo-0001o4-Ll for guix-patches@gnu.org; Tue, 25 Mar 2025 16:49:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1txBCo-0001CK-BS for guix-patches@gnu.org; Tue, 25 Mar 2025 16:49:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:Subject; bh=FyDgWDxQOxu61zmM4rmpxYir2DAnK+zYnP/oRAJ1Xok=; b=lZfyC6Pbo90hz7jV5uzfDcIB2BMuvqDp75/FV/wrMWal1yBkRiPZJnHyX+/pZjnK9nELbDdeKSgPRB7N4ILr2eeiqTdFCoaSEiDl0ActwMzRuTQXpJpAM03hmNFJxvA4KW5zjtmIwNWMTsF4Mag5eqmXhb/HC+CGxyAEfeDR21JbvYnu+HHjm7iCNROafb5vEoj3ySPBoGUQEZEpVk6a8Fdyd9P9ZYwg/vIEX4ybyDrhBxh0++jHXB2cEb4hS0WNIeADevdI2JDOX7YpP8/BzDku3fTfM1mhdzLHxFfQr12utzR5+JIXvU/dLD1fMlgWDB9u76LAhApAlV1AqENwlA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txBCo-0001DU-6O for guix-patches@gnu.org; Tue, 25 Mar 2025 16:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77262] [PATCH] gnu: swww: Update to 0.9.5. Resent-From: Jakob Kirsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Mar 2025 20:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77262 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77262@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17429357074611 (code B ref -1); Tue, 25 Mar 2025 20:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Mar 2025 20:48:27 +0000 Received: from localhost ([127.0.0.1]:40184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txBCF-0001CJ-7V for submit@debbugs.gnu.org; Tue, 25 Mar 2025 16:48:27 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56444) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1txBCC-0001BO-Lw for submit@debbugs.gnu.org; Tue, 25 Mar 2025 16:48:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txBBm-0001hi-E3 for guix-patches@gnu.org; Tue, 25 Mar 2025 16:47:58 -0400 Received: from mout.web.de ([212.227.15.3]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txBBj-00015d-MO for guix-patches@gnu.org; Tue, 25 Mar 2025 16:47:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1742935669; x=1743540469; i=jakob.kirsch@web.de; bh=FyDgWDxQOxu61zmM4rmpxYir2DAnK+zYnP/oRAJ1Xok=; h=X-UI-Sender-Class:Date:From:To:Subject:Message-ID:MIME-Version: Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=iLGl21Ow1xWEXatG1u2zE+iu4bPGoMiX1GnBqpctNuM/6FbsaLBIRRRIQIcir43L njMsG8aWrUUM/Efohe0d14yw9uZ6g0F8LG/XBXtTTWd6JeEq0v7kAeD7yFNFO9MGK dIqnbifDYW+Bn2r9pqa8eSo94AjjCpoPx8r+L0MTBhcKn1JuE+KHB0dVbjxEET6Mk Hy/ufB8dw3FTqqFCnItknEHenz+t/jmvo1EHPv3wooZEQkJ2B5RTBqA78iO03fN7O Y8+Bvzd4IR++cIFk6v7/4R/toOSFe9q4My8sO7tp84UYH1F48OPiumvcs9IgWSTBk fJ12JIqcOhM/ovI/xw== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from kernelpanicroom ([134.19.28.36]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MBB86-1trAMt1OBi-00A1xd for ; Tue, 25 Mar 2025 21:47:49 +0100 Date: Tue, 25 Mar 2025 21:47:47 +0100 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Provags-ID: V03:K1:ZjrRl8QiqNWNB8FMC+648NWo3cWscYS6fuJR5f383qt+Nw4MNaU 2rMIVkAO6gUY0Ik95C5TUClw8RY6qKA01BSnJEgc09D8gRbHQZBlXg6WdXlxXE/F8G94JG2 lottIGnHPFnc5j0SEEKxPWIagF2N7CXPqIfs0JBSlzjm1l8wn/tGlbvvPAOCwmDQfcz5xV0 JTpRsIXJOTEHyD+pv5geg== UI-OutboundReport: notjunk:1;M01:P0:Oqay1prrOZc=;xuoNqNbe+VP1OHE8xvvwrAlXQOn c/LK6H9D/ziMxx2ZnH3cD5wAythoPJ0r+Px2VYi8O7XE9EY1slkzN3O4K3QbQh6aDHmjMkucc 7ya5C84bJLW80QSP58ZuKblFsyyHuRhXsXD653pBu0Z70y8BrsWQw0GgyBrE4qgqWawULyX2t uQY9+UkbYMOktYvfb1GS6++xa8XNdO5Ev2qA7y3pFz//g/YhloYMeFdU9590rmV4PcuNQZ8U+ 8h4JyIh/Df0sp1Z6xCyj6JQ38JeMSgcl4xboDd6LQY2LLzw7dNUzOX5IzNV8h3MUMSJjGtn32 5/bG1XI+9bWjpSB8KPG+K447ZoTUJTBHjKiQvVZWW32wQHq/zvDA7QDctc10GYpYvu70gtx6U Uz79cySiVG9A9pz4OLml+nj+mokWVYs6Z4B8t/eJa1ueVoiY635jg6C4N9F64w5u4WDmKNAPq nzQ8fsBgh67f/0ftbsto1JIAcSiVwJphJNQYVTxck5nYbrWgQe5iHeaIyw8sPFVuf8kaYiflP KEnqgMGYb/OpEK/LVZRYVvClgV1CqVD4DEdSnAbe6U2689+1E+dOXVF1GHUtG2PX+sWDNTgtj VIuGCfB9tFb+KAe1LAotZp9IV7/ya3OnEEEib6z5DBBK7jef9uf6EVTX0u4TdpfDjU/RoNVfp 6au2+gVnbO1zLqqA3ZtGTCT2DZJY4+WsETxPJpZbvxJ0ciJJI7M7KpbOyB/VB0Jut0ZK2Kz+h mnwYaBriVqvohRT6Os5cH2wrcE6x79C+1hR36xREjMg5Y3F2ODZJ+pZOSrUCtaXKg9rGDXmec 5s52bkE0jw/1bFDsXJchLhVC+VT79qeHaheXrVbf0J20tQH9dhR9lc4Vwe7CcoxSUpG6xJJjX dwcbdYhYbhEaGRGsK29/TJlGgmVL98Todh+MPNLHxacuEpZec63CLasZE+ZqpHETawQIyBO7A 7PKo34FfapQNXsEVcpNP3pY+cs3iTF3fq6KdbyTkXZX5GJJobUnoGgVoafSLx/yqUw/zhOsZb lw3bl2G/iRMJnwXIQErdKyfbZ3l/l/YuZIxZbnPKmA0mXrgPFHa4AyAXBFK8PezEUf0HIXmcp zApFXUdhwhJXJOa7BFUHiO3Gc6TXvpdpK4jtzleNV/U49vbGjepvvwpGhAtTOUeCG+EPSAKT1 HPAkbtE5h303wdu6jA/2nLZPnYAWLW3jCrhIxnVGr4WX+Blo0Q59EL9zVhEIU5SoLSGOZLXDA J82sdcBKDRvicz+AmmjFhGxWncT6I3rMqW2EyaXaka+aqNOSiPGWVufvot8J0jfUK2y9MR0zR Hs1lQ4n/YptMj07O+ChErmlh1JiMupOt1Gxe+lWqkh2aQus+6srrgxQC1Hdc+N43IF0Lt5mBh mVwJSbpEK+LQ/eOWft9F9X2NfrY2VmVEqFxpJnDYuwGcJYvZv7xAuBO7k5s6NHsEw5xxNfhFe WORxKi6Zio3H7OSjs9GOBBa3r7v1uolnyAqx12vCthh6yoWhOApqlnwZIXeFQMLXio8XCNw== Received-SPF: pass client-ip=212.227.15.3; envelope-from=jakob.kirsch@web.de; helo=mout.web.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jakob Kirsch X-ACL-Warn: , Jakob Kirsch via Guix-patches X-Patchwork-Original-From: Jakob Kirsch via Guix-patches via From: Jakob Kirsch Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 839cf3065e734d2b60ca2b24eea0dfd1aeabbf9d Mon Sep 17 00:00:00 2001 Message-ID: <839cf3065e734d2b60ca2b24eea0dfd1aeabbf9d.1742935604.git.jakob.kirsch@web.de> From: Jakob Kirsch 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(-) base-commit: 744cf07005745312ccddb549bb1bab5ab7031106 -- 2.49.0 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