GNU logs - #76246, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#76246] [PATCH 0/2] Add G-Golf's GTK-4 examples.
Resent-From: Florian Pelz <pelzflorian@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 13 Feb 2025 02:51:01 +0000
Resent-Message-ID: <handler.76246.B.173941501727576 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 76246 <at> debbugs.gnu.org
Cc: "pelzflorian \(Florian Pelz\)" <pelzflorian@HIDDEN>, David Pirotte <david@HIDDEN>
From: Florian Pelz <pelzflorian@HIDDEN>
Date: Thu, 13 Feb 2025 03:48:00 +0100
Message-ID: <cover.1739413638.git.pelzflorian@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=188.68.63.98;
 envelope-from=pelzflorian@HIDDEN; helo=relay.yourmailgateway.de
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,
 RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
 RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN>

This is in response to David Pirotte's request [1] to package in Guix
his G-Golf examples.  I would be happy to receive feedback on whether
this patch’s direction is okay.  Not all examples work fine yet.
hello-world does work, though, and strangely it is unaffected by the
grafts bug [2] that plagues me when I use G-Golf in my Guix Home
configuration...

[1] https://lists.gnu.org/archive/html/guix-devel/2025-02/msg00172.html
[2] https://bugs.gnu.org/75157

pelzflorian (Florian Pelz) (2):
  gnu: Add guile-cairo-next.
  UNFINISHED gnu: Add G-Golf's GTK-4 examples.

 gnu/local.mk                                  |   1 +
 gnu/packages/gtk.scm                          |  23 ++
 gnu/packages/guile-xyz.scm                    |  73 ++++
 .../patches/guile-cairo-fix-make-check.patch  | 352 ++++++++++++++++++
 4 files changed, 449 insertions(+)
 create mode 100644 gnu/packages/patches/guile-cairo-fix-make-check.patch

base-commit: d59a13b6401e7494d8d5c9c9f66df3318451be79
-- 
2.48.1

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Florian Pelz <pelzflorian@HIDDEN>
Subject: bug#76246: Acknowledgement ([PATCH 0/2] Add G-Golf's GTK-4 examples.)
Message-ID: <handler.76246.B.173941501727576.ack <at> debbugs.gnu.org>
References: <cover.1739413638.git.pelzflorian@HIDDEN>
X-Gnu-PR-Message: ack 76246
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 76246 <at> debbugs.gnu.org
Date: Thu, 13 Feb 2025 02:51:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 76246 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
76246: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76246
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#76246] [PATCH 1/2] gnu: Add guile-cairo-next.
Resent-From: Florian Pelz <pelzflorian@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 13 Feb 2025 02:56:02 +0000
Resent-Message-ID: <handler.76246.B76246.173941535428686 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 76246 <at> debbugs.gnu.org
Cc: "pelzflorian \(Florian Pelz\)" <pelzflorian@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
From: Florian Pelz <pelzflorian@HIDDEN>
Date: Thu, 13 Feb 2025 03:55:11 +0100
Message-ID: <315e4d5e141cc2cade7b65bd0b6d5ed28a41184d.1739413638.git.pelzflorian@HIDDEN>
In-Reply-To: <cover.1739413638.git.pelzflorian@HIDDEN>
References: <cover.1739413638.git.pelzflorian@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN>

* gnu/packages/patches/guile-cairo-fix-make-check.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register patch.
* gnu/packages/gtk.scm (guile-cairo-next): New variable.

Change-Id: I328afe58d46e60243e075edead12afc0d1c4a98a
---
 gnu/local.mk                                  |   1 +
 gnu/packages/gtk.scm                          |  23 ++
 .../patches/guile-cairo-fix-make-check.patch  | 352 ++++++++++++++++++
 3 files changed, 376 insertions(+)
 create mode 100644 gnu/packages/patches/guile-cairo-fix-make-check.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 9e192f1e4f..70cc51152f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1535,6 +1535,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/guile-linux-syscalls.patch		\
   %D%/packages/patches/guile-3.0-linux-syscalls.patch		\
   %D%/packages/patches/guile-ac-d-bus-fix-tests.patch		\
+  %D%/packages/patches/guile-cairo-fix-make-check.patch	\
   %D%/packages/patches/guile-lib-fix-tests-for-guile2.2.patch		\
   %D%/packages/patches/guile-fibers-cross-build-fix.patch 	\
   %D%/packages/patches/guile-fibers-destroy-peer-schedulers.patch \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 7ed7d7b7df..4d2356d8cf 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -37,6 +37,7 @@
 ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@HIDDEN>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@HIDDEN>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@HIDDEN>
