From patchwork Tue Feb 18 17:11:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 38827 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 3D88A27BBEA; Tue, 18 Feb 2025 17:12:37 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 0948627BBE2 for ; Tue, 18 Feb 2025 17:12:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkR8f-0000PW-VX; Tue, 18 Feb 2025 12:12:05 -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 1tkR8f-0000P5-AH for guix-patches@gnu.org; Tue, 18 Feb 2025 12:12:05 -0500 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 1tkR8f-0006f7-1C for guix-patches@gnu.org; Tue, 18 Feb 2025 12:12:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=LKmHc897SOMxpmowBqkiDe3epMVMQOeTdfFApsFZFVE=; b=h2/wLjhINQSD6SJJ9lq0hHE1wVe9sC4ah56U5EysjsZi9wGdyxjD52maRjrMfSTtM78YTewlaE8A4CSFTsgN5HLyuMHIgNftS/0XUTTHHLWZPeWR+hiGqZTVyjH1Xrax++Ypaq+HqbYclYuMAiZcy8l+AErKYVhepQfi4FTXAshaUoAdzEPcO5Ed+Mt754V3as00Ww3yJftEdCu3LbY4bXyEVolCxJEryw9o6Pa9sWG+QiLAYmDRNVOyV2N/QXuui2DrbNGGz6qYWpspa9wTAkhKffJ6T6i3WrQDu9oyCvVIG0HR7x640rNF6xoezNpoYCC5Y3n3YRLcTcOnSjyM3Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tkR8e-0008Ks-BJ; Tue, 18 Feb 2025 12:12:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76246] [PATCH v5 1/6] gnu: guile-cairo: Remove expat from inputs. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Tue, 18 Feb 2025 17:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76246 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76246@debbugs.gnu.org Cc: Florian Pelz , Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by 76246-submit@debbugs.gnu.org id=B76246.173989872232009 (code B ref 76246); Tue, 18 Feb 2025 17:12:04 +0000 Received: (at 76246) by debbugs.gnu.org; 18 Feb 2025 17:12:02 +0000 Received: from localhost ([127.0.0.1]:60257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tkR8b-0008K3-Ik for submit@debbugs.gnu.org; Tue, 18 Feb 2025 12:12:01 -0500 Received: from relay.yourmailgateway.de ([188.68.63.102]:58773) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tkR8W-0008JP-Iw for 76246@debbugs.gnu.org; Tue, 18 Feb 2025 12:11:57 -0500 Received: from mors-relay-2502.netcup.net (localhost [127.0.0.1]) by mors-relay-2502.netcup.net (Postfix) with ESMTPS id 4Yy5fg2cQHz6435 for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:11:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1739898715; bh=NM6gNKW1nZQTIWi2L6nZIis/oVyG20kyRFPkbreAi9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QHXpefSMgS0GkDVHV90TlTyvV41htH8IzJYgaW74qAVh67kLjvSkuKxJMmTsU8MSZ rKYlM4viCWHUo6ps1QRAnmBpdhV5H3aj2bz/HbLTx0xmhOH5uOOeUQQM/xF6GzQ8F7 Ywp4oryt2AS061eOgJMYGzsKwjMWRfOC+5RIdXjS2PSWaH5Ar8fTOPLLvWDhmY7/Zm 1O2UOSyS0vbDSlehpzEgvLiND0xtiyCFBzWpmhaeKNaeJmb+/7F34ISkYu7aynYbj6 WzCbs2G3E1AmIZgY73XKMTnMp0dQo+WgOWBOM3PC3gqZAEhbR9L76dLoK4gWo6eak0 Qzxn/0TvsYuJA== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-2502.netcup.net (Postfix) with ESMTPS id 4Yy5fg1tfKz4xM7 for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:11:55 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4Yy5ff4rF1z8sf6 for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:11:53 +0100 (CET) Received: from florianhp.fritz.box (ipb21a5dbf.dynamic.kabel-deutschland.de [178.26.93.191]) by mxe217.netcup.net (Postfix) with ESMTPSA id E620584665; Tue, 18 Feb 2025 18:11:45 +0100 (CET) From: Florian Pelz Date: Tue, 18 Feb 2025 18:11:40 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: E620584665 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: vsyogu39Sz2AUnpHqUvr2J8bseBO/xW1p2ksl3/u/BUtB7pzsoyEDQT3 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 expat is not needed by guile-cairo nor guile2.2-cairo. * gnu/packages/gtk.scm (guile-cairo)[inputs]: Remove expat. Change-Id: Ie8f2c35c52725326cc8f103c45125e4378d29793 --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 011a1db687..8e893d66c3 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1454,7 +1454,7 @@ (define-public guile-cairo (find-files module-dir "\\.scm$")) #t)))))) (inputs - (list guile-lib expat guile-3.0)) + (list guile-lib guile-3.0)) (propagated-inputs ;; The .pc file refers to 'cairo'. (list cairo)) From patchwork Tue Feb 18 17:12:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 38828 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 1AA0F27BBEA; Tue, 18 Feb 2025 17:13:20 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 686DF27BBE2 for ; Tue, 18 Feb 2025 17:13:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkR9k-0000gN-Aa; Tue, 18 Feb 2025 12:13:13 -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 1tkR9b-0000eW-Ft for guix-patches@gnu.org; Tue, 18 Feb 2025 12:13:03 -0500 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 1tkR9b-0006jR-77 for guix-patches@gnu.org; Tue, 18 Feb 2025 12:13:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ipqpf/aa62nPeMV/53kiCFyHmY4TQ4KRd5rM/PeReZA=; b=iACw0wYEVlPKfR0cLB8rJt8UvTn95aC3gBpMbV1pTNrFHn0fvOptytkMxNrkiJh3BDeg1jr+ghwrkPGFsedzzh6ePy/YXBtQY/f/LKRK08NasWeIDSvgeK2ZJtPhjN1syQR7BB+4omNW3iUQkBWWKpTt21O/o+gfedoasPCvQdG9EHGMFeAhvbdgDy6kIdlOYC4a4DChyflPWBbf0lFQZYfkSSUvIEBcSfQmglcb4Nm3hbLVqGENevJWexY98hBcm08Mk/PEmiLp+Byj4EA5LSnytmgBBzJf2yhPpzQTB7SfYZB+8+mEtPpGyO7ayZbuuS1/if6Fj8yZt8aLwYla3A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tkR9a-0008QJ-PN; Tue, 18 Feb 2025 12:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76246] [PATCH v5 2/6] gnu: Add guile-cairo-next. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Tue, 18 Feb 2025 17:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76246 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76246@debbugs.gnu.org Cc: Florian Pelz , Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by 76246-submit@debbugs.gnu.org id=B76246.173989875432223 (code B ref 76246); Tue, 18 Feb 2025 17:13:02 +0000 Received: (at 76246) by debbugs.gnu.org; 18 Feb 2025 17:12:34 +0000 Received: from localhost ([127.0.0.1]:60275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tkR98-0008Nd-5K for submit@debbugs.gnu.org; Tue, 18 Feb 2025 12:12:34 -0500 Received: from relay.yourmailgateway.de ([46.38.247.119]:38059) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tkR95-0008NJ-Ev for 76246@debbugs.gnu.org; Tue, 18 Feb 2025 12:12:32 -0500 Received: from mors-relay-8404.netcup.net (localhost [127.0.0.1]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4Yy5gL0h7Fz85Ts for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:12:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1739898750; bh=yvMOwUgO5toxrq//DnN02zVtNzshCAP17cMlFcbi5d0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MoTzRxvGIZ7DplINX73eIrlC+jB/aUHeXXq151JxQrRADTh6IxB8jKpGiBSW7iJx0 mWtHfloEaADUrx+T9VPqVrgnHkI+G281cv0xamRGmUJfayGqepW0RzaMFogeGWPkwJ ZTsUfSqdSyXVZYVZl4YVTXjk+jatVr3oA/5XlHatoixNdZGqPyY5N/mSYCgwzMly3i o1N6hipOnMeKQ7cyFWdpN23La6zruRNZAmoyJpZkQUO72Q48GzzuT+l1oyNzJCBmkv LEHppvSePzkzSF/+e2x+gxohSUuWiYGRAUW+m0OghWCaZs+enDvOHNSKGpjZ9swYrc WOOXooStbzqzQ== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4Yy5gL0JpCz4xrY for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:12:30 +0100 (CET) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4Yy5gK61CGz8sZf for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:12:29 +0100 (CET) Received: from florianhp.fritz.box (ipb21a5dbf.dynamic.kabel-deutschland.de [178.26.93.191]) by mxe217.netcup.net (Postfix) with ESMTPSA id A7CCC84665; Tue, 18 Feb 2025 18:12:24 +0100 (CET) From: Florian Pelz Date: Tue, 18 Feb 2025 18:12:17 +0100 Message-ID: <04aef89d602a509d635059fa48b7cdf85c7ddf97.1739898237.git.pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: A7CCC84665 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: 8Ma74irLgHnNIYPhzDb5SC0PcaFcJRTOSO4yvU4Z+04FU04AQUodsFce 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 * gnu/packages/gtk.scm (guile-cairo-next): New variable. Change-Id: I328afe58d46e60243e075edead12afc0d1c4a98a --- gnu/packages/gtk.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8e893d66c3..15b43da636 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; Copyright © 2024 John Kehayias +;;; Copyright © 2025 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -1481,6 +1482,47 @@ (define-public guile2.2-cairo ,@(fold alist-delete (package-inputs guile-cairo) '("guile" "guile-lib")))))) +(define-public guile-cairo-next + ;; A commit with cairo-pointer->context, missing from guile-cairo@1.11.2 + ;; and needed by animated-paintable from g-golf-gtk-4-examples. + (let ((commit "30da459d7a4380174ff243b1560d5512a4bca86e") + (revision "0")) + (package + (inherit guile-cairo) + (name "guile-cairo-next") + (version (git-version "1.11.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/guile-cairo.git/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dslfldzgxis8g0g3xaffcqnd1njzz23fjy0v3lc0r2694ra4ny4")))) + (arguments + (substitute-keyword-arguments (package-arguments guile-cairo) + ((#:phases phases) + `(modify-phases ,phases + ;; To allow running the check phase before install, add two phases + ;; similar to David Pirotte's suggested patch: + ;; . + (add-after 'build 'fix-dynamic-link-path + (lambda _ + ;; Dynamic-link libguile-cairo foreign extension by name, not + ;; path. + (substitute* "cairo/config.scm" + (("\\(define \\*cairo-lib-path\\* .*") + "\(define *cairo-lib-path* \"libguile-cairo\")\n")))) + (add-before 'check 'set-libtool-path + (lambda _ + ;; Use appropriate pre-install libtool path in tests. + (setenv "LTDL_LIBRARY_PATH" "../../guile-cairo/.libs"))))))) + (inputs + (list gettext-minimal guile-3.0 guile-lib)) + (native-inputs + (list autoconf automake libtool pkg-config texinfo))))) + (define-public guile-rsvg ;; Use a recent snapshot that supports Guile 2.2 and beyond. (let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678") From patchwork Tue Feb 18 17:12:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 38829 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 321F227BBEA; Tue, 18 Feb 2025 17:14:40 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 B993627BBE2 for ; Tue, 18 Feb 2025 17:14:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkRAo-0000u0-Hr; Tue, 18 Feb 2025 12:14:18 -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 1tkRAZ-0000rO-4l for guix-patches@gnu.org; Tue, 18 Feb 2025 12:14:03 -0500 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 1tkRAY-0006nQ-Sq for guix-patches@gnu.org; Tue, 18 Feb 2025 12:14:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ylHJHJclxqSWBBteYK055FBSX6dvpDpnceGM0UQGbbc=; b=sxrLq/Be4/XLRny7YsjdvY1a3fgkBwxtfSvp/xcGORMuiQPk3GJQnaIdFUVlGwle0adnCPK3H2YXp18SImkw4KFbwmW48kQKTsyfSygq0tpSDB8o083ZcNvqw8Iw1V8vo6gDPQZHHkI6/c8rDR/wYgPhQbpT6ThNgaUFMxoXC6dqC0Mxo/BNFxCD0xg50KsMOF14UYgtXhbujGAM06DzwD226zmfBZLaM/mXk9AELcvpAAC18kQD1COBdLGsSlUrDhZoNF9o8PiGA4FXQFZ5vvBh0QQN+6Pv8ZsG8BoMihDxgRFV556g+cmPPNV5IZ+EQBNLzyRylNmjcCz7vnxMIw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tkRAY-0008WS-MN for guix-patches@gnu.org; Tue, 18 Feb 2025 12:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76246] [PATCH v5 3/6] gnu: guile-g-golf: Document --no-grafts requirement. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Feb 2025 17:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76246 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76246@debbugs.gnu.org Cc: Florian Pelz Received: via spool by 76246-submit@debbugs.gnu.org id=B76246.173989879232499 (code B ref 76246); Tue, 18 Feb 2025 17:14:02 +0000 Received: (at 76246) by debbugs.gnu.org; 18 Feb 2025 17:13:12 +0000 Received: from localhost ([127.0.0.1]:60293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tkR9k-0008S7-9X for submit@debbugs.gnu.org; Tue, 18 Feb 2025 12:13:12 -0500 Received: from relay.yourmailgateway.de ([185.244.194.184]:50387) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tkR9h-0008Rf-7t for 76246@debbugs.gnu.org; Tue, 18 Feb 2025 12:13:09 -0500 Received: from relay01-mors.netcup.net (localhost [127.0.0.1]) by relay01-mors.netcup.net (Postfix) with ESMTPS id 4Yy5h26r1fz94Jp for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:13:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1739898787; bh=UKpD1kMErl8/7Lrk5iUks0B/CntbxaXQV0cHBNtJ19k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pyv2SC9Bp4gHT7rFFxUxin1wYdysvyEQRYGtCCIfZfjZDdHtTLdjgZYM1bKaAULVP DbpjFZxybPu3K2K9b7GfcBiQYu3gq0RRtDNQwTPgRkL5BPLf1rjuWJlkI13hfwCQtE L426Ytl+glQpIKW9/FDYsfQ7VZJ5hqOLlroQD7l1LWT3WvOzrD+rN2r0yuK/au86D3 uWHHpSmh/372iY4tbkepKvPEckAg7VLYp46KlQLZyajhu4O2wVmLhaPAMW++5uvmRE MIjrhA2CRRTjCSOUn3GZ7d4Nk9K3flRw/a0z7NW+V4aIAAmuCzFAmibuPLmZU6fb50 V8sV4xEJIQPVQ== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by relay01-mors.netcup.net (Postfix) with ESMTPS id 4Yy5h268g7z7wTf for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:13:06 +0100 (CET) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4Yy5h24nRGz8sZf for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:13:06 +0100 (CET) Received: from florianhp.fritz.box (ipb21a5dbf.dynamic.kabel-deutschland.de [178.26.93.191]) by mxe217.netcup.net (Postfix) with ESMTPSA id 5D68C8466C; Tue, 18 Feb 2025 18:12:56 +0100 (CET) From: Florian Pelz Date: Tue, 18 Feb 2025 18:12:51 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-NC-CID: P05o+XcaV4/pjopj+IrttG48Ew0DthmD0+ZQsPdeBhx3x7elUg1IByWN 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 Note that packages are unaffected. * gnu/packages/guile-xyz.scm: Tell about grafts bug. Change-Id: Ic0b2c63daa07c693171965d90410aef5a2e41d49 --- gnu/packages/guile-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 921d8b46d6..8fb4448061 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2603,7 +2603,12 @@ (define-public guile-g-golf modern applications in Guile Scheme. It comprises a direct binding to the GObject Introspection API and higher-level functionality for importing Gnome libraries and making GObject classes (and methods) available in Guile's -object-oriented programming system, GOOPS.") +object-oriented programming system, GOOPS. + +Note: Currently, when developing with G-Golf in @command{guix shell}, there is +a @uref{https://bugs.gnu.org/75157, grafts bug in Guix}. To avoid it, use +Guix' @code{--no-grafts} option. Guix packages that use @code{wrap-program} +are unaffected.") (license license:lgpl3+))) (define-public g-golf From patchwork Tue Feb 18 17:13:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 38830 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 0C96227BBEA; Tue, 18 Feb 2025 17:14:54 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 3791027BBE2 for ; Tue, 18 Feb 2025 17:14:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkRAq-0000ut-4L; Tue, 18 Feb 2025 12:14:20 -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 1tkRAZ-0000rY-Ih for guix-patches@gnu.org; Tue, 18 Feb 2025 12:14:03 -0500 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 1tkRAZ-0006nW-9z for guix-patches@gnu.org; Tue, 18 Feb 2025 12:14:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=p74/1M7hkjGU58cBRsD7Kdn/pDAjzifqkoPIBXCGuKQ=; b=jYzs/y37sda4dXdwpfdRwC26diDKRX3f2+6PnbbfvQ22fyIisAOJJVZJnzLN0+gJkDIqEJgDV7+l5hwqr+QNhx/EQIjhPG9r0UNYYRMVFTYGigTLPyvDRhdFM5QFwH33A6sgtgOXTVNHs1JgN615j8/mdZRCTHYNbjloXN7x2/SHVBPx/6Yu7e08dgj0oXRezLCfV96o0gp2TvWvg9xLBEvWrAM25wQPfSiVeoXYRugfhEB/nVtwNUq0oyDQTkhIjiUlkkKJHamqgggmJexhPDuuWLT+z+cedU8R8kjOCNk8TTpKxTNbP3fMhAgHYcNne6nhBM9CW3Rd+rUguZXM7w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tkRAZ-00004t-50 for guix-patches@gnu.org; Tue, 18 Feb 2025 12:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76246] [PATCH v5 4/6] gnu: Add G-Golf's GTK-4 examples. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Feb 2025 17:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76246 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76246@debbugs.gnu.org Cc: Florian Pelz Received: via spool by 76246-submit@debbugs.gnu.org id=B76246.173989883532705 (code B ref 76246); Tue, 18 Feb 2025 17:14:03 +0000 Received: (at 76246) by debbugs.gnu.org; 18 Feb 2025 17:13:55 +0000 Received: from localhost ([127.0.0.1]:60307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tkRAM-0008V5-Ri for submit@debbugs.gnu.org; Tue, 18 Feb 2025 12:13:55 -0500 Received: from relay.yourmailgateway.de ([194.59.206.189]:35673) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tkRAJ-0008Up-Is for 76246@debbugs.gnu.org; Tue, 18 Feb 2025 12:13:48 -0500 Received: from relay02-mors.netcup.net (localhost [127.0.0.1]) by relay02-mors.netcup.net (Postfix) with ESMTPS id 4Yy5hp1Vhxz47bS for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:13:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1739898826; bh=ii0jJfb/6ho5vKuW3pMGflx66fdMWJXYBIOVeJaz58U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gvdAbPc2d+T9ThwpVDYH7Nn79t/ID8IfHwhfcRBEhz+U/BPItZgNDU7YoDbgpBOVd SMoIJ4YHcEkNuXs0zFyNiJGI2haGU1ryYEdjGgLDAYHqRw6/PWLpOwYjPLXvHtKxzO ZpO+dCRIXMB7gxS4ZdRumGWCaG8Gh6CZf6II+Ttd7dtntPqNoAlro7WJAa3oU30D2Z pJbY6Z+FbHWG1Shpga8xDG2fIJONofkDK/LfauuzLqkDvS+EUphWj6QYDUQt//uVeh r+J7QVXCJhVYbHoGR48nAZhhDnxBxe1RDUqop4+XviXAzgz0hJkQWNw77MUovr6X9N zhlhMD25cyHNw== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by relay02-mors.netcup.net (Postfix) with ESMTPS id 4Yy5hp175gz7wnT for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:13:46 +0100 (CET) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4Yy5hn6qfwz8sb8 for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:13:45 +0100 (CET) Received: from florianhp.fritz.box (ipb21a5dbf.dynamic.kabel-deutschland.de [178.26.93.191]) by mxe217.netcup.net (Postfix) with ESMTPSA id 93CBA84631; Tue, 18 Feb 2025 18:13:40 +0100 (CET) From: Florian Pelz Date: Tue, 18 Feb 2025 18:13:28 +0100 Message-ID: <103b82ca676b12e0098627f703641d0fe5f41dc6.1739898237.git.pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 93CBA84631 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: 5KG/UQZG3z1nq/qncuqFC6zYYTYXiC6v8qPITLZ883uPXp7HC7/uAjG5 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 * gnu/packages/guile-xyz.scm (g-golf-gtk-4-examples): New variable. Change-Id: I19b182eb71095ca2deacdb4011c8f50dfcfc8476 --- gnu/packages/guile-xyz.scm | 190 +++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8fb4448061..0c7329c7ea 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2024 Alec Barreto ;;; Copyright © 2024 Josep Bigorra ;;; Copyright © 2024 Ashish SHUKLA +;;; Copyright © 2025 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -2623,6 +2624,195 @@ (define-public guile2.2-g-golf (replace "guile" guile-2.2) (replace "guile-lib" guile2.2-lib))))) +(define-public g-golf-gtk-4-examples + (package + (inherit guile-g-golf) + (name "g-golf-gtk-4-examples") + (arguments + (list + #:modules `(((guix build guile-build-system) + #:select + (target-guile-effective-version)) + (srfi srfi-26) + ,@%default-gnu-modules) + #:phases + (with-imported-modules `((guix build guile-build-system) + ,@%default-gnu-imported-modules) + #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-examples + (lambda _ + (chdir "examples/gtk-4") + ;; Re-use the existing Makefile for its wildcard syntax. + (rename-file "Makefile.am" "Makefile") + ;; Add a rule to install the examples. We install to the + ;; documentation directory where examples are usually located, + ;; but we will later create a copy in /bin for `guix shell'. + (let ((port (open-file "Makefile" "al"))) + (format port " +prefix = ~a +bindir = $(prefix)/bin +examplesdir = $(prefix)/share/doc/g-golf/examples/gtk-4 +.PHONY: install +install: + mkdir -p $(bindir) + mkdir -p $(examplesdir)/css + mkdir -p $(examplesdir)/demos + mkdir -p $(examplesdir)/images + mkdir -p $(examplesdir)/ui + for f in $(EXTRA_DIST); do \\ + cp $$f $(examplesdir)/$$f; \\ + done + install demos/libfpt.so $(examplesdir)/demos +" #$output) + (close-port port)))) + (delete 'configure) + (replace 'build + (lambda _ + ;; The layout-manager-2 example calls `make', GCC at run-time. + ;; But since it would compile to the read-only /gnu/store, we + ;; deviate by compiling in advance in the build phase, + ;; ignoring failing `make' calls. We do not propagate `make'. + (with-directory-excursion "demos" + (when #$(%current-target-system) + (substitute* "Makefile" + (("^CC = gcc$") + (string-append "CC = " #$(cc-for-target) "\n")))) + (system* "make")))) + ;; There are no tests for examples, but we do an installcheck phase, + ;; which respects when #:tests? is turned off. So delete 'check. + (delete 'check) + (add-before 'install 'patch-scm-files + (lambda* (#:key inputs #:allow-other-keys) + ;; `current-filename' calls in examples are broken. + (map (lambda (binary) + (let ((installed-binary (string-append + #$output "\ +/share/doc/g-golf/examples/gtk-4/" binary))) + (substitute* binary + (("\\(current-filename\\)") + (string-append "\"" installed-binary "\"")) + (("\\(getcwd\\)") + (string-append "\"" #$output "\ +/share/doc/g-golf/examples/gtk-4\"")) + (("^exec guile ") + (string-append + "exec " (search-input-file inputs "/bin/guile") + " "))))) + (map (cut string-drop <> 2) ;strip ./ prefix + (find-files "." (lambda (file stat) + ;executables or .scm modules + (or (= (stat:perms stat) #o755) + (string-suffix? ".scm" + file)))))))) + (add-after 'install 'wrap-binaries + (lambda* (#:key inputs #:allow-other-keys) + (let* ((version (target-guile-effective-version)) + (g-golf (assoc-ref inputs "guile-g-golf")) + (gcairo (assoc-ref inputs "guile-cairo-next")) + (adwaita-icons (assoc-ref inputs "adwaita-icon-theme")) + (scm (string-append "/share/guile/site/" version)) + (go (string-append "/lib/guile/" + version "/site-ccache")) + (binaries + (find-files "." (lambda (file stat) ;executables + (= (stat:perms stat) #o755))))) + (map (lambda (binary) + (let ((installed-binary (string-append + #$output "/\ +share/doc/g-golf/examples/gtk-4/" binary))) + (wrap-program installed-binary + `("GUILE_LOAD_PATH" prefix + (,(string-append g-golf scm) + ,(string-append gcairo scm))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append g-golf go) + ,(string-append gcairo go))) + `("GI_TYPELIB_PATH" prefix + (,(getenv "GI_TYPELIB_PATH"))) + ;; Library path for libraries loaded by binaries. + `("LD_LIBRARY_PATH" prefix + (,(string-append gcairo "/lib"))) + `("XDG_DATA_DIRS" suffix + (,(string-append adwaita-icons "/share")))) + ;; Also create a copy in /bin for `guix shell'. + (copy-file installed-binary + (string-append #$output "/bin/" binary)))) + binaries)))) + ;; Add installcheck to ensure nothing breaks. + (add-after 'strip 'installcheck + (lambda* (#:key inputs tests? #:allow-other-keys) + (cond + ((not tests?) + (display "test suite not run\n")) + (#$(%current-target-system) + (display "cross-compiling; reftest skipped\n")) + (else + ;; Start an X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (let* ((g-golf-drawing (string-append + #$output "\ +/share/doc/g-golf/examples/gtk-4/drawing-widget")) + (pid (spawn g-golf-drawing `(,g-golf-drawing) + #:search-path? #f))) + (sleep 10) ;2s is enough on my machine + (display "Taking a screenshot with G-Golf.\n") + (system* "import" "-window" "root" + "drawing-widget.out.png") + (sleep 5) ;1s is enough on my machine + (kill pid SIGINT) + (waitpid pid)) + (let* ((python (search-input-file inputs "/bin/python3")) + (pygobject-drawing #$(this-package-native-input + "drawing-widget.py")) + (pid (spawn python `(,python ,pygobject-drawing) + #:search-path? #f))) + (sleep 5) ;1s is enough on my machine + (display "Taking a screenshot with Pygobject.\n") + (system* "import" "-window" "root" + "drawing-widget.ref.png") + (sleep 5) + (kill pid SIGINT) + (waitpid pid)) + (if (= (pk (system* "compare" "-metric" "AE" "-fuzz" "1%" + "drawing-widget.out.png" + "drawing-widget.ref.png" + "drawing-widget.dif.png")) 0) + (display "All good; they look the same.\n") + (error "Reftest failed; screenshots differ.")))))))))) + (inputs + (list adwaita-icon-theme + bash-minimal + gtk + guile-3.0 + guile-cairo-next + guile-g-golf)) + (native-inputs + (list pkg-config + which + ;; For installcheck: + imagemagick + python-minimal + python-pygobject + xorg-server-for-tests + ;; Python version of drawing-widget from + ;; https://lists.gnu.org/archive/html/guile-user/2024-05/msg00032.html + (origin + (method url-fetch) + (uri "\ +https://lists.gnu.org/archive/html/guile-user/2024-05/txtT_80XuINsX.txt") + (sha256 + (base32 + "07j2v159a3bb99i8kwbqrcgslcmhhnqa5ah53q2b9bdk8042grsx")) + (file-name "drawing-widget.py")))) + (propagated-inputs (list)) + (synopsis "Example GTK 4 apps written in Guile with G-Golf") + (description + "G-Golf port of (a subset of) the upstream @code{gtk4-demo} examples in +the @code{gtk:bin} Guix package output. Run @command{guix edit +g-golf-gtk-4-examples} for inspiration how to wrap G-Golf applications when +writing a Guix package."))) + (define-public g-wrap (package (name "g-wrap") From patchwork Tue Feb 18 17:16:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 38831 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 14BEC27BBEA; Tue, 18 Feb 2025 17:17:34 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 7BD3F27BBE2 for ; Tue, 18 Feb 2025 17:17:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkRDf-0001XL-9y; Tue, 18 Feb 2025 12:17: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 1tkRDT-0001Wa-KN for guix-patches@gnu.org; Tue, 18 Feb 2025 12:17:04 -0500 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 1tkRDT-0007IW-Be for guix-patches@gnu.org; Tue, 18 Feb 2025 12:17:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=iRc2i5A6xSAwqPY2bUHljdW/aum/2+0u8hu7gsAb41o=; b=pTW4d1LkLbyAn27ncJ2c12xC2bV1MgCTqXp36UHxwaHLk/Zkp+EPRKret4uETeoqJW9ir0hX7PVFDqhr3dIavp0Vl4RzKJ/G8G5sHSyeJTsNzT+Vr8ijuxVoJecCh/+HgOkFn3FyDcJj8XY7X4zIYzC3h1CqxXfJUnI5SXbRb216snCSkymFTUvrqacEec6JeJuaxzyrEjVx4adPFHRxgHm7gSRB8kirktglElnxP21SzZSVBLX4BsX+MO942OV9hd3W9nhpsoDKpc0dvMdv+50OqR1HQIIEBGiDTZqfeCztXNxg1SKi0lQiwqUC0OE0HMJ/Wlw07hhxLofibLdhfg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tkRDT-0000SX-5U for guix-patches@gnu.org; Tue, 18 Feb 2025 12:17:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76246] [PATCH v5 5/6] gnu: Add G-Golf's Adw-1 examples. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Feb 2025 17:17:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76246 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76246@debbugs.gnu.org Cc: Florian Pelz Received: via spool by 76246-submit@debbugs.gnu.org id=B76246.17398990191724 (code B ref 76246); Tue, 18 Feb 2025 17:17:03 +0000 Received: (at 76246) by debbugs.gnu.org; 18 Feb 2025 17:16:59 +0000 Received: from localhost ([127.0.0.1]:60353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tkRDO-0000Rj-An for submit@debbugs.gnu.org; Tue, 18 Feb 2025 12:16:58 -0500 Received: from relay.yourmailgateway.de ([188.68.61.103]:58269) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tkRDK-0000RE-Iu for 76246@debbugs.gnu.org; Tue, 18 Feb 2025 12:16:56 -0500 Received: from mors-relay-8403.netcup.net (localhost [127.0.0.1]) by mors-relay-8403.netcup.net (Postfix) with ESMTPS id 4Yy5mP2SY8z8657 for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:16:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1739899013; bh=F1lJPQjvzXcD4XDrG2FyEaRK8OS8KgJfe3xnSQ/roAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SpsxpIqBJ/K0cjKip3vXBYCNmvStxcPpoEzD8VJPg+F0zsH1jfSL0wGlb9ZFnzG8f UrDgDHWHkIZ2XUBxAOWjCCLFtImb3KJhyjOjeC1KSSD4DhFYMt5OU6AD0FD/T6/l9L 6dbvMb1RS5avheOyUZzE3cjwvBTH/0AEjY1xMIs7kdrmnsi/DzoZyeDbFn8MtAE3l8 AOvimSrqcv5nEsvLlCv9ucuQhGPZ5W1AA4L7FpKQW6LrXmsb1H4qRPqSkf6EL01LvX I1WmfbU4Odux8DgxWV4nBGg5mlaQWQLt+HlmMHTYLgidh87Y+y9PPBS+88mAXgXyFR ugTlUn+HnIP0A== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8403.netcup.net (Postfix) with ESMTPS id 4Yy5mP249Nz8655 for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:16:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4Yy5mN49Ybz8tY3 for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:16:52 +0100 (CET) Received: from florianhp.fritz.box (ipb21a5dbf.dynamic.kabel-deutschland.de [178.26.93.191]) by mxe217.netcup.net (Postfix) with ESMTPSA id ED3A884631; Tue, 18 Feb 2025 18:16:46 +0100 (CET) From: Florian Pelz Date: Tue, 18 Feb 2025 18:16:04 +0100 Message-ID: <583fb5e4ad1bf844875ecf4c41d9e19afe8067ff.1739898237.git.pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: ED3A884631 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: 2/KCI3+Hp3mAHg1R+QGlMOsPOWr4qPcjKF0zcP2Ss9GYzj6s200U2Kzu 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 * gnu/packages/guile-xyz.scm (g-golf-adw-1-examples): New variable. Change-Id: I160e58ceaeb4867f9b21a0a32f198113e36b5c88 --- gnu/packages/guile-xyz.scm | 135 +++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0c7329c7ea..bac21afc4f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2813,6 +2813,141 @@ (define-public g-golf-gtk-4-examples g-golf-gtk-4-examples} for inspiration how to wrap G-Golf applications when writing a Guix package."))) +(define-public g-golf-adw-1-examples + (package + (inherit guile-g-golf) + (name "g-golf-adw-1-examples") + (build-system glib-or-gtk-build-system) + (arguments + (list + #:tests? #f ;there are no tests for examples + #:modules `(((guix build guile-build-system) + #:select + (target-guile-effective-version)) + (guix build glib-or-gtk-build-system) + (srfi srfi-26) + ,@%default-gnu-modules) + #:phases + (with-imported-modules `((guix build guile-build-system) + ,@%default-gnu-imported-modules) + #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-examples + (lambda _ + (chdir "examples/adw-1") + ;; Re-use the existing Makefile for its wildcard syntax. + (rename-file "Makefile.am" "Makefile") + (substitute* "Makefile" + ;; Fix syntax error. + (("hello-world") + "hello-world \\")) + ;; Add a rule to install the examples. We install to the + ;; documentation directory where examples are usually located, + ;; but we will later create a copy in /bin for `guix shell'. + (let ((port (open-file "Makefile" "al"))) + (format port " +prefix = ~a +bindir = $(prefix)/bin +examplesdir = $(prefix)/share/doc/g-golf/examples/adw-1 +.PHONY: install +install: + mkdir -p $(bindir) + mkdir -p $(examplesdir)/demo/icons + mkdir -p $(examplesdir)/demo/pages + for f in $(EXTRA_DIST); do \\ + cp -r $$f $(examplesdir)/$$f; \\ + done + cp demo/g-resources $(examplesdir)/demo/g-resources +" #$output) + (close-port port)))) + (delete 'configure) + (replace 'build + (lambda _ + ;; Create files for adwaita-1-demo needed in install phase. + (with-directory-excursion "demo" + (system* "make") + (system* "glib-compile-resources" + "--target" "g-resources" + "g-resources.xml")))) + (add-before 'install 'patch-scm-files + (lambda* (#:key inputs #:allow-other-keys) + ;; `current-filename' calls in examples are broken. + (map (lambda (binary) + (let ((installed-binary (string-append + #$output "\ +/share/doc/g-golf/examples/adw-1/" binary))) + (substitute* binary + (("\\(current-filename\\)") + (string-append "\"" installed-binary "\"")) + (("^exec guile ") + (string-append + "exec " (search-input-file inputs "/bin/guile") + " "))))) + (map (cut string-drop <> 2) ;strip ./ prefix + (find-files "." (lambda (file stat) + ;executables or .scm modules + (or (= (stat:perms stat) #o755) + (string-suffix? ".scm" + file)))))))) + (add-after 'install 'wrap-binaries + (lambda* (#:key inputs #:allow-other-keys) + (let* ((version (target-guile-effective-version)) + (g-golf (assoc-ref inputs "guile-g-golf")) + (adwaita-icons (assoc-ref inputs "adwaita-icon-theme")) + (libadwaita-icons (assoc-ref inputs "libadwaita")) + (scm (string-append "/share/guile/site/" version)) + (go (string-append "/lib/guile/" + version "/site-ccache")) + (binaries + (find-files "." (lambda (file stat) ;executables + (= (stat:perms stat) #o755))))) + (map (lambda (binary) + (let ((installed-binary (string-append + #$output "\ +/share/doc/g-golf/examples/adw-1/" binary))) + (wrap-program installed-binary + `("GUILE_LOAD_PATH" prefix + (,(string-append g-golf scm))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append g-golf go))) + `("GI_TYPELIB_PATH" prefix + (,(getenv "GI_TYPELIB_PATH"))) + `("GUIX_GDK_PIXBUF_MODULE_FILES" suffix + (,(getenv "GUIX_GDK_PIXBUF_MODULE_FILES"))) + `("XDG_DATA_DIRS" suffix + (,(string-append #$output "/bin/demo") + ,(string-append adwaita-icons "/share") + ,(string-append libadwaita-icons "/share")))))) + binaries)))) + (add-after 'wrap-binaries 'copy-binaries + (lambda _ + (copy-file (string-append + #$output "\ +/share/doc/g-golf/examples/adw-1/demo/adwaita-1-demo") + (string-append + #$output "/bin/adwaita-1-demo")) + (copy-file (string-append + #$output "\ +/share/doc/g-golf/examples/adw-1/hello-world") + (string-append + #$output "/bin/hello-world")))))))) + (inputs + (list adwaita-icon-theme + bash-minimal + libadwaita + (librsvg-for-system) + gtk + guile-3.0 + guile-g-golf)) + (native-inputs (list `(,glib "bin") ;for glib-compile-resources + guile-3.0)) + (propagated-inputs (list)) + (synopsis "Example Adwaita 1 apps written in Guile with G-Golf") + (description + "G-Golf port of (a subset of) the upstream @code{adwaita-1-demo} examples +in the @code{libadwaita} Guix package. Run @command{guix edit +g-golf-adw-1-examples} for inspiration how to wrap G-Golf applications when +writing a Guix package."))) + (define-public g-wrap (package (name "g-wrap") From patchwork Tue Feb 18 17:17:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 38832 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 955FE27BBEA; Tue, 18 Feb 2025 17:18:14 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 34B2427BBE2 for ; Tue, 18 Feb 2025 17:18:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkRES-0001fj-BW; Tue, 18 Feb 2025 12:18:04 -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 1tkREQ-0001fS-Bm for guix-patches@gnu.org; Tue, 18 Feb 2025 12:18:02 -0500 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 1tkREP-0007Ld-RQ for guix-patches@gnu.org; Tue, 18 Feb 2025 12:18:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ZKVy98S4juFG/7pfknAFnSV/hNrZgr0s1GcmDXHNJyI=; b=OaP/Dsq5N09eyaFiG3qRSDOq2Fm2Rz2GQElEPQV4cdxS+9SJ0+MACiZaovr3z+V6QJfKvoCMmA8PwfupOmacVpn8sJT/cHFMPjqqNiPK6PAlUYRaeZpsDl4RrGnj18efSapAFzbe/d8xxKWeTRTTQ9DbYeR3U8abJ4vKYTYk/JJSfKfc6f2qYIlSP1V0LqR4g9Ql1D4A3apsdrjW3wg7Q+CbqKzmwolVfkzRovOiVHJoFVdkLBfuSLttroNvkRimfL4u4yzo2ssj2354ve53IMTInlxLNc000D5n4wuwcuBNAL3X1hl9o+QdRmqQU+URgX6oZDF6lUY+NGOmDbcq4Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tkREP-0000Yu-Lu for guix-patches@gnu.org; Tue, 18 Feb 2025 12:18:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76246] [PATCH v5 6/6] gnu: g-golf: Redefine as a non-deprecated alias. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Feb 2025 17:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76246 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76246@debbugs.gnu.org Cc: Florian Pelz Received: via spool by 76246-submit@debbugs.gnu.org id=B76246.17398990712084 (code B ref 76246); Tue, 18 Feb 2025 17:18:01 +0000 Received: (at 76246) by debbugs.gnu.org; 18 Feb 2025 17:17:51 +0000 Received: from localhost ([127.0.0.1]:60370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tkREF-0000XX-7A for submit@debbugs.gnu.org; Tue, 18 Feb 2025 12:17:51 -0500 Received: from relay.yourmailgateway.de ([188.68.63.102]:45811) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tkRED-0000XD-0R for 76246@debbugs.gnu.org; Tue, 18 Feb 2025 12:17:49 -0500 Received: from mors-relay-2502.netcup.net (localhost [127.0.0.1]) by mors-relay-2502.netcup.net (Postfix) with ESMTPS id 4Yy5nS0rktz65tC for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:17:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1739899068; bh=MB6OhT22GX8TrIXCVxm/5B0/mZSSfd8aTC3ePIAHZpQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JI/KyMN80cHnIfPrw/8Go4RpoqRAEOprOghkRasAFfNOhpPo4zT3QgRmrt0Y4azDD aKPj/F47x7abnKlNhh/IQMvOvzqXSLmh1baGRL4kgDxA3KqpgkLTKLDJMscaDOQ1EA tPdX28w4q3mW3Sn68N6MTSR00uYmKLtCKO0GSQM+ZKgZWEYGoXjRGwlRKBDkyKSIvR 2GIXDQtzQMLntCjY1EjZp7w0fGDiqUgyBqkEHHAMbrnDHtYEMI2VHijqrCstO/rFsp W1f7PjJGshh9cr/uV2DcqjxInCeNcLXItaPQANf7AbgrsMsHR5ohqt2SiBIBn9mx4u 0NOumnp5gTkmw== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-2502.netcup.net (Postfix) with ESMTPS id 4Yy5nS08TLz4xM7 for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:17:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4Yy5nQ5TRrz8t4F for <76246@debbugs.gnu.org>; Tue, 18 Feb 2025 18:17:46 +0100 (CET) Received: from florianhp.fritz.box (ipb21a5dbf.dynamic.kabel-deutschland.de [178.26.93.191]) by mxe217.netcup.net (Postfix) with ESMTPSA id 68D9F845C9; Tue, 18 Feb 2025 18:17:41 +0100 (CET) From: Florian Pelz Date: Tue, 18 Feb 2025 18:17:28 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 68D9F845C9 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: 7Pa5vb4eVqck0d1NsrEDVbQmz9TIqYJ6x7Rm8kEOJavsjRiONiuNlrX2 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 As proposed by Maxim Cournoyer . * gnu/packages/guile-xyz.scm (g-golf: Redefine. Change-Id: I850e05d46c026d6a27c8765ff3753c1bbe555235 --- gnu/packages/guile-xyz.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index bac21afc4f..0fc6123f1d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2613,7 +2613,9 @@ (define-public guile-g-golf (license license:lgpl3+))) (define-public g-golf - (deprecated-package "g-golf" guile-g-golf)) + (package + (inherit guile-g-golf) + (name "g-golf"))) (define-public guile2.2-g-golf (package