From patchwork Sat Jul 16 09:16:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 40678 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 E649F27BBEA; Sat, 16 Jul 2022 10:23:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 65CB627BBE9 for ; Sat, 16 Jul 2022 10:23:26 +0100 (BST) Received: from localhost ([::1]:34012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCe1F-0005gK-IT for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 05:23:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCdyw-0003lp-Mp for guix-patches@gnu.org; Sat, 16 Jul 2022 05:21:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45149) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCdyw-0007xE-DT for guix-patches@gnu.org; Sat, 16 Jul 2022 05:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCdyw-0004RF-9f for guix-patches@gnu.org; Sat, 16 Jul 2022 05:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56597] [PATCH] gnu: xscreensaver: Update to 6.04. Resent-From: r0man Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 09:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56597@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165796321616967 (code B ref -1); Sat, 16 Jul 2022 09:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jul 2022 09:20:16 +0000 Received: from localhost ([127.0.0.1]:42908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCdyB-0004PY-Ey for submit@debbugs.gnu.org; Sat, 16 Jul 2022 05:20:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:46646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCdy7-0004PN-PQ for submit@debbugs.gnu.org; Sat, 16 Jul 2022 05:20:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCdy7-0003Yo-Jp for guix-patches@gnu.org; Sat, 16 Jul 2022 05:20:11 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:40620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCdy5-0005yP-6S for guix-patches@gnu.org; Sat, 16 Jul 2022 05:20:11 -0400 Received: by mail-wr1-x432.google.com with SMTP id z12so9787406wrq.7 for ; Sat, 16 Jul 2022 02:20:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=user-agent:from:to:subject:date:message-id:mime-version; bh=GpOISZKm1zpOHMSwCiURzt0hjbbkI9X37On/cYWds2Y=; b=dT0GGxckdwzGo0V9H1+zqLgYASoGUwtGLJWlnt75m1NUvok8FwUgGDy8mfHA0O+2PW INK5sLYMUN76NmfHI4VSzVkGzIDuVkqGEvY+YnDH6u/5hTBx0G5nmWoZ3Tb11A80A36Q 8GsXQ3Jo3BRN4tofkH75JYxD3yFnOHkK2u8m5VP3xNWBBxSE69Qr0eni1sD9hvHU79v8 v4h2oynKlmIDHRpdcblbr0SzHs5rL1xew6wh6ha2fKkrO1XVB/kt6iieZQB7BQ6Jr+sg Znq3RvTHR0IoB+fc5SORr477Wpli0+VB2DV8SoJmMPdvqmSuZkrVAgjccZ0qFfEfDcxP cyZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :mime-version; bh=GpOISZKm1zpOHMSwCiURzt0hjbbkI9X37On/cYWds2Y=; b=b1UkDiazuAxKquBXTdqq8Ihh8M3GRoWpCMArWBfW/CkES2tnUuqKHOROFtouFug+V5 0f+We/02pDUcyAsIqev/YXMeGWfZ7LcaHDqOYYmTDeBzVacoQGvu3lSuY9mJZgx9yu1x QvcPLFXERz4FhGFis+t49aO0KZKBHiIGzXP4Y+lDqj57x2iSRGv/YTgfavjUG6luVjoA neud61oul3d/wEIHIi5gshdS0MTXAMtsIS72F66ag4b2TVxxsIA6AHS02USPjUgXBdK8 wjQSTPU+xU2D3BjfumQJGeX/9UGOES+vX6yPqIIbxoJd1XyzRe7lMp6iMWS1+7VzjVFq s7GQ== X-Gm-Message-State: AJIora8FhGDCfapbUm1JbXu7BZoX6Yh9REzcow9QdtBSZCuX4hm9l3Qn PsdDtTE93mIZkeRNnyUoNJiubLphm43wlX5C X-Google-Smtp-Source: AGRyM1s+oHn3RGXVSV/kLbILYsIxoPaYjlQ7ae68QF1+f7gbAGjUy06M3jFshhBQ955ApiAmlZH39g== X-Received: by 2002:a05:6000:1e04:b0:21d:7ec3:fe5a with SMTP id bj4-20020a0560001e0400b0021d7ec3fe5amr16007175wrb.116.1657963206779; Sat, 16 Jul 2022 02:20:06 -0700 (PDT) Received: from thinkpad (tmo-117-210.customers.d1-online.com. [80.187.117.210]) by smtp.gmail.com with ESMTPSA id m6-20020a7bcb86000000b003a2d6f26babsm8123246wmi.3.2022.07.16.02.20.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 02:20:06 -0700 (PDT) User-agent: mu4e 1.6.11; emacs 28.1.50 From: r0man Date: Sat, 16 Jul 2022 11:16:40 +0200 Message-ID: <87r12lqurl.fsf@burningswell.com> MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::432; envelope-from=roman.scherer@burningswell.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" X-getmail-retrieved-from-mailbox: Patches Hello Guix, this patch updates xscreensaver to version 6.04. I had to replace the configure phase, because xscreensaver uses an autoconf script that does not understand the --enable-fast-install flag. Could you please review this patch? Thanks, Roman. From 9fb6c5eb00d6446baf92ebbe88018d4d4a1d081c Mon Sep 17 00:00:00 2001 Message-Id: <9fb6c5eb00d6446baf92ebbe88018d4d4a1d081c.1657962947.git.roman@burningswell.com> From: r0man Date: Sat, 16 Jul 2022 11:13:54 +0200 Subject: [PATCH] gnu: xscreensaver: Update to 6.04. * gnu/packages/xdisorg.scm (xscreensaver): Update to 6.04. --- gnu/packages/xdisorg.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d345bc461d..730b19b51a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1585,7 +1585,7 @@ (define-public gammastep (define-public xscreensaver (package (name "xscreensaver") - (version "5.45") + (version "6.04") (source (origin (method url-fetch) @@ -1593,7 +1593,7 @@ (define-public xscreensaver (string-append "https://www.jwz.org/xscreensaver/xscreensaver-" version ".tar.gz")) (sha256 - (base32 "03fmyjlwjinzv7mih6n07glmys8s877snd8zijk2c0ds6rkxy5kh")))) + (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -1604,9 +1604,24 @@ (define-public xscreensaver (substitute* '("driver/Makefile.in" "po/Makefile.in.in") (("@GTK_DATADIR@") "@datadir@") (("@PO_DATADIR@") "@datadir@")) - #t))) - #:configure-flags '("--with-pam" "--with-proc-interrupts" - "--without-readdisplay") + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; The tarball uses a very old version of autconf. It does not + ;; understand extra flags like `--enable-fast-install', so + ;; we need to invoke it with just what it understands. + (let ((out (assoc-ref outputs "out"))) + ;; 'configure' doesn't understand '--host'. + ,@(if (%current-target-system) + `((setenv "CHOST" ,(%current-target-system))) + '()) + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "SHELL" (which "bash")) + (invoke "./configure" + (string-append "--prefix=" out) + "--with-pam" + "--with-proc-interrupts" + "--without-readdisplay"))))) #:make-flags (list (string-append "AD_DIR=" (assoc-ref %outputs "out") "/lib/X11/app-defaults")))) @@ -1626,6 +1641,7 @@ (define-public xscreensaver ("libjpeg" ,libjpeg-turbo) ("linux-pam" ,linux-pam) ("pango" ,pango) + ("gdk-pixbuf-xlib", gdk-pixbuf-xlib) ("gtk+" ,gtk+) ("perl" ,perl) ("cairo" ,cairo) -- 2.36.1