From patchwork Fri Sep 8 16:50:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 53779 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 BD6CF27BBEA; Wed, 13 Sep 2023 06:07:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 75BDB27BBE2 for ; Wed, 13 Sep 2023 06:07:32 +0100 (BST) 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 X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/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 + From patchwork Fri Sep 8 18:37:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 53778 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 DE1FD27BBEA; Wed, 13 Sep 2023 06:07:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 0476A27BBE2 for ; Wed, 13 Sep 2023 06:07:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgI5e-0002OV-U7; 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-0002Nf-Jw 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-0001p6-9y 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 1qgI5f-0006Zc-A9 for guix-patches@gnu.org; Wed, 13 Sep 2023 01:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65828] [gnome-team v5 2/2] gnu: gimp: Update to 2.10.34. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Sep 2023 05:07:03 +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.169458159925172 (code B ref 65828); Wed, 13 Sep 2023 05:07:03 +0000 Received: (at 65828) by debbugs.gnu.org; 13 Sep 2023 05:06:39 +0000 Received: from localhost ([127.0.0.1]:60514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgI5H-0006Xv-H5 for submit@debbugs.gnu.org; Wed, 13 Sep 2023 01:06:39 -0400 Received: from planete-kraus.eu ([89.234.140.182]:37998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgI5G-0006XR-2K for 65828@debbugs.gnu.org; Wed, 13 Sep 2023 01:06:38 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 2c9ce90f; Wed, 13 Sep 2023 05:06:31 +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=6ZJffC7yeBmoazhQf7H9IlT+ksE=; b=M O3vmPIZppa6AowCBhZpypgSqIneNB0wfttOGlGmCjwC6omLCwhdz+1nC8bUiGsNb Gti9cxY6jux1zJQd69wZdxOwV8ShFMk8rrXCRq2wzZZSyVFzeryyj2LjQqeWGCLF 9Q+98dA96mcsc+JugBEm1mDxlIoyi9sm16W/uKDpoFV3st7uxJZ+lebLChGiSz5q tZujhzWL/WkoC4zkrLGFP0a2z+baBBXDy0tCzWCvTqeKsDAKPTqVtWHXavsNMVzS yb2TrHDjPQQJ5AIGLfF+M/+jmB2b0zNgAOZPy7U8C5Q6khFm2K+Q/gDQXojhgw5U pF39S1AA3OBJ93Y8JM9pQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 85823cfc (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 13 Sep 2023 05:06:31 +0000 (UTC) Message-ID: <67b5613e143971e30ed46bd19d3ee27dab108be2.1694581316.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Fri, 8 Sep 2023 20:37:46 +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 X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/gimp.scm (gimp): Update to 2.10.34. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 0bc58e0ddf..96779b99fe 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -311,7 +311,7 @@ (define-public gegl-0.4.44 (define-public gimp (package (name "gimp") - (version "2.10.32") + (version "2.10.34") (source (origin (method url-fetch) @@ -319,7 +319,7 @@ (define-public gimp (version-major+minor version) "/gimp-" version ".tar.bz2")) (sha256 - (base32 "09csp2d8bzf012n7hvbbwngwr9phv3rnip768qdwqpdgah2wf59z")))) + (base32 "18vscmy293q6wq78almv0m7r8jh4j8szvmrw56j9icsisd14c044")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML