From 7b9a23ea315d2b4efde755c3bd0b1db3cacba9c2 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 9 Mar 2024 22:05:59 +0100 Subject: [PATCH] gnu: gnome-photos: Build against gegl-0.4.44. On gnome-team, this dependency was already accounted for in commit 4beac7d95c84ea3be809030f942b8b71d155129e, but it was forgotten when updating gimp on master. * gnu/packages/gimp.scm (babl-0.1.96, gegl-0.4.44): New variables. * gnu/packages/gnome.scm (gnome-photos)[inputs]: Replace gegl with gegl-0.4.44. --- gnu/packages/gimp.scm | 43 ++++++++++++++++++++++++++++++++++++++++++ gnu/packages/gnome.scm | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 3c4353f8a0..8987a4502d 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -283,6 +283,49 @@ buffers.") ;; 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 or newer yet. +;; See also . +(define-public babl-0.1.96 + (package + (inherit babl) + (version "0.1.96") + (source + (origin + (method url-fetch) + (uri (list (string-append "https://download.gimp.org/pub/babl/" + (version-major+minor version) + "/babl-" version ".tar.xz") + (string-append "https://ftp.gtk.org/pub/babl/" + (version-major+minor version) + "/babl-" version ".tar.xz") + (string-append "ftp://ftp.gtk.org/pub/babl/" + (version-major+minor version) + "/babl-" version ".tar.xz"))) + (sha256 + (base32 "1xj5hlmm834lb84rpjlfxbqnm5piswgzhjas4h8z90x9b7j3yrrk")))))) + +(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")))) + (propagated-inputs + (modify-inputs (package-propagated-inputs gegl) + (replace "babl" babl-0.1.96))))) + (define-public gimp (package (name "gimp") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a0710aa78a..06256066bc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -857,7 +857,7 @@ tomorrow, the rest of the week and for special occasions.") (inputs (list babl cairo - gegl + gegl-0.4.44 geocode-glib gexiv2 gfbgraph