[bug#65828] [gnome-team 0/1] Update gegl

[bug#65828] [gnome-team 0/1] Update gegl

[Vivien Kraus via Guix-patches via]

Dear guix,

For now, the gnome-team branch cannot build gimp, because the gegl dependency
does not compile. If updated, however, gegl and gimp compile fine. Should we
proceed with the update?

Vivien

Vivien Kraus (1):
  gnu: gegl: Update to 0.4.46.

 gnu/packages/gimp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e
-- 
2.41.0

[bug#65828] [gnome-team 1/1] gnu: gegl: Update to 0.4.46.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gimp.scm (gegl): Update to 0.4.46.
---
 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 b1ff08d652..fb279d6880 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)
@@ -229,7 +229,7 @@ (define-public gegl
                                  (version-major+minor version)
                                  "/gegl-" version ".tar.xz")))
        (sha256
-        (base32 "0bg0vlmj4n9x1291b9fsjqxsal192zlg48pa57f6xid6p863ma5b"))))
+        (base32 "14p8n6vily0yp6gqafl2xy7d2rh1j48pcj0a7mglqxy83d4b5cyh"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
-- 
2.41.0

[bug#65828] [gnome-team 0/1] Update gegl

[Liliana Marie Prikler]

Am Freitag, dem 08.09.2023 um 18:57 +0200 schrieb Vivien Kraus:
> Dear guix,
> 
> For now, the gnome-team branch cannot build gimp, because the gegl
> dependency does not compile. If updated, however, gegl and gimp
> compile fine. Should we proceed with the update?
Did you also check whether we can update GIMP to a newer version?  If
we can't and CI builds this, I'd still go for it.

Cheers

[bug#65828] [gnome-team v2 0/2] Update gegl and gimp

[Vivien Kraus via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 756 bytes --]

Le vendredi 08 septembre 2023 à 20:23 +0200, Liliana Marie Prikler a écrit :
>> For now, the gnome-team branch cannot build gimp, because the gegl
>> dependency does not compile. If updated, however, gegl and gimp
>> compile fine. Should we proceed with the update?
> Did you also check whether we can update GIMP to a newer version?  If
> we can't and CI builds this, I'd still go for it.

I did not try, and yes, 2.10.34 is available now. There is also the 2.99
series, but it is work-in-progress as I understand.

Vivien Kraus (2):
  gnu: gegl: Update to 0.4.46.
  gnu: gimp: Update to 2.10.34.

 gnu/packages/gimp.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e
-- 
2.41.0

[bug#65828] [gnome-team v2 1/2] gnu: gegl: Update to 0.4.46.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gimp.scm (gegl): Update to 0.4.46.
---
 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 b1ff08d652..fb279d6880 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)
@@ -229,7 +229,7 @@ (define-public gegl
                                  (version-major+minor version)
                                  "/gegl-" version ".tar.xz")))
        (sha256
-        (base32 "0bg0vlmj4n9x1291b9fsjqxsal192zlg48pa57f6xid6p863ma5b"))))
+        (base32 "14p8n6vily0yp6gqafl2xy7d2rh1j48pcj0a7mglqxy83d4b5cyh"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
-- 
2.41.0

[bug#65828] [gnome-team v2 2/2] gnu: gimp: Update to 2.10.34.

[Vivien Kraus via Guix-patches via]

* 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 fb279d6880..3a4819278f 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -288,7 +288,7 @@ (define-public gegl
 (define-public gimp
   (package
     (name "gimp")
-    (version "2.10.32")
+    (version "2.10.34")
     (source
      (origin
        (method url-fetch)
@@ -296,7 +296,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
-- 
2.41.0

[bug#65828] [gnome-team 0/1] Update gegl

[Vivien Kraus via Guix-patches via]

Le vendredi 08 septembre 2023 à 20:23 +0200, Liliana Marie Prikler a
écrit :
> Am Freitag, dem 08.09.2023 um 18:57 +0200 schrieb Vivien Kraus:
> > Dear guix,
> > 
> > For now, the gnome-team branch cannot build gimp, because the gegl
> > dependency does not compile. If updated, however, gegl and gimp
> > compile fine. Should we proceed with the update?
> Did you also check whether we can update GIMP to a newer version?  If
> we can't and CI builds this, I'd still go for it.

This does not build on i686: it seems that gegl is requiring too recent
a librsvg.

https://bordeaux.guix.gnu.org/build/06ead8d1-5fdd-4984-b151-9e884285c834/log

../gegl-0.4.46/operations/external/svg-load.c: In function ‘load_svg’:
../gegl-0.4.46/operations/external/svg-load.c:101:5: error: unknown
type name ‘RsvgRectangle’; did you mean ‘GeglRectangle’?
  101 |     RsvgRectangle      svg_rect = {0.0, 0.0, width, height};
      |     ^~~~~~~~~~~~~
      |     GeglRectangle

What should I do? Keep an outdated gegl for i686?

Vivien

[bug#65828] [gnome-team 0/1] Update gegl

[Liliana Marie Prikler]

Am Dienstag, dem 12.09.2023 um 19:17 +0200 schrieb Vivien Kraus:
> Le vendredi 08 septembre 2023 à 20:23 +0200, Liliana Marie Prikler a
> écrit :
> > Am Freitag, dem 08.09.2023 um 18:57 +0200 schrieb Vivien Kraus:
> > > Dear guix,
> > > 
> > > For now, the gnome-team branch cannot build gimp, because the
> > > gegl
> > > dependency does not compile. If updated, however, gegl and gimp
> > > compile fine. Should we proceed with the update?
> > Did you also check whether we can update GIMP to a newer version? 
> > If
> > we can't and CI builds this, I'd still go for it.
> 
> This does not build on i686: it seems that gegl is requiring too
> recent
> a librsvg.
> 
> https://bordeaux.guix.gnu.org/build/06ead8d1-5fdd-4984-b151-9e884285c834/log
> 
> ../gegl-0.4.46/operations/external/svg-load.c: In function
> ‘load_svg’:
> ../gegl-0.4.46/operations/external/svg-load.c:101:5: error: unknown
> type name ‘RsvgRectangle’; did you mean ‘GeglRectangle’?
>   101 |     RsvgRectangle      svg_rect = {0.0, 0.0, width, height};
>       |     ^~~~~~~~~~~~~
>       |     GeglRectangle
> 
> What should I do? Keep an outdated gegl for i686?
You could try a local patch; if everything else fails try swapping it
with the current implementation.

Cheers

[bug#65828] [gnome-team 0/1] Update gegl

[Vivien Kraus via Guix-patches via]

Le mardi 12 septembre 2023 à 20:41 +0200, Liliana Marie Prikler a
écrit :
> Am Dienstag, dem 12.09.2023 um 19:17 +0200 schrieb Vivien Kraus:
> > Le vendredi 08 septembre 2023 à 20:23 +0200, Liliana Marie Prikler
> > a
> > écrit :
> > > Am Freitag, dem 08.09.2023 um 18:57 +0200 schrieb Vivien Kraus:
> > > > Dear guix,
> > > > 
> > > > For now, the gnome-team branch cannot build gimp, because the
> > > > gegl
> > > > dependency does not compile. If updated, however, gegl and gimp
> > > > compile fine. Should we proceed with the update?
> > > Did you also check whether we can update GIMP to a newer
> > > version? 
> > > If
> > > we can't and CI builds this, I'd still go for it.
> > 
> > This does not build on i686: it seems that gegl is requiring too
> > recent
> > a librsvg.
> > 
> > https://bordeaux.guix.gnu.org/build/06ead8d1-5fdd-4984-b151-9e884285c834/log
> > 
> > ../gegl-0.4.46/operations/external/svg-load.c: In function
> > ‘load_svg’:
> > ../gegl-0.4.46/operations/external/svg-load.c:101:5: error: unknown
> > type name ‘RsvgRectangle’; did you mean ‘GeglRectangle’?
> >   101 |     RsvgRectangle      svg_rect = {0.0, 0.0, width,
> > height};
> >       |     ^~~~~~~~~~~~~
> >       |     GeglRectangle
> > 
> > What should I do? Keep an outdated gegl for i686?
> You could try a local patch; if everything else fails try swapping it
> with the current implementation.

I don’t understand "try a local patch". Should I try to patch gegl so
that it works with the older librsvg API? I’m not sure I can do that.

Vivien

[bug#65828] [gnome-team 0/1] Update gegl

[Liliana Marie Prikler]

Am Dienstag, dem 12.09.2023 um 21:20 +0200 schrieb Vivien Kraus:
> Le mardi 12 septembre 2023 à 20:41 +0200, Liliana Marie Prikler a
> écrit :
> > Am Dienstag, dem 12.09.2023 um 19:17 +0200 schrieb Vivien Kraus:
> > > Le vendredi 08 septembre 2023 à 20:23 +0200, Liliana Marie
> > > Prikler
> > > a
> > > écrit :
> > > > Am Freitag, dem 08.09.2023 um 18:57 +0200 schrieb Vivien Kraus:
> > > > > Dear guix,
> > > > > 
> > > > > For now, the gnome-team branch cannot build gimp, because the
> > > > > gegl
> > > > > dependency does not compile. If updated, however, gegl and
> > > > > gimp
> > > > > compile fine. Should we proceed with the update?
> > > > Did you also check whether we can update GIMP to a newer
> > > > version? 
> > > > If
> > > > we can't and CI builds this, I'd still go for it.
> > > 
> > > This does not build on i686: it seems that gegl is requiring too
> > > recent
> > > a librsvg.
> > > 
> > > https://bordeaux.guix.gnu.org/build/06ead8d1-5fdd-4984-b151-9e884285c834/log
> > > 
> > > ../gegl-0.4.46/operations/external/svg-load.c: In function
> > > ‘load_svg’:
> > > ../gegl-0.4.46/operations/external/svg-load.c:101:5: error:
> > > unknown
> > > type name ‘RsvgRectangle’; did you mean ‘GeglRectangle’?
> > >   101 |     RsvgRectangle      svg_rect = {0.0, 0.0, width,
> > > height};
> > >       |     ^~~~~~~~~~~~~
> > >       |     GeglRectangle
> > > 
> > > What should I do? Keep an outdated gegl for i686?
> > You could try a local patch; if everything else fails try swapping
> > it
> > with the current implementation.
> 
> I don’t understand "try a local patch". Should I try to patch gegl so
> that it works with the older librsvg API? I’m not sure I can do that.
You could try reverting 9beeefcbe14963fd8dca638625b9e397a6ec6bc7 for a
start.

Good luck!

[bug#65828] [gnome-team v3 0/2] Silly me, that was already fixed upstream

[Vivien Kraus via Guix-patches via]

I noticed the compatibility with old librsvg was already solved, see
https://gitlab.gnome.org/GNOME/gegl/-/issues/333

Vivien Kraus (2):
  gnu: gegl: Update to 0.4.46.
  gnu: gimp: Update to 2.10.34.

 gnu/local.mk                                  |  1 +
 gnu/packages/gimp.scm                         | 10 ++-
 .../gegl-compatibility-old-librsvg.patch      | 80 +++++++++++++++++++
 3 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 gnu/packages/patches/gegl-compatibility-old-librsvg.patch


base-commit: 20e3f3e1151b2f22ae7fb5aa8764148654f35090
-- 
2.41.0

[bug#65828] [gnome-team v3 1/2] gnu: gegl: Update to 0.4.46.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gimp.scm (gegl): Update to 0.4.46.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/gimp.scm                         |  6 +-
 .../gegl-compatibility-old-librsvg.patch      | 80 +++++++++++++++++++
 3 files changed, 85 insertions(+), 2 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..167de97ec5 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
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: <a99a93e5c9013bd4101f5058cdee7d0cf30234fe.1694554961.git.vivien@planete-kraus.eu>
+From: Jehan <jehan@girinstud.io>
+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

[bug#65828] [gnome-team v3 2/2] gnu: gimp: Update to 2.10.34.

[Vivien Kraus via Guix-patches via]

* 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 167de97ec5..0a7a00f0ca 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -290,7 +290,7 @@ (define-public gegl
 (define-public gimp
   (package
     (name "gimp")
-    (version "2.10.32")
+    (version "2.10.34")
     (source
      (origin
        (method url-fetch)
@@ -298,7 +298,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
-- 
2.41.0

[bug#65828] [gnome-team v4 0/3] Gegl 0.4.46 does not work yet with gnome-photos

[Vivien Kraus via Guix-patches via]

Dear guix,

gnome-photos does not work with gegl 0.4.46:

https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/214

Since noone published a fix yet, I figured it would be best to use the
previous release of gegl just for gnome-photos, as of now.

What do you think?

Vivien Kraus (3):
  gnu: gegl: Update to 0.4.46.
  gnu: gegl: Add version 0.4.44 for gnome-photos.
  gnu: gimp: Update to 2.10.34.

 gnu/local.mk                                  |  1 +
 gnu/packages/gimp.scm                         | 31 ++++++-
 gnu/packages/gnome.scm                        |  2 +-
 .../gegl-compatibility-old-librsvg.patch      | 80 +++++++++++++++++++
 4 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/gegl-compatibility-old-librsvg.patch


base-commit: 20e3f3e1151b2f22ae7fb5aa8764148654f35090
-- 
2.41.0

[bug#65828] [gnome-team v4 1/3] gnu: gegl: Update to 0.4.46.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gimp.scm (gegl): Update to 0.4.46.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/gimp.scm                         |  6 +-
 .../gegl-compatibility-old-librsvg.patch      | 80 +++++++++++++++++++
 3 files changed, 85 insertions(+), 2 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..167de97ec5 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
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: <a99a93e5c9013bd4101f5058cdee7d0cf30234fe.1694554961.git.vivien@planete-kraus.eu>
+From: Jehan <jehan@girinstud.io>
+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

[bug#65828] [gnome-team v4 3/3] gnu: gimp: Update to 2.10.34.

[Vivien Kraus via Guix-patches via]

* 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
-- 
2.41.0

[bug#65828] [gnome-team v4 2/3] gnu: gegl: Add version 0.4.44 for gnome-photos.

[Vivien Kraus via Guix-patches via]

* 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/packages/gimp.scm  | 21 +++++++++++++++++++++
 gnu/packages/gnome.scm |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 167de97ec5..0bc58e0ddf 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -287,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
-- 
2.41.0

[bug#65828] [gnome-team v4 2/3] gnu: gegl: Add version 0.4.44 for gnome-photos.

[Liliana Marie Prikler]

Am Mittwoch, dem 13.09.2023 um 00:52 +0200 schrieb Vivien Kraus:
> * 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/packages/gimp.scm  | 21 +++++++++++++++++++++
>  gnu/packages/gnome.scm |  2 +-
>  2 files changed, 22 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
> index 167de97ec5..0bc58e0ddf 100644
> --- a/gnu/packages/gimp.scm
> +++ b/gnu/packages/gimp.scm
> @@ -287,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")))
This should be squashed into the previous commit so as to not break
gnome-photos in the meantime.

Cheers

[bug#65828] [gnome-team v5 0/2] Update and fix gegl in one patch

[Vivien Kraus via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 729 bytes --]

Le mercredi 13 septembre 2023 à 06:18 +0200, Liliana Marie Prikler a écrit :
> This should be squashed into the previous commit so as to not break
> gnome-photos in the meantime.

True. Let’s do that.

Vivien Kraus (2):
  gnu: gegl: Update to 0.4.46.
  gnu: gimp: Update to 2.10.34.

 gnu/local.mk                                  |  1 +
 gnu/packages/gimp.scm                         | 31 ++++++-
 gnu/packages/gnome.scm                        |  2 +-
 .../gegl-compatibility-old-librsvg.patch      | 80 +++++++++++++++++++
 4 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/gegl-compatibility-old-librsvg.patch


base-commit: 20e3f3e1151b2f22ae7fb5aa8764148654f35090
-- 
2.41.0

[bug#65828] [gnome-team v5 1/2] gnu: gegl: Update to 0.4.46.

[Vivien Kraus via Guix-patches via]

* 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: <a99a93e5c9013bd4101f5058cdee7d0cf30234fe.1694554961.git.vivien@planete-kraus.eu>
+From: Jehan <jehan@girinstud.io>
+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

[bug#65828] [gnome-team v5 2/2] gnu: gimp: Update to 2.10.34.

[Vivien Kraus via Guix-patches via]

* 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
-- 
2.41.0

bug#65828: [gnome-team v5 2/2] gnu: gimp: Update to 2.10.34.

[Liliana Marie Prikler]

Am Freitag, dem 08.09.2023 um 20:37 +0200 schrieb Vivien Kraus:
> * gnu/packages/gimp.scm (gimp): Update to 2.10.34.
> ---
Merged and followed up with a style update.

Thanks

[bug#65828] [gnome-team v4 2/3] gnu: gegl: Add version 0.4.44 for gnome-photos.

[Vivien Kraus via Guix-patches via]

Hi!

Le mercredi 13 septembre 2023 à 06:18 +0200, Liliana Marie Prikler a
écrit :
> This should be squashed into the previous commit so as to not break
> gnome-photos in the meantime.

QA seems to fail:

https://qa.guix.gnu.org/issue/65828

However, if we look in details, the branch that QA decided to build did
not pick up the commit to fix gnome-photos (the new package failure).
Presumably because I sent the latest series while it was still
evaluating a previous one.

Is there a way to restart it?

Vivien

[bug#65828] [gnome-team v4 2/3] gnu: gegl: Add version 0.4.44 for gnome-photos.

[Liliana Marie Prikler]

Am Donnerstag, dem 14.09.2023 um 07:02 +0200 schrieb Vivien Kraus:
> Hi!
> 
> Le mercredi 13 septembre 2023 à 06:18 +0200, Liliana Marie Prikler a
> écrit :
> > This should be squashed into the previous commit so as to not break
> > gnome-photos in the meantime.
> 
> QA seems to fail:
> 
> https://qa.guix.gnu.org/issue/65828
> 
> However, if we look in details, the branch that QA decided to build
> did not pick up the commit to fix gnome-photos (the new package
> failure).  Presumably because I sent the latest series while it was
> still evaluating a previous one.
> 
> Is there a way to restart it?
> 
> Vivien
Don't worry about it, I've confirmed that it builds locally.  It will
likely pick up the pace either later or at the very least after I've
pushed it to gnome-team.

Cheers