From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WIFYLZRDAWUDeQAAauVa8A:P1 (envelope-from ) for ; Wed, 13 Sep 2023 07:07:32 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WIFYLZRDAWUDeQAAauVa8A (envelope-from ) for ; Wed, 13 Sep 2023 07:07:32 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8266963618 for ; Wed, 13 Sep 2023 07:07:32 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="y rmpJxf"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1694581652; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Cc9mMhJh8x17kSkXYUY410gAqyv8QORUBR/F+Qw7uzw=; b=KeLdqtRMPTBqhGR0PmPhwX8wejSQkWxLq/J9hsVUF721HuJRSKEYGLjk210DKeg9qIiuu5 7yXgbIfCZEF7fPCykYHEVhKxGq5S2nSkZqdNAx0uCXOb4if9JtyoHP9l7NVOJ8lNKoOzqo qu1qjqwC7WqSu9I2jh5kPC4PX7PP3Bx416UAhXhe4dtohTuDkEEQi7G5gaAOyygCnUcDrx yYAO6+5PEIXSQZgBBzkiFzs5uS8EmAzezcNCuT81ubAutRIBWaN6Qem1rNHGNerDl8iKqr rd79fC811gJk3SwmvHRv0Sr3iY/01pp1idkcsxWN8XmRLkSwamuIyUpy25ND2Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1694581652; a=rsa-sha256; cv=none; b=WkGpEiw2dJsuRAGZJI0s4GTD/RxP8kOWKsSC9jy5KReD/BRFzO+RcOnnJ6gkuiZs5msCHH eDe0bAdPhMA9gZdbLGpDUoTjNPPjjqsNsi7Z17LmFGDAQIwySaPl3G1SD3piF/LcfMiA2f T1PZnq8X8ZnO/klnfAhRxgkdme0kSc0gDWIwDO2lySBHf8B/2HDyrAPpJe8KS7wmFNXkf8 B+ditj9OQ7ofb9M/wNmOTNeZQDY8PsNW2Bc1XAYhG/1jArgrD/kgmRt3TwvOYWnK2wTQQW 1y/ZS4Wv8k+xovn1Bx2O1X2QNTuFS9Z1vvPqroTOC7z7GP/EQ7Yj8zp5Fhu8UQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="y rmpJxf"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgI5f-0002Ok-PQ; Wed, 13 Sep 2023 01:07:03 -0400 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 1qgI5a-0002Ne-JC for guix-patches@gnu.org; Wed, 13 Sep 2023 01:06:58 -0400 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 1qgI5a-0001ox-7e for guix-patches@gnu.org; Wed, 13 Sep 2023 01:06:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qgI5e-0006ZD-TS for guix-patches@gnu.org; Wed, 13 Sep 2023 01:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65828] [gnome-team v5 1/2] gnu: gegl: Update to 0.4.46. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Sep 2023 05:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 65828@debbugs.gnu.org Cc: rg@raghavgururajan.name, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 65828-submit@debbugs.gnu.org id=B65828.169458159525155 (code B ref 65828); Wed, 13 Sep 2023 05:07:02 +0000 Received: (at 65828) by debbugs.gnu.org; 13 Sep 2023 05:06:35 +0000 Received: from localhost ([127.0.0.1]:60511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgI5C-0006Xe-QY for submit@debbugs.gnu.org; Wed, 13 Sep 2023 01:06:35 -0400 Received: from planete-kraus.eu ([89.234.140.182]:37998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgI55-0006XR-I4 for 65828@debbugs.gnu.org; Wed, 13 Sep 2023 01:06:33 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id be2173a9; Wed, 13 Sep 2023 05:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=vPPtMUhr1TLQuhForE9u43MtJsg=; b=y rmpJxfsnX+50enXHcnXbln1gc4z+s7LRByfB5fVYhjnSXAPySod/l4r2PC/UlKwo drIpF0njrnFjzw4jEMVpQYRVr4YvUUrnEagtkGlTUdQMKJ435bW9J+2PSVf+eBZV 85OO5pG0Z3mNUBJ0N7l/fDse8QAGZmWLi/CFUlwZktR3n3z8z1TWZaWMi1kr++O0 2Ln64gs6+XRuOt+8g7oU2HmPNeZw/C3xHlgfnuOO9NYYyqq0lNYG7rj/Ko1S6Z7z u8Ty74JxBATE4V54sYJ7p3sJ58xIQJMXkZZzn96poEh3XElwcoGJuI1ZxXZkosD0 7FUOzRgKleE49M5fkjzHg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 9fd95493 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 13 Sep 2023 05:06:21 +0000 (UTC) Message-ID: <6348202d5041e8bb320751ad5557008a5dfec656.1694581316.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Fri, 8 Sep 2023 18:50:18 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -1.28 X-Spam-Score: -1.28 X-Migadu-Queue-Id: 8266963618 X-Migadu-Scanner: mx0.migadu.com X-TUID: NAdO9wNAz6ed * gnu/packages/gimp.scm (gegl): Update to 0.4.46. * gnu/packages/gimp.scm (gegl-0.4.44): New variable. * gnu/packages/gnome.scm (gnome-photos) [inputs]: Use gegl-0.4.44, not gegl. --- gnu/local.mk | 1 + gnu/packages/gimp.scm | 27 ++++++- gnu/packages/gnome.scm | 2 +- .../gegl-compatibility-old-librsvg.patch | 80 +++++++++++++++++++ 4 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/gegl-compatibility-old-librsvg.patch diff --git a/gnu/local.mk b/gnu/local.mk index 69be1a07c7..c29e99ba38 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1238,6 +1238,7 @@ dist_patch_DATA = \ %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \ %D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch \ %D%/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch \ + %D%/packages/patches/gegl-compatibility-old-librsvg.patch \ %D%/packages/patches/gemmi-fix-pegtl-usage.patch \ %D%/packages/patches/gemmi-fix-sajson-types.patch \ %D%/packages/patches/genimage-mke2fs-test.patch \ diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index b1ff08d652..0bc58e0ddf 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -215,7 +215,7 @@ (define-public babl (define-public gegl (package (name "gegl") - (version "0.4.42") + (version "0.4.46") (source (origin (method url-fetch) @@ -228,8 +228,10 @@ (define-public gegl (string-append "ftp://ftp.gtk.org/pub/gegl/" (version-major+minor version) "/gegl-" version ".tar.xz"))) + (patches + (search-patches "gegl-compatibility-old-librsvg.patch")) (sha256 - (base32 "0bg0vlmj4n9x1291b9fsjqxsal192zlg48pa57f6xid6p863ma5b")))) + (base32 "14p8n6vily0yp6gqafl2xy7d2rh1j48pcj0a7mglqxy83d4b5cyh")))) (build-system meson-build-system) (arguments `(#:configure-flags @@ -285,6 +287,27 @@ (define-public gegl ;; application and GUI binary gegl is licensed under GPL. (license (list license:lgpl3+ license:gpl3+)))) +;; gnome-photos does not build against gegl 0.4.46 yet. +;; https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/214 +(define-public gegl-0.4.44 + (package + (inherit gegl) + (version "0.4.44") + (source + (origin + (method url-fetch) + (uri (list (string-append "https://download.gimp.org/pub/gegl/" + (string-take version 3) + "/gegl-" version ".tar.xz") + (string-append "https://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz") + (string-append "ftp://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz"))) + (sha256 + (base32 "09k1sn4h0bakgmq2hgd1iamprngpr81ky3fd9446lh2ycd0xnk0a")))))) + (define-public gimp (package (name "gimp") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ad118090eb..0f149e69b5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -855,7 +855,7 @@ (define-public gnome-photos (inputs (list babl cairo - gegl + gegl-0.4.44 geocode-glib gexiv2 gfbgraph diff --git a/gnu/packages/patches/gegl-compatibility-old-librsvg.patch b/gnu/packages/patches/gegl-compatibility-old-librsvg.patch new file mode 100644 index 0000000000..3e5733f9fd --- /dev/null +++ b/gnu/packages/patches/gegl-compatibility-old-librsvg.patch @@ -0,0 +1,80 @@ +From a99a93e5c9013bd4101f5058cdee7d0cf30234fe Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jehan +Date: Wed, 5 Jul 2023 21:18:19 +0200 +Subject: [PATCH] Issue #333: continuing to support librsvg 2.40.x (C + versions). + +Commit 9beeefcbe uses too new functions of librsvg. We could just bump +the minimum required version but there are issues with Rust not being +available on every platform yet. So instead, let's add some conditional +code paths, so that it still builds with librsvg 2.40.x (which was the +last versions fully in C) while we use newer code and no warnings when +using newer versions. +--- + operations/external/svg-load.c | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/operations/external/svg-load.c b/operations/external/svg-load.c +index 3312a0c0a..15c0b30b7 100644 +--- a/operations/external/svg-load.c ++++ b/operations/external/svg-load.c +@@ -76,16 +76,25 @@ query_svg (GeglOperation *operation) + { + GeglProperties *o = GEGL_PROPERTIES (operation); + Priv *p = (Priv*) o->user_data; ++#if LIBRSVG_CHECK_VERSION(2, 52, 0) + gdouble out_width, out_height; ++#else ++ RsvgDimensionData dimensions; ++#endif + + g_return_val_if_fail (p->handle != NULL, FALSE); + +- rsvg_handle_get_intrinsic_size_in_pixels (p->handle, &out_width, &out_height); +- + p->format = babl_format ("R'G'B'A u8"); + ++#if LIBRSVG_CHECK_VERSION(2, 52, 0) ++ rsvg_handle_get_intrinsic_size_in_pixels (p->handle, &out_width, &out_height); + p->height = out_height; +- p->width = out_width; ++ p->width = out_width; ++#else ++ rsvg_handle_get_dimensions (p->handle, &dimensions); ++ p->height = dimensions.height; ++ p->width = dimensions.width; ++#endif + + return TRUE; + } +@@ -98,10 +107,12 @@ load_svg (GeglOperation *operation, + { + GeglProperties *o = GEGL_PROPERTIES (operation); + Priv *p = (Priv*) o->user_data; +- RsvgRectangle svg_rect = {0.0, 0.0, width, height}; + cairo_surface_t *surface; + cairo_t *cr; +- GError *error = NULL; ++#if LIBRSVG_CHECK_VERSION(2, 52, 0) ++ GError *error = NULL; ++ RsvgRectangle svg_rect = {0.0, 0.0, width, height}; ++#endif + + g_return_val_if_fail (p->handle != NULL, -1); + +@@ -115,7 +126,11 @@ load_svg (GeglOperation *operation, + (double)height / (double)p->height); + } + ++#if LIBRSVG_CHECK_VERSION(2, 52, 0) + rsvg_handle_render_document (p->handle, cr, &svg_rect, &error); ++#else ++ rsvg_handle_render_cairo (p->handle, cr); ++#endif + + cairo_surface_flush (surface); + +-- +2.41.0 + -- 2.41.0