From patchwork Thu Jan 26 01:31:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 46415 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 ACA3427BBE9; Thu, 26 Jan 2023 01:32:35 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 3D5BC27BBEB for ; Thu, 26 Jan 2023 01:32:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKr7f-0005yh-21; Wed, 25 Jan 2023 20:32:15 -0500 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 1pKr7Z-0005yV-TF for guix-patches@gnu.org; Wed, 25 Jan 2023 20:32:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKr7S-0006jK-Fc for guix-patches@gnu.org; Wed, 25 Jan 2023 20:32:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pKr7R-000413-SB for guix-patches@gnu.org; Wed, 25 Jan 2023 20:32:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61068] [PATCH] gnu: sawfish: Update to 1.13.0. Resent-From: tumashu@163.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Jan 2023 01:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61068 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61068@debbugs.gnu.org Cc: Feng Shu X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167469671115418 (code B ref -1); Thu, 26 Jan 2023 01:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jan 2023 01:31:51 +0000 Received: from localhost ([127.0.0.1]:60267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKr7G-00040c-TE for submit@debbugs.gnu.org; Wed, 25 Jan 2023 20:31:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:41330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKr7D-00040T-N8 for submit@debbugs.gnu.org; Wed, 25 Jan 2023 20:31:50 -0500 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 1pKr7D-0005w7-15 for guix-patches@gnu.org; Wed, 25 Jan 2023 20:31:47 -0500 Received: from m12.mail.163.com ([123.126.96.234]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKr71-0006gN-M3 for guix-patches@gnu.org; Wed, 25 Jan 2023 20:31:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=g6NAX mt28J0FrwcmGZW8yDVsEtihNUeGMUSKoYohY8g=; b=SzChd2MffedFP2Av3RCtn HWprJn8k84hC9AlRygD41RgvLtUpDvymh0Ns6/VECmX1mztg4MPpwGWHgS+0xkDq vIlFGagmQXm9QW1cylbeTTjPKSc8TBeeWLLMiw44yQpuTITc7QahfH3XK0bqoedU jpp8x/AK8Xw3RmtvnC9a1Q= Received: from localhost.localdomain (unknown [180.105.241.146]) by smtp19 (Coremail) with SMTP id R9xpCgDHvqLt19FjGBvjBg--.56868S2; Thu, 26 Jan 2023 09:31:29 +0800 (CST) From: tumashu@163.com Date: Thu, 26 Jan 2023 09:31:24 +0800 Message-Id: <20230126013124.2436-1-tumashu@163.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-CM-TRANSID: R9xpCgDHvqLt19FjGBvjBg--.56868S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxCry8WryrGFW3tr1fWr13XFb_yoW5KFWDpF s5t3Z3C398CFyvq3yxWF4IgryFgFyIqrWYyws7u3srtw45trW8Wr12ka9xJFy2y3WkJayU Cr1UJayUGr90grJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUTmh5UUUUU= X-Originating-IP: [180.105.241.146] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/xtbB0xID1FXlxydMwwAAsJ Received-SPF: pass client-ip=123.126.96.234; envelope-from=tumashu@163.com; helo=m12.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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: , 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: Feng Shu * gnu/packages/sawfish.scm (sawfish): Update to 1.13.0. --- gnu/packages/sawfish.scm | 73 ++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm index ab715b4a7d..1870a2950c 100644 --- a/gnu/packages/sawfish.scm +++ b/gnu/packages/sawfish.scm @@ -21,6 +21,7 @@ (define-module (gnu packages sawfish) #:use-module ((guix licenses) #:select (gpl2+)) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -113,14 +114,14 @@ (define-public rep-gtk (define-public sawfish (package (name "sawfish") - (version "1.12.0") + (version "1.13.0") (source (origin (method url-fetch) (uri (string-append "https://download.tuxfamily.org/sawfish/" name "_" version ".tar.xz")) (sha256 (base32 - "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4")) + "0pdgf9w5vrn3kfqxwggikj4yqg82rpy8ji613zdhidacz9dkqsw1")) (modules '((guix build utils))) (snippet '(begin @@ -131,44 +132,44 @@ (define-public sawfish "REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):")) (substitute* "src/Makefile.in" ;; Install libraries for librep to $out/lib/rep. - (("\\$\\(repexecdir\\)") "$(libdir)/rep")) - #t)))) + (("\\$\\(repexecdir\\)") "$(libdir)/rep")))))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-exec-rep - (lambda _ - (substitute* '("lisp/sawfish/cfg/main.jl.in" - "scripts/sawfish-about.jl.in" - "scripts/sawfish-client.jl" - "scripts/sawfish-menu.jl") - (("exec rep") (string-append "exec " (which "rep")))) - #t)) - (add-after 'install 'wrap-scripts - ;; Wrap scripts with REP_DL_LOAD_PATH for finding rep-gtk - ;; and sawfish.client. - (lambda* (#:key outputs #:allow-other-keys) - (define (wrap-script script) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out script) - `("REP_DL_LOAD_PATH" = - ,(list (getenv "REP_DL_LOAD_PATH") - (string-append out "/lib/rep")))))) - (for-each wrap-script - (list "/bin/sawfish-about" - "/bin/sawfish-client" - "/bin/sawfish-config" - "/lib/sawfish/sawfish-menu")) - #t))))) + (list + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-exec-rep + (lambda _ + (substitute* '("lisp/sawfish/cfg/main.jl.in" + "scripts/sawfish-about.jl.in" + "scripts/sawfish-client.jl" + "scripts/sawfish-menu.jl") + (("exec rep") (string-append "exec " (which "rep")))))) + (add-after 'install 'wrap-scripts + ;; Wrap scripts with REP_DL_LOAD_PATH for finding rep-gtk + ;; and sawfish.client. + (lambda* (#:key outputs #:allow-other-keys) + (define (wrap-script script) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out script) + `("REP_DL_LOAD_PATH" = + ,(list (getenv "REP_DL_LOAD_PATH") + (string-append out "/lib/rep")))))) + (for-each wrap-script + (list "/bin/sawfish-about" + "/bin/sawfish-client" + "/bin/sawfish-config" + "/lib/sawfish/sawfish-menu"))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("makeinfo" ,texinfo) - ("pkg-config" ,pkg-config) - ("which" ,which))) + (list gettext-minimal + texinfo + pkg-config + which)) (inputs - (list libsm + (list gdk-pixbuf-xlib + gmp + libsm libxft libxinerama libxrandr