From patchwork Mon Feb 17 11:02:24 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: 38771 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 CDA6E27BBEA; Mon, 17 Feb 2025 11:03:21 +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 3419227BBE2 for ; Mon, 17 Feb 2025 11:03:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjyu1-0006Vm-1c; Mon, 17 Feb 2025 06:03: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 1tjytz-0006VV-Bn for guix-patches@gnu.org; Mon, 17 Feb 2025 06:03: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 1tjyty-0003Mt-Ps for guix-patches@gnu.org; Mon, 17 Feb 2025 06:03: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=mZAXzgTOAzIjPA8hTFHJXuVhGz+iwFRAE9nyqvv7aieRbWb5eox80SlQs5wVzYitsMp/bApsvmuV4gujh7Zu4St18U84r4xA4iph2a9PYEUdJpNDX+J5fPD+Wm08LYueH3fMmZUjYvIpdbSFTFJENa3pVgKDckC5+FlX7RqHmt2M90rU7gJWjnCBYBCrzRPZc7D6gg6w+zl0+dobEEI3P/TeN+yRXt+Ay3EoOsNgKHB0hZBWFrxokf/bRzRtmrqcdiduRdL0tSDOhNva5fUNzCUezn4TeHsvgVjdLmsY2s2qUddqv4jGuQGPAeggREnpxkM8d3jpOiPyYK3E7t7NeA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tjyty-0006Z7-5z; Mon, 17 Feb 2025 06:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76246] [PATCH v4 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: Mon, 17 Feb 2025 11:03: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.173979017325186 (code B ref 76246); Mon, 17 Feb 2025 11:03:02 +0000 Received: (at 76246) by debbugs.gnu.org; 17 Feb 2025 11:02:53 +0000 Received: from localhost ([127.0.0.1]:43696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjyto-0006Y5-6p for submit@debbugs.gnu.org; Mon, 17 Feb 2025 06:02:52 -0500 Received: from relay.yourmailgateway.de ([188.68.63.162]:43641) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tjytl-0006Xp-Ru for 76246@debbugs.gnu.org; Mon, 17 Feb 2025 06:02:51 -0500 Received: from mors-relay-8201.netcup.net (localhost [127.0.0.1]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4YxKWD3wNpz3wBR for <76246@debbugs.gnu.org>; Mon, 17 Feb 2025 12:02:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1739790168; bh=yvMOwUgO5toxrq//DnN02zVtNzshCAP17cMlFcbi5d0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dyv6kr4k6CHOsPg1y/KYwwnlzzRskbOY9PvvadLzPgcrEav0Vr/19HOSLNu5n49de u+Wpw6W1M3vPiSM8Up6QQ77wOxEwXu3ByctWtcD3v7kCFghf5XXDc/ZAnEwrkerIM1 YK4Fs8O4+5X3qdtbiufmxIvSdNsopozpoxpGAQA8rQxyl4qjg6q3sMU+WjEktfbQY0 56NRoMTJr2ONC5DCy8Ot2FxtA2EAQ5gQzNTe2X5jzbg8NXe+0sf/DsHAfeCQrh/lQb nXseDpYU79FFxiJ6a6nulXXjhK6awSDX2ggjy0VIkeeqkzYRoZMKvIurR58hEoANbo v8QwU7Fer1EZg== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4YxKWD3DKYz3wBM for <76246@debbugs.gnu.org>; Mon, 17 Feb 2025 12:02:48 +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 4YxKWD2WGhz8sWg for <76246@debbugs.gnu.org>; Mon, 17 Feb 2025 12:02:48 +0100 (CET) Received: from florianhp.fritz.box (ipb21a5dbf.dynamic.kabel-deutschland.de [178.26.93.191]) by mxe217.netcup.net (Postfix) with ESMTPSA id EEA6A818C4; Mon, 17 Feb 2025 12:02:42 +0100 (CET) From: Florian Pelz Date: Mon, 17 Feb 2025 12:02:24 +0100 Message-ID: <04aef89d602a509d635059fa48b7cdf85c7ddf97.1739789645.git.pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: EEA6A818C4 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: 72LPVFlIhGzdT84F09BcMfCg+qEqk3u1nXLU6HQEDWRMfAHgXsij8MSb 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")