+;;; Copyright © 2025 Florian Pelz <pelzflorian@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1495,6 +1496,28 @@ (define-public guile2.2-cairo
        ,@(fold alist-delete (package-inputs guile-cairo)
                '("guile" "guile-lib"))))))
 
+(define-public guile-cairo-next
+  (package
+    (inherit guile-cairo)
+    (name "guile-cairo-next")
+    ;; A commit with cairo-pointer->context, missing from guile-cairo@HIDDEN
+    ;; and needed by animated-paintable from g-golf-gtk-4-examples.
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "git://git.savannah.nongnu.org/guile-cairo.git")
+                    (commit "30da459d7a4380174ff243b1560d5512a4bca86e")))
+              (sha256
+               (base32
+                "0dslfldzgxis8g0g3xaffcqnd1njzz23fjy0v3lc0r2694ra4ny4"))
+              ;; A patch to allow running the check phase before install.
+              (patches (search-patches "guile-cairo-fix-make-check.patch"))
+              (file-name (string-append "guile-cairo-next"))))
+    (inputs
+     (list guile-lib guile-3.0 gettext-minimal))
+    (native-inputs
+     (list autoconf-2.71 automake libtool pkg-config texinfo))))
+
 (define-public guile-rsvg
   ;; Use a recent snapshot that supports Guile 2.2 and beyond.
   (let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678")
diff --git a/gnu/packages/patches/guile-cairo-fix-make-check.patch b/gnu/packages/patches/guile-cairo-fix-make-check.patch
new file mode 100644
index 0000000000..d14de7717e
--- /dev/null
+++ b/gnu/packages/patches/guile-cairo-fix-make-check.patch
@@ -0,0 +1,352 @@
+From 1de7b5e994fd99e20849d9372963c2aadf782ed1 Mon Sep 17 00:00:00 2001
+From: David Pirotte <david@HIDDEN>
+Date: Tue, 21 Mar 2023 01:54:04 -0300
+Subject: [PATCH] Fixing make check and make distcheck
+
+  Notes: the main goal of this patch is to remove the hard coded
+  libguile-cairo path, which makes it impossible to run 'make check',
+  unless you actualy first install the version you are working
+  on/checking [which is 'none sense'].
+
+  Also, even with the above problem fixed, there were still a few
+  nitpick things to solve so that make distcheck pass.
+
+  Finally, while workig on this patch, I also made a few cosmetic
+  changes, mostly adding a space before and after '=' in Makefile.am
+  targets, as well as having each filename on its own line for targets
+  that requires filenames. Those changes are not commented here below.
+
+* Makefile.am: (1) removing the env target, as we update env.in
+  this is not only not necessary anymore, but would actually
+  raise an error; (2) the CLEANFILES target misses $(GOBJECTS);
+  (3) using $(AM_V_GEN) in .scm.go target; (4) the EXTRA_DIST
+  target misses $(SOURCES), and does not need to ship autogen.sh
+  nor build-aux/git-version-gen.
+
+* cairo.scm: Call (dynamic-link "libguile-cairo"),
+  not (dynamic-link *cairo-lib-path*).
+
+* cairo/Makefile.am: (1) using $(AM_V_GEN) in .scm.go target; (2) in the
+  config.scm target, removing the @cairolibpath@ substitution; (3) the
+  EXTRA_DIST target misses vector-types.scm and $(NOCOMP_SOURCES).
+
+* cairo/config.scm.in: Removing the *cairo-lib-path* definition.
+
+* env.in: (1) define and use abs_top_srcdir and abs_top_builddir; (2)
+  define and export GUILE_LOAD_PATH, GUILE_LOAD_COMPILED_PATH and
+  LTDL_LIBRARY_PATH.
+
+* tests/unit-tests/Makefile.am: (1) add context-pointer.scm to the TESTS
+  target; (2) add a TEST_EXTENSIONS = .scm target; (3) update the
+  TESTS_ENVIRONMENT to use $(abs_top_builddir); (4) remove the %.check
+  target (unecessary in 'modern' autotools).
+---
+ Makefile.am                  | 26 ++++++++-----
+ cairo.scm                    |  4 +-
+ cairo/Makefile.am            | 30 ++++++++++-----
+ cairo/config.scm.in          |  8 ++--
+ env.in                       | 75 +++++++++++++++++++++++++++++++++---
+ tests/unit-tests/Makefile.am | 21 +++++-----
+ 6 files changed, 125 insertions(+), 39 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 82e41b2..514b758 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,6 @@
+ # guile-cairo
+ # Copyright (C) 2007,2011  Andy Wingo <wingo@HIDDEN>
++# Copyright (C) 2023  David Pirotte <david@HIDDEN>
+ #
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Lesser General Public License as
+@@ -15,18 +16,20 @@
+ # License along with this program.  If not, see
+ # <http://www.gnu.org/licenses/>.
+ 
+-SUBDIRS = guile-cairo cairo examples tests doc
+-
+-env: Makefile env.in
+-	sed -e "s|@top_srcdir\@|$(shell cd $(top_srcdir) && pwd)|" \
+-	    $(srcdir)/env.in > env
+-	chmod +x env
++SUBDIRS = \
++	guile-cairo	\
++	cairo		\
++	examples	\
++	tests		\
++	doc
+ 
+ BUILT_SOURCES = env
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-CLEANFILES = env
++CLEANFILES = \
++	env	\
++	$(GOBJECTS)
+ 
+ GOBJECTS = $(SOURCES:%.scm=%.go)
+ 
+@@ -39,7 +42,8 @@ nobase_nodist_obj_DATA = $(GOBJECTS)
+ GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
+ SUFFIXES = .scm .go
+ .scm.go:
+-	$(top_builddir)/env $(GUILD) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<"
++	$(AM_V_GEN) $(top_builddir)/env \
++	$(GUILD) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<"
+ 
+ SOURCES = cairo.scm
+ 
+@@ -58,4 +62,8 @@ gen-ChangeLog:
+ 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
+ 	fi
+ 
+-EXTRA_DIST = env.in autogen.sh build-aux/git-version-gen HACKING COPYING.LESSER $(scm_DATA)
++EXTRA_DIST = \
++	env.in				\
++	HACKING				\
++	COPYING.LESSER			\
++	$(SOURCES)
+diff --git a/cairo.scm b/cairo.scm
+index 1361d85..2cb2793 100644
+--- a/cairo.scm
++++ b/cairo.scm
+@@ -1,5 +1,6 @@
+ ;; guile-cairo
+ ;; Copyright (C) 2007, 2011 Andy Wingo <wingo at pobox dot com>
++;; Copyright (C) 2023  David Pirotte <david@HIDDEN>
+ 
+ ;; This program is free software; you can redistribute it and/or modify
+ ;; it under the terms of the GNU Lesser General Public License as
+@@ -31,9 +32,10 @@
+ (module-use! (module-public-interface (current-module))
+              (resolve-interface '(cairo vector-types)))
+ 
++
+ ;; This will export many things
+ (dynamic-call "scm_init_cairo"
+-              (dynamic-link *cairo-lib-path*))
++              (dynamic-link "libguile-cairo"))
+ 
+ (if (not (member *cairo-documentation-path* documentation-files))
+     (set! documentation-files (cons *cairo-documentation-path*
+diff --git a/cairo/Makefile.am b/cairo/Makefile.am
+index 05b5973..0299d34 100644
+--- a/cairo/Makefile.am
++++ b/cairo/Makefile.am
+@@ -1,5 +1,6 @@
+ # guile-cairo
+ # Copyright (C) 2007,2011  Andy Wingo <wingo@HIDDEN>
++# Copyright (C) 2023  David Pirotte <david@HIDDEN>
+ #
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Lesser General Public License as
+@@ -15,11 +16,15 @@
+ # License along with this program.  If not, see
+ # <http://www.gnu.org/licenses/>.
+ 
+-moddir=$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)/cairo
+-objdir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache/cairo
++moddir = $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)/cairo
++objdir = $(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache/cairo
+ 
+-SOURCES = config.scm vector-types.scm
+-NOCOMP_SOURCES = cairo-procedures.txt
++SOURCES = \
++	config.scm	\
++	vector-types.scm
++
++NOCOMP_SOURCES = \
++	cairo-procedures.txt
+ 
+ GOBJECTS = $(SOURCES:%.scm=%.go)
+ 
+@@ -29,12 +34,12 @@ nobase_nodist_obj_DATA = $(GOBJECTS)
+ GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
+ SUFFIXES = .scm .go
+ .scm.go:
+-	$(top_builddir)/env $(GUILD) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<"
++	$(AM_V_GEN) $(top_builddir)/env	\
++	$(GUILD) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<"
+ 
+ config.scm: Makefile config.scm.in
+-	sed -e "s|@cairolibpath\@|$(libdir)/libguile-cairo|" \
+-	    -e "s|@cairodocumentationpath\@|$(moddir)/cairo-procedures.txt|" \
+-	    $(srcdir)/config.scm.in > config.scm
++	sed -e "s|\@cairodocumentationpath\@|$(moddir)/cairo-procedures.txt|" \
++		$(srcdir)/config.scm.in > config.scm
+ 
+ cairo-procedures.txt.update:
+ 	echo "Generated from upstream documentation; see COPYING.docs for info." \
+@@ -42,6 +47,11 @@ cairo-procedures.txt.update:
+ 	$(top_srcdir)/doc/docbook-to-guile-doc $(CAIRO_XML_DIR)/*.xml \
+ 	  >> $(srcdir)/cairo-procedures.txt
+ 
+-CLEANFILES = config.scm $(GOBJECTS)
++CLEANFILES = \
++	config.scm	\
++	$(GOBJECTS)
+ 
+-EXTRA_DIST = config.scm.in
++EXTRA_DIST = \
++	config.scm.in		\
++	vector-types.scm	\
++	$(NOCOMP_SOURCES)
+diff --git a/cairo/config.scm.in b/cairo/config.scm.in
+index ab008fb..92895b9 100644
+--- a/cairo/config.scm.in
++++ b/cairo/config.scm.in
+@@ -1,5 +1,6 @@
+ ;; guile-cairo
+ ;; Copyright (C) 2007, 2011 Andy Wingo <wingo pobox.com>
++;; Copyright (C) 2023  David Pirotte <david@HIDDEN>
+ 
+ ;; This program is free software; you can redistribute it and/or modify
+ ;; it under the terms of the GNU Lesser General Public License as
+@@ -22,8 +23,7 @@
+ ;;; Code:
+ 
+ (define-module (cairo config)
+-  :export     (*cairo-lib-path*
+-               *cairo-documentation-path*))
++  :export (*cairo-documentation-path*))
+ 
+-(define *cairo-lib-path* "@cairolibpath@")
+-(define *cairo-documentation-path* "@cairodocumentationpath@")
++(define *cairo-documentation-path*
++  "@cairodocumentationpath@")
+diff --git a/env.in b/env.in
+index eb9d020..e93d212 100644
+--- a/env.in
++++ b/env.in
+@@ -2,6 +2,7 @@
+ 
+ # guile-cairo
+ # Copyright (C) 2007,2011  Andy Wingo <wingo@HIDDEN>
++# Copyright (C) 2023  David Pirotte <david@HIDDEN>
+ #
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Lesser General Public License as
+@@ -17,15 +18,77 @@
+ # License along with this program.  If not, see
+ # <http://www.gnu.org/licenses/>.
+ 
+-this_dir=$(cd $(dirname $0) && pwd)
+-src_dir="@top_srcdir@"
+ 
+-if [ "$src_dir" != "$this_dir" ]; then
+-  GUILE_LOAD_PATH=$src_dir/$pkg:$this_dir/$pkg:$GUILE_LOAD_PATH
++abs_top_srcdir="@abs_top_srcdir@"
++abs_top_builddir="@abs_top_builddir@"
++
++[ x"$abs_top_srcdir"   = x -o ! -d "$abs_top_srcdir" -o \
++  x"$abs_top_builddir" = x -o ! -d "$abs_top_builddir" ] && {
++    echo $0: bad environment
++    echo abs_top_srcdir=$abs_top_srcdir
++    echo abs_top_builddir=$abs_top_builddir
++    exit 1
++}
++
++
++###
++### GUILE_LOAD_PATH
++###
++
++if [ x"$GUILE_LOAD_PATH" = x ]
++then
++    GUILE_LOAD_PATH="${abs_top_srcdir}"
++    if test "${abs_top_srcdir}" != "${abs_top_builddir}"; then
++        GUILE_LOAD_PATH="${abs_top_builddir}:$GUILE_LOAD_PATH"
++    fi
+ else
+-  GUILE_LOAD_PATH=$this_dir/$pkg:$GUILE_LOAD_PATH
++    GUILE_LOAD_PATH="${abs_top_srcdir}:$GUILE_LOAD_PATH"
++    if test "${abs_top_srcdir}" != "${abs_top_builddir}"; then
++        GUILE_LOAD_PATH="${abs_top_builddir}:$GUILE_LOAD_PATH"
++    fi
+ fi
+-
++## echo $GUILE_LOAD_PATH
+ export GUILE_LOAD_PATH
+ 
++
++###
++### GUILE_LOAD_COMPILED_PATH
++###
++
++if [ x"$GUILE_LOAD_COMPILED_PATH" = x ]
++then
++    GUILE_LOAD_COMPILED_PATH="${abs_top_srcdir}"
++    if test "${abs_top_srcdir}" != "${abs_top_builddir}"; then
++        GUILE_LOAD_COMPILED_PATH="${abs_top_builddir}:$GUILE_LOAD_COMPILED_PATH"
++    fi
++else
++    GUILE_LOAD_COMPILED_PATH="${abs_top_srcdir}:$GUILE_LOAD_COMPILED_PATH"
++    if test "${abs_top_srcdir}" != "${abs_top_builddir}"; then
++        GUILE_LOAD_COMPILED_PATH="${abs_top_builddir}:$GUILE_LOAD_COMPILED_PATH"
++    fi
++fi
++
++## echo $GUILE_LOAD_COMPILED_PATH
++export GUILE_LOAD_COMPILED_PATH
++
++
++###
++### LTDL_LIBRARY_PATH
++###
++
++if [ x"$LTDL_LIBRARY_PATH" = x ]
++then
++    LTDL_LIBRARY_PATH="${abs_top_srcdir}/guile-cairo:${abs_top_srcdir}/guile-cairo/.libs"
++    if test "${abs_top_srcdir}" != "${abs_top_builddir}"; then
++        LTDL_LIBRARY_PATH="${abs_top_builddir}/guile-cairo:${abs_top_builddir}/guile-cairo/.libs:$LTDL_LIBRARY_PATH"
++    fi
++else
++    LTDL_LIBRARY_PATH="${abs_top_srcdir}/guile-cairo:${abs_top_srcdir}/guile-cairo/.libs:$LTDL_LIBRARY_PATH"
++    if test "${abs_top_srcdir}" != "${abs_top_builddir}"; then
++        LTDL_LIBRARY_PATH="${abs_top_builddir}/guile-cairo:${abs_top_builddir}/guile-cairo/.libs:$LTDL_LIBRARY_PATH"
++    fi
++fi
++## echo $LTDL_LIBRARY_PATH
++export LTDL_LIBRARY_PATH
++
+ exec "$@"
+diff --git a/tests/unit-tests/Makefile.am b/tests/unit-tests/Makefile.am
+index 3ba6af9..9b13bbd 100644
+--- a/tests/unit-tests/Makefile.am
++++ b/tests/unit-tests/Makefile.am
+@@ -16,18 +16,21 @@
+ # License along with this program.  If not, see
+ # <http://www.gnu.org/licenses/>.
+ 
+-TESTS= \
+-	context-pointer.scm \
++TESTS = \
+ 	api-stability.scm	\
++	context-pointer.scm	\
+ 	version.scm
+ 
+-TESTS_ENVIRONMENT=\
+-	API_FILE=$(srcdir)/cairo.api $(top_builddir)/env guile -s
++TEST_EXTENSIONS = .scm
+ 
+-%.api.update:
+-	$(top_builddir)/env $(srcdir)/update-api $(subst ., ,$*) > $(srcdir)/$*.api
++TESTS_ENVIRONMENT = \
++	API_FILE=$(srcdir)/cairo.api		\
++	$(abs_top_builddir)/env	$(GUILE) --no-auto-compile
+ 
+-%.check: %
+-	$(TESTS_ENVIRONMENT) $*
++%.api.update:
++	$(abs_top_builddir)/env 			\
++	$(srcdir)/update-api $(subst ., ,$*) > $(srcdir)/$*.api
+ 
+-EXTRA_DIST=$(TESTS) cairo.api
++EXTRA_DIST = \
++	$(TESTS)	\
++	cairo.api
+-- 
+2.39.2
+
-- 
2.48.1

Message sent to guix-patches@HIDDEN:

Subject: [bug#76246] [PATCH 2/2] UNFINISHED gnu: Add G-Golf's GTK-4 examples.
Resent-From: Florian Pelz <pelzflorian@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 13 Feb 2025 02:57:02 +0000
Resent-Message-ID: <handler.76246.B76246.173941536928786 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 76246 <at> debbugs.gnu.org
Cc: "pelzflorian \(Florian Pelz\)" <pelzflorian@HIDDEN>
From: Florian Pelz <pelzflorian@HIDDEN>
Date: Thu, 13 Feb 2025 03:55:13 +0100
Message-ID: <3e44e34b7a32f6c1adad22ab36c303e93226f320.1739413638.git.pelzflorian@HIDDEN>
In-Reply-To: <cover.1739413638.git.pelzflorian@HIDDEN>
References: <cover.1739413638.git.pelzflorian@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN>

* gnu/packages/guile-xyz.scm (g-golf-gtk-4-examples): New variable.

Change-Id: I19b182eb71095ca2deacdb4011c8f50dfcfc8476
---
 gnu/packages/guile-xyz.scm | 73 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 92d5d90194..520d1b9f87 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -53,6 +53,7 @@
 ;;; Copyright © 2024 Alec Barreto <mrh57@HIDDEN>
 ;;; Copyright © 2024 Josep Bigorra <jjbigorra@HIDDEN>
 ;;; Copyright © 2024 Ashish SHUKLA <ashish.is@HIDDEN>
+;;; Copyright © 2025 Florian Pelz <pelzflorian@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2618,6 +2619,78 @@ (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))
+                  ,@%default-gnu-modules)
+      #:tests? #f ;there are no tests for examples
+      ;; XXX: Maybe Guix should ship a reftest on its own?
+      #: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.  This also
+                ;; installs UI, CSS and Scheme files to /bin, but
+                ;; better keep how G-Golf packages them.
+                (let ((port (open-file "Makefile" "al")))
+                  (format port "
+prefix = ~a
+bindir = $(prefix)/bin
+.PHONY: install
+install:
+	mkdir -p $(bindir)
+	for f in $(EXTRA_DIST); do	\\
+	  install $$f $(bindir);	\\
+	done
+" #$output)
+                  (close-port port))))
+            (delete 'configure)
+            (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"))
+                       (scm (string-append "/share/guile/site/" version))
+                       (go (string-append "/lib/guile/"
+                                          version "/site-ccache"))
+                       (binaries
+                        (find-files "." (lambda (file stat) ;only executables
+                                          (= (stat:perms stat) #o755)))))
+                  (map (lambda (binary)
+                         ;; The `current-filename' calls in examples are broken.
+                         (system* "sed" "-i" "s/(add-to-load-path.*//g" binary)
+                         ;;TODO DOES NOT WORK (substitute* binary
+                         ;;   (("add-to-load-path.*")
+                         ;;    ""))  DOES NOT WORK NEITHER
+                         (wrap-program (string-append #$output "/bin/" binary)
+                           `("GUILE_LOAD_PATH" prefix
+                             (,(string-append g-golf scm)
+                              ));,(string-append #$output "/bin"))) ;not nice,
+                                ;        ;but better than `add-to-load-path'
+                           `("GUILE_LOAD_COMPILED_PATH" prefix
+                             (,(string-append g-golf go)))
+                           `("GI_TYPELIB_PATH" prefix
+                             (,(getenv "GI_TYPELIB_PATH")))))
+                       binaries))))))))
+    (inputs
+     (list bash-minimal gtk guile-3.0 guile-cairo-next guile-g-golf))
+    (native-inputs (list))
+    (propagated-inputs (list))
+    (synopsis "Example GTK apps written in Guile with G-Golf")
+    (description
+     "Example applications to show what can be done in G-Golf and how to wrap
+the applications in a Guix package.")))
+
 (define-public g-wrap
   (package
     (name "g-wrap")
-- 
2.48.1

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#76246] [PATCH 1/2] gnu: Add guile-cairo-next.
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 13 Feb 2025 08:06:02 +0000
Resent-Message-ID: <handler.76246.B76246.17394339154405 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76246
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Florian Pelz <pelzflorian@HIDDEN>, 76246 <at> debbugs.gnu.org
Cc: Vivien Kraus <vivien@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Received: via spool by 76246-submit <at> debbugs.gnu.org id=B76246.17394339154405
          (code B ref 76246); Thu, 13 Feb 2025 08:06:02 +0000
Received: (at 76246) by debbugs.gnu.org; 13 Feb 2025 08:05:15 +0000
Received: from localhost ([127.0.0.1]:40140 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tiUDb-00017Q-OX
	for submit <at> debbugs.gnu.org; Thu, 13 Feb 2025 03:05:15 -0500
Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:50524)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>)
 id 1tiUDW-00011z-Bw
 for 76246 <at> debbugs.gnu.org; Thu, 13 Feb 2025 03:05:05 -0500
Received: by mail-wm1-x341.google.com with SMTP id
 5b1f17b1804b1-43946b5920cso3269985e9.1
 for <76246 <at> debbugs.gnu.org>; Thu, 13 Feb 2025 00:05:02 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1739433896; x=1740038696; darn=debbugs.gnu.org;
 h=mime-version:user-agent:content-transfer-encoding:references
 :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject
 :date:message-id:reply-to;
 bh=JND9g5VB9LweGOINXhsQ9N7+uxMQzNgKxUWCj62BCxo=;
 b=OU3ThhyAIm4hTKANTxPepm/pAYnqvC69ZnDWOwx2IroUIlv5OI/JzkMY2mt+iRGuFk
 mAaGf6DbGw4f4LdOULtBcggXRUw7I4kAK36/aveejlajzmdoorMYB7eiPLiagZDj6kAT
 1sJ/dnHGgeeVR0mzcULeyvO/raAhilKtwxUbtTgTTSWu8K+Ukk103c2vobXah8/2pY01
 uaACl2XQnEyQjPpEz51oJtVrOKIoSwNrggs/01tHvruZjccy0rPNEeGB6tgaURFSavjE
 /0mYot5Y6/56TaSUQSOd5+f9UuYXOeknkzrHwK89t+kCpNGkQvLFoBR3V21baqDQehrF
 wJtQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1739433896; x=1740038696;
 h=mime-version:user-agent:content-transfer-encoding:references
 :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state
 :from:to:cc:subject:date:message-id:reply-to;
 bh=JND9g5VB9LweGOINXhsQ9N7+uxMQzNgKxUWCj62BCxo=;
 b=bJBiMzQKZKvZoBH+UfCIfwvIjnEu/kQXTQStCB7c4E9QgrbhCrQH/gaVSKVms/3BTz
 aYnCoN7h5b8BsBRYkM85T7GulcnePUr0xIxPCyo/zK1ipeBvl+5fJOl1uFWV3Bd3vw74
 w9sorqS/CT8XcPDK6cO2E7ZNHszC0OgKsTzzwfO89+32wjd7Ck78H7eCZZQRE9icITR8
 +0y97DcudgMdKx74THgEyFzp6IWWk8gq13lL/fNnZxuSvocmOb3Qjx3JnN6y55VxS/QX
 ZbG9kLIdKLhmR044Vw7/ZwHopM4HPBO0pBGsAaGFTvVRPoFg/wpE1KqmYfti4XDn52aO
 6a4g==
X-Forwarded-Encrypted: i=1;
 AJvYcCWr4EultntOftbZA5EIIll7mBZNmbu7KnyfPyQt/HNrIvHvXhH0E7XuApkGRUPINWHZhjCFAA==@debbugs.gnu.org
X-Gm-Message-State: AOJu0YwTcuKg8sB34UXX1twSX7/ZJguxu1Q4bm1shZAlfiSgHla1x8VR
 6lDNP4p6fF8e085hsrnsmk4gWIbIZMFOvaBHIm8GwFH++V7TiQVtO5N/+/wt
X-Gm-Gg: ASbGnctrRcSSXmpM0xv9tV+6Rr0nbLLSvRwnFIp7aRWWKY5wzvLBUiJo0HyTfris6qr
 0N0zLEsGUMcNLvfUBjy/es7WvFp2wGtif6PSIYbxoG6hRqIeaHVMhqCGjVnQCGVxNmyiXFEvOoz
 mUNhs30w2b4ds8WL3ZZ2SgLCr2c/+XBn4dXLjZgGJKn/Cu5DkTG04+vY/kpq7m6xSQn3wy2iNJ+
 b9rFGsnVnp+4aCybhvSKQOSq0fiMLfyulpKIMqct9EtYWdHR8w9KGRwugPgG3D42d8lCEcGTVzB
 3gO+YV9Y7Dvvnh7D4c57g/rgDKU7VAqtp91QGORB0eHHTUtLT3/ocgP4+O5fqfR09hQ=
X-Google-Smtp-Source: AGHT+IGtX35iuMLOy1jlELQx+OgsvP6686QYTcb2+BNZjL9vK7ZnOujynqer6GhZFjXb3FnnE51F2A==
X-Received: by 2002:a05:600c:46cc:b0:439:5f5b:e98 with SMTP id
 5b1f17b1804b1-439601a96f3mr19837785e9.27.1739433895731; 
 Thu, 13 Feb 2025 00:04:55 -0800 (PST)
Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at.
 [85.127.114.32]) by smtp.gmail.com with ESMTPSA id
 5b1f17b1804b1-439617de5b6sm10272215e9.1.2025.02.13.00.04.54
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 13 Feb 2025 00:04:55 -0800 (PST)
Message-ID: <32a050da05dc90d4e69d0c8419e6372c97bfca86.camel@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Thu, 13 Feb 2025 09:05:24 +0100
In-Reply-To: <315e4d5e141cc2cade7b65bd0b6d5ed28a41184d.1739413638.git.pelzflorian@HIDDEN>
References: <cover.1739413638.git.pelzflorian@HIDDEN>
 <315e4d5e141cc2cade7b65bd0b6d5ed28a41184d.1739413638.git.pelzflorian@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 
MIME-Version: 1.0
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Am Donnerstag, dem 13.02.2025 um 03:55 +0100 schrieb Florian Pelz:
> From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN>
>=20
> * gnu/packages/patches/guile-cairo-fix-make-check.patch: New patch.
> * gnu/local.mk (dist_patch_DATA): Register patch.
> * gnu/packages/gtk.scm (guile-cairo-next): New variable.
>=20
> Change-Id: I328afe58d46e60243e075edead12afc0d1c4a98a
> ---
> =C2=A0gnu/local.mk=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=
=A0=C2=A0 1 +
> =C2=A0gnu/packages/gtk.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 23 ++
> =C2=A0.../patches/guile-cairo-fix-make-check.patch=C2=A0 | 352
> ++++++++++++++++++
> =C2=A03 files changed, 376 insertions(+)
> =C2=A0create mode 100644 gnu/packages/patches/guile-cairo-fix-make-
> check.patch
>=20
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 9e192f1e4f..70cc51152f 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1535,6 +1535,7 @@ dist_patch_DATA
> =3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0\
> =C2=A0=C2=A0 %D%/packages/patches/guile-linux-syscalls.patch=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\
> =C2=A0=C2=A0 %D%/packages/patches/guile-3.0-linux-syscalls.patch=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\
> =C2=A0=C2=A0 %D%/packages/patches/guile-ac-d-bus-fix-tests.patch=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\
> +=C2=A0 %D%/packages/patches/guile-cairo-fix-make-check.patch=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\
> =C2=A0=C2=A0 %D%/packages/patches/guile-lib-fix-tests-for-
> guile2.2.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0\
> =C2=A0=C2=A0 %D%/packages/patches/guile-fibers-cross-build-fix.patch=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\
> =C2=A0=C2=A0 %D%/packages/patches/guile-fibers-destroy-peer-schedulers.pa=
tch \
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index 7ed7d7b7df..4d2356d8cf 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -37,6 +37,7 @@
> =C2=A0;;; Copyright =C2=A9 2023, 2024 Zheng Junjie <873216071@HIDDEN>
> =C2=A0;;; Copyright =C2=A9 2023 Janneke Nieuwenhuizen <janneke@HIDDEN>
> =C2=A0;;; Copyright =C2=A9 2024 John Kehayias <john.kehayias@HIDDEN=
om>
> +;;; Copyright =C2=A9 2025 Florian Pelz <pelzflorian@HIDDEN>
> =C2=A0;;;
> =C2=A0;;; This file is part of GNU Guix.
> =C2=A0;;;
> @@ -1495,6 +1496,28 @@ (define-public guile2.2-cairo
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ,@(fold alist-delete (package-=
inputs guile-cairo)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 '("guile" "guile-lib"))))))
> =C2=A0
> +(define-public guile-cairo-next
> +=C2=A0 (package
> +=C2=A0=C2=A0=C2=A0 (inherit guile-cairo)
> +=C2=A0=C2=A0=C2=A0 (name "guile-cairo-next")
> +=C2=A0=C2=A0=C2=A0 ;; A commit with cairo-pointer->context, missing from
> guile-cairo@HIDDEN
> +=C2=A0=C2=A0=C2=A0 ;; and needed by animated-paintable from g-golf-gtk-4=
-examples.
> +=C2=A0=C2=A0=C2=A0 (source (origin
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 (method git-fetch)
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 (uri (git-reference
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (url "git://git.savannah.nongnu.=
org/guile-
> cairo.git")
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (commit
> "30da459d7a4380174ff243b1560d5512a4bca86e")))
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 (sha256
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 (base32
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0
> "0dslfldzgxis8g0g3xaffcqnd1njzz23fjy0v3lc0r2694ra4ny4"))
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 ;; A patch to allow running the check phase before
> install.
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 (patches (search-patches "guile-cairo-fix-make-
> check.patch"))
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 (file-name (string-append "guile-cairo-next"))))
You probably want git-file-name.
> +=C2=A0=C2=A0=C2=A0 (inputs
> +=C2=A0=C2=A0=C2=A0=C2=A0 (list guile-lib guile-3.0 gettext-minimal))
> +=C2=A0=C2=A0=C2=A0 (native-inputs
> +=C2=A0=C2=A0=C2=A0=C2=A0 (list autoconf-2.71 automake libtool pkg-config=
 texinfo))))
Is there a reason for changed inputs?  Does plain autoconf not work?

> +
> =C2=A0(define-public guile-rsvg
> =C2=A0=C2=A0 ;; Use a recent snapshot that supports Guile 2.2 and beyond.
> =C2=A0=C2=A0 (let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678")
> diff --git a/gnu/packages/patches/guile-cairo-fix-make-check.patch
> b/gnu/packages/patches/guile-cairo-fix-make-check.patch
> new file mode 100644
> index 0000000000..d14de7717e
> --- /dev/null
> +++ b/gnu/packages/patches/guile-cairo-fix-make-check.patch
> @@ -0,0 +1,352 @@
> +From 1de7b5e994fd99e20849d9372963c2aadf782ed1 Mon Sep 17 00:00:00
> 2001
> +From: David Pirotte <david@HIDDEN>
> +Date: Tue, 21 Mar 2023 01:54:04 -0300
> +Subject: [PATCH] Fixing make check and make distcheck
> +
> +=C2=A0 Notes: the main goal of this patch is to remove the hard coded
> +=C2=A0 libguile-cairo path, which makes it impossible to run 'make
> check',
> +=C2=A0 unless you actualy first install the version you are working
> +=C2=A0 on/checking [which is 'none sense'].
> +
> +=C2=A0 Also, even with the above problem fixed, there were still a few
> +=C2=A0 nitpick things to solve so that make distcheck pass.
> +
> +=C2=A0 Finally, while workig on this patch, I also made a few cosmetic
> +=C2=A0 changes, mostly adding a space before and after '=3D' in Makefile=
.am
> +=C2=A0 targets, as well as having each filename on its own line for
> targets
> +=C2=A0 that requires filenames. Those changes are not commented here
> below.
> +
> +* Makefile.am: (1) removing the env target, as we update env.in
> +=C2=A0 this is not only not necessary anymore, but would actually
> +=C2=A0 raise an error; (2) the CLEANFILES target misses $(GOBJECTS);
> +=C2=A0 (3) using $(AM_V_GEN) in .scm.go target; (4) the EXTRA_DIST
> +=C2=A0 target misses $(SOURCES), and does not need to ship autogen.sh
> +=C2=A0 nor build-aux/git-version-gen.
> +
> +* cairo.scm: Call (dynamic-link "libguile-cairo"),
> +=C2=A0 not (dynamic-link *cairo-lib-path*).
> +
> +* cairo/Makefile.am: (1) using $(AM_V_GEN) in .scm.go target; (2) in
> the
> +=C2=A0 config.scm target, removing the @cairolibpath@ substitution; (3)
> the
> +=C2=A0 EXTRA_DIST target misses vector-types.scm and $(NOCOMP_SOURCES).
> +
> +* cairo/config.scm.in: Removing the *cairo-lib-path* definition.
> +
> +* env.in: (1) define and use abs_top_srcdir and abs_top_builddir;
> (2)
> +=C2=A0 define and export GUILE_LOAD_PATH, GUILE_LOAD_COMPILED_PATH and
> +=C2=A0 LTDL_LIBRARY_PATH.
> +
> +* tests/unit-tests/Makefile.am: (1) add context-pointer.scm to the
> TESTS
> +=C2=A0 target; (2) add a TEST_EXTENSIONS =3D .scm target; (3) update the
> +=C2=A0 TESTS_ENVIRONMENT to use $(abs_top_builddir); (4) remove the
> %.check
> +=C2=A0 target (unecessary in 'modern' autotools).
> +---
Is this an upstreamed patch?  There are too many cosmetic changes (of
dubious quality) mixed with actual code changes for my personal liking.

Cheers

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#76246] [PATCH 1/2] gnu: Add guile-cairo-next.
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 13 Feb 2025 08:53:02 +0000
Resent-Message-ID: <handler.76246.B76246.173943675324203 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76246
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Florian Pelz <pelzflorian@HIDDEN>
Cc: Vivien Kraus <vivien@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 76246 <at> debbugs.gnu.org
Received: via spool by 76246-submit <at> debbugs.gnu.org id=B76246.173943675324203
          (code B ref 76246); Thu, 13 Feb 2025 08:53:02 +0000
Received: (at 76246) by debbugs.gnu.org; 13 Feb 2025 08:52:33 +0000
Received: from localhost ([127.0.0.1]:40294 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tiUxV-0006IJ-4b
	for submit <at> debbugs.gnu.org; Thu, 13 Feb 2025 03:52:33 -0500
Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]:46434)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>)
 id 1tiUxR-0006Hr-Sw
 for 76246 <at> debbugs.gnu.org; Thu, 13 Feb 2025 03:52:30 -0500
Received: by mail-pl1-x635.google.com with SMTP id
 d9443c01a7336-220c2a87378so8292645ad.1
 for <76246 <at> debbugs.gnu.org>; Thu, 13 Feb 2025 00:52:29 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1739436743; x=1740041543; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=awJ1oc4qhfbJTIDL/vKPNWlpAhBSll3Nn/LkFzJeA8Q=;
 b=QxyQYB9lSBO1vVF3Va4Ce+Gbwi6dS5nrkA94/Ls+y7rZDV0MbToIvqcBQ/j2FUP/kK
 sXLPGHcHLu5IDSji0B/0qHKsYUdrMMADcf1ihVAHNQRANqNFS1zdYuMytl49h5DiVwmh
 SmD1OjJ0KRv1mAwCEhmiEveEbn7FEIeIdZjWFYXenqz1zO0AVL7RpfLCPkOPX0EAK3Jm
 IJ5HjuZ5GQup5Ku3Xa0+jL3ArTx/t8f3sH/h2SZ7Ivkk5Dm9Ed2eEIiou4GdSYzTgzvB
 tODTtDEJ+K1XdylVU9hS/6GcENM1E5PrdpA/gtx0sjF9lh7wnYfmlkjznIHCzMqhv8zH
 4uyA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1739436743; x=1740041543;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=awJ1oc4qhfbJTIDL/vKPNWlpAhBSll3Nn/LkFzJeA8Q=;
 b=g+nrNqu0FS7/+ijpP1h15drzZu480pT54Wo/pPYrBsrt9/s8XHuJy6q2ib015Mbz9M
 iVO1KwGjPl73wTRj5z/CQGetabc/SFffnMztIbz2uBkGP0jVZTx1/cVeJgzbk/yRXIcp
 lcqssKtWa2+rmIE3HsMyP+Vh3Aqs30+1vWf7PKWQ/AiKszFvrR/SqoKuf40Kcr/ojcCc
 MRK/pGBP5zcG/VwUTcgGXupwqRAnEILhe61dQjUIjjhxcFUblnCR+NXQ7PQcbnjh7oo3
 OxDNvNrAlXsZYMThD5RRm3wUnQ1yBhYDf7xJeavPb5IKBjHsrry7iqTV6nz/igWOWhkW
 6TNA==
X-Gm-Message-State: AOJu0YzgTig8+W+bc17/rLsVFmvPqG4FTaCbe9iyfB4bWk2mekq5LYUB
 zzj5TpSYzWovVnLBN6lpRClWld16QjnZaxCscq9F7oI31Vuv47yv
X-Gm-Gg: ASbGncutlYqEo+LKok5VO0ZFTefiiazw4jJW9g80KfBdk47Flhtcry001LjXd95yuSz
 yGCAdWkZ4Oabd4mozUGxbSZIWLh3me33yqV7U/3MWiLIKJTBPJjLY4lnoNO0GhK+1dJnqLYOBFK
 yo/8MS4XewFpx99Hecn3Yiz65y77UUHscCiSQT5SALdoxH33g8Yzu9YgtEHx09gJ0L01Q9E5N8J
 ycKawnwlnUrDp/G5YiUgaIvjWDrFhxcg1Af05WZZ9+A0GB19LEF1h4yRuWZfk48+eC62VtaWlMc
 Ddh0BSkjRUF5
X-Google-Smtp-Source: AGHT+IEQuZPrY+uyKxfKPKmy1XEQmEHibjuRi9nx7Y7fZa5sU1S6ISQtfpPTKs3enLYzm6uB2bYr/g==
X-Received: by 2002:a17:903:228b:b0:220:d601:a6dc with SMTP id
 d9443c01a7336-220d601a850mr21714595ad.22.1739436743575; 
 Thu, 13 Feb 2025 00:52:23 -0800 (PST)
Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89])
 by smtp.gmail.com with ESMTPSA id
 d9443c01a7336-220d556d4bcsm7743585ad.178.2025.02.13.00.52.21
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 13 Feb 2025 00:52:22 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <315e4d5e141cc2cade7b65bd0b6d5ed28a41184d.1739413638.git.pelzflorian@HIDDEN>
 (Florian Pelz's message of "Thu, 13 Feb 2025 03:55:11 +0100")
References: <cover.1739413638.git.pelzflorian@HIDDEN>
 <315e4d5e141cc2cade7b65bd0b6d5ed28a41184d.1739413638.git.pelzflorian@HIDDEN>
Date: Thu, 13 Feb 2025 17:52:10 +0900
Message-ID: <87wmdub51h.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi,

Florian Pelz <pelzflorian@HIDDEN> writes:

> From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN>
>
> * gnu/packages/patches/guile-cairo-fix-make-check.patch: New patch.
> * gnu/local.mk (dist_patch_DATA): Register patch.
> * gnu/packages/gtk.scm (guile-cairo-next): New variable.

[...]

> +(define-public guile-cairo-next
> +  (package
> +    (inherit guile-cairo)
> +    (name "guile-cairo-next")

Typicall when using a specific commit, we let-bind REVISION and COMMIT
variables, so that any reworked package can have revision bumped (I
think that's useful to select the latest version in case multiple
same-named packages exist?).

The version would be computed via

--8<---------------cut here---------------start------------->8---
(version (git-version "last-release-version-string" revision commit))
--8<---------------cut here---------------end--------------->8---

> +    ;; A commit with cairo-pointer->context, missing from guile-cairo@HIDDEN
> +    ;; and needed by animated-paintable from g-golf-gtk-4-examples.
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "git://git.savannah.nongnu.org/guile-cairo.git")
> +                    (commit "30da459d7a4380174ff243b1560d5512a4bca86e")))
> +              (sha256
> +               (base32
> +                "0dslfldzgxis8g0g3xaffcqnd1njzz23fjy0v3lc0r2694ra4ny4"))
> +              ;; A patch to allow running the check phase before install.
> +              (patches (search-patches "guile-cairo-fix-make-check.patch"))
> +              (file-name (string-append "guile-cairo-next"))))

There's also a git-file-name helper to compute file-name.  If you use
Emacs + yasnippet, you should be able to do:

origin...TAB

to have it expanded into the idiomatic form.

> +    (inputs
> +     (list guile-lib guile-3.0 gettext-minimal))

Please sort lexicographically.

The rest LGTM.

-- 
Thanks,
Maxim

Last modified: Thu, 13 Feb 2025 09:00:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.