From patchwork Sun Feb 16 23:52:49 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: 38759 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 45EAF27BBEA; Sun, 16 Feb 2025 23:54:23 +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 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 B5EC427BBE2 for ; Sun, 16 Feb 2025 23:54:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjoSc-0002XS-P4; Sun, 16 Feb 2025 18:54:06 -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 1tjoSY-0002W4-Oh for guix-patches@gnu.org; Sun, 16 Feb 2025 18:54: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 1tjoSY-00014R-GL for guix-patches@gnu.org; Sun, 16 Feb 2025 18:54: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=Y+h+4jzGZgVYOlykBkctakoqh0stdk3tPsDzxbXkePg=; b=IVxrhVj3PnY1c1QmJuXaJSQmJBLtt6JhQm/Zm3DjBC1oYJvojkZMZosaZ75uZbnWGaPFTVVmhTfZAXT4PKaw2jdvyggTofhLn1eOcyrYjiuzYV6DK2thcTfSQ4iejdSodjWYbZuQAIaYXa9SlJrUkAIY1DBm7KsjW2MShV/SrYJRV0UU17v0uLlp0MGcl48q8uIchRhSAsrEmQ6w5xbnNEWsi1rUNucERLIPjEIwlf2dDQNrLFrQWRTGXug0EGxwfwaq0u/2IPZQkmHT0JjRBvUIqNVlOpD2iAtapvL+QbBT5A42+kcj4nDTtPxvmHpoSDjMpHti+cyI97ekY4h08A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tjoSY-0008OB-9D; Sun, 16 Feb 2025 18:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76246] [PATCH 2/5] 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: Sun, 16 Feb 2025 23:54: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.173975000232096 (code B ref 76246); Sun, 16 Feb 2025 23:54:02 +0000 Received: (at 76246) by debbugs.gnu.org; 16 Feb 2025 23:53:22 +0000 Received: from localhost ([127.0.0.1]:39144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjoRu-0008LZ-1H for submit@debbugs.gnu.org; Sun, 16 Feb 2025 18:53:22 -0500 Received: from relay.yourmailgateway.de ([188.68.63.162]:42547) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tjoRr-0008LN-DM for 76246@debbugs.gnu.org; Sun, 16 Feb 2025 18:53:20 -0500 Received: from mors-relay-8201.netcup.net (localhost [127.0.0.1]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4Yx2fV0knNz3s1F for <76246@debbugs.gnu.org>; Mon, 17 Feb 2025 00:53:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1739749986; bh=745hQHYPjYdLd+8ah+Deen3X0424BLLCK/IgU0iCT3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DlpOI/muCnBoR4dTAjhiUVDBAT37qrZIAmN+NhWs2+6mqd5D8QPqjnob59yMccfz9 eo6vyYuTmo1bJeSh2FSNcLfryQ5NAd8pWkTAq8PtIcnNbS2nw0jAKxUfPLaVl53cXb zWKcXyjvPOTRFu83CJ/UVpvZ1cS0vt0aFrgzBpgzwJhP9UpOjyJbmuLALmjN11tRTh OBxxGgz8HTUJJZLs8xBZgrxmkAr+95Pszp/I+dncW+1mULtruG2mZW4S6zifoEQhas IDTmplsqgRtiwn3dkc26kag3Qn9BurkfeKfnMVMeEToHzFxz6VFo20KmfSa4MWAY0E 3towmMrIkPQkQ== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4Yx2fV01C4z3rw4 for <76246@debbugs.gnu.org>; Mon, 17 Feb 2025 00:53:05 +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 4Yx2fR4zv7z8t4M for <76246@debbugs.gnu.org>; Mon, 17 Feb 2025 00:53:03 +0100 (CET) Received: from florianhp.fritz.box (ipb21a5dbf.dynamic.kabel-deutschland.de [178.26.93.191]) by mxe217.netcup.net (Postfix) with ESMTPSA id 7CA4284609; Mon, 17 Feb 2025 00:52:58 +0100 (CET) From: Florian Pelz Date: Mon, 17 Feb 2025 00:52:49 +0100 Message-ID: <565889c10a90c95361aa0b4a58751b710bda207b.1739749706.git.pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 7CA4284609 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: mKBZNTC2GO0FLT70Plj/GHkmRXe00Hnbvsfse05WVBewIzudRovgldmN 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 | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8e893d66c3..2698fdb1c7 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,45 @@ (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 "git://git.savannah.nongnu.org/guile-cairo.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dslfldzgxis8g0g3xaffcqnd1njzz23fjy0v3lc0r2694ra4ny4")))) + ;; To allow running the check phase before install, use a libtool path + ;; similar to David Pirotte's suggested patch + ;; . + (arguments + (substitute-keyword-arguments (package-arguments guile-cairo) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'build 'fix-dynamic-link-path + (lambda _ + ;; Make libguile-cairo foreign extension usable in tests. + (substitute* "cairo/config.scm" + (("\\(define \\*cairo-lib-path\\* .*") + "\(define *cairo-lib-path* \"libguile-cairo\")\n")))) + (add-before 'check 'set-libtool-path + (lambda _ + (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")