From 9c78902d8a9350a3277b2550c0dd87019ecc832e Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 29 Feb 2024 06:16:54 +0100 Subject: gnu: babl: Update to 0.1.108. * gnu/packages/gimp.scm (babl): Update to 0.1.108. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index b1ff08d652..5287ec78d5 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -175,7 +175,7 @@ of a larger interface.") (define-public babl (package (name "babl") - (version "0.1.96") + (version "0.1.108") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -189,7 +189,7 @@ of a larger interface.") "/babl-" version ".tar.xz"))) (sha256 (base32 - "1xj5hlmm834lb84rpjlfxbqnm5piswgzhjas4h8z90x9b7j3yrrk")))) + "0x8lxvnhfpssj84x47y3y06vsvhd5afb9jknw38c8ymbxafzxpi6")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From d6d9e65175d7e889c0d5020c949a65a396d1ca3d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 29 Feb 2024 06:17:12 +0100 Subject: gnu: gegl: Update to 0.4.48. * gnu/packages/gimp.scm (gegl): Update to 0.4.48. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 5287ec78d5..555a170665 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -215,7 +215,7 @@ provided, as well as a framework to add new color models and data types.") (define-public gegl (package (name "gegl") - (version "0.4.42") + (version "0.4.48") (source (origin (method url-fetch) @@ -229,7 +229,7 @@ provided, as well as a framework to add new color models and data types.") (version-major+minor version) "/gegl-" version ".tar.xz"))) (sha256 - (base32 "0bg0vlmj4n9x1291b9fsjqxsal192zlg48pa57f6xid6p863ma5b")))) + (base32 "0iw2wag3sls7va4c3dmczisbs9na4ml0rppnk1ymv0789gcjd321")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 99cfb624ca801d6d0e857f7cfd8d358ecfe59893 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 29 Feb 2024 06:17:22 +0100 Subject: gnu: babl: Build with introspection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gimp.scm (babl)[#:configure-flags]: Remove “-Denable-gir=false”. --- gnu/packages/gimp.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 555a170665..07581a4595 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -193,8 +193,7 @@ of a larger interface.") (build-system meson-build-system) (arguments `(#:configure-flags - (list "-Denable-gir=false" - "-Dwith-docs=false"))) + (list "-Dwith-docs=false"))) (native-inputs (list gobject-introspection pkg-config vala)) (propagated-inputs -- cgit v1.2.3 From 1f0767a85be59fe79e4ce8301cddd6aad74ce5b8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 29 Feb 2024 06:18:04 +0100 Subject: gnu: gegl: Build with introspection. * gnu/packages/gimp.scm (gegl)[arguments]: Remove #:configure-flags. --- gnu/packages/gimp.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 07581a4595..d065182c7f 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -231,9 +231,7 @@ provided, as well as a framework to add new color models and data types.") (base32 "0iw2wag3sls7va4c3dmczisbs9na4ml0rppnk1ymv0789gcjd321")))) (build-system meson-build-system) (arguments - `(#:configure-flags - (list "-Dintrospection=false") - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'extend-test-time-outs (lambda _ -- cgit v1.2.3 From 0f816853b9ce72caba88f8c1f51b27ba0c134a71 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 29 Feb 2024 18:47:02 +0100 Subject: gnu: gimp: Update to 2.10.36. * gnu/packages/gimp.scm (gimp): Update to 2.10.36. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index d065182c7f..ebe1e20c97 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -285,7 +285,7 @@ buffers.") (define-public gimp (package (name "gimp") - (version "2.10.32") + (version "2.10.36") (source (origin (method url-fetch) @@ -293,7 +293,7 @@ buffers.") (version-major+minor version) "/gimp-" version ".tar.bz2")) (sha256 - (base32 "09csp2d8bzf012n7hvbbwngwr9phv3rnip768qdwqpdgah2wf59z")))) + (base32 "1cnvgkni2q4psv8syyl5yd9kk84fv5g3imd2kgm3mnsbkb3c6frx")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML -- cgit v1.2.3 From 1bc05c6f6d56ad9e0e31d7f1cc75545a65e3d0f3 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 29 Feb 2024 18:47:12 +0100 Subject: gnu: Add gimp-next. * gnu/packages/gimp.scm (gimp-next): New variable. --- gnu/packages/gimp.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index ebe1e20c97..3c4353f8a0 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages build-tools) #:use-module (gnu packages documentation) @@ -367,6 +368,52 @@ as well as specialized ones. It features a highly customizable interface that is extensible via a plugin system.") (license license:gpl3+))) ; some files are lgplv3 +(define-public gimp-next + (package + (inherit gimp) + (name "gimp-next") + (version "2.99.18") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.gimp.org/pub/gimp/v" + (version-major+minor version) + "/gimp-" version ".tar.xz")) + (sha256 + (base32 "0vnvdl7x88njyyxkbgdbhz6jwz1qasrxh0fpwk6x1m609alvf6wc")))) + (build-system meson-build-system) + (arguments + (list #:modules `((ice-9 popen) + (ice-9 rdelim) + (guix build meson-build-system) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-gcc-reference + ;; Avoid reference to GCC. + (lambda _ + (let* ((port (open-input-pipe "gcc -v 2>&1 | tail -n 1")) + (cc-version (read-line port))) + (close-pipe port) + (substitute* "app/gimp-version.c" + (("CC_VERSION") (string-append "\"" cc-version "\"")))))) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file (string-append out "/share/doc") + (string-append doc "/share/doc")))))))) + (inputs (modify-inputs (package-inputs gimp) + (replace "gtk+" gtk+) + (prepend libxmu libxt) + (prepend python gjs) + (prepend libxslt))) + (native-inputs (modify-inputs (package-native-inputs gimp) + (prepend appstream-glib + gi-docgen + libarchive))))) + (define-public gimp-fourier (package (name "gimp-fourier") -- cgit v1.2.3 From 7b9a23ea315d2b4efde755c3bd0b1db3cacba9c2 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 9 Mar 2024 22:05:59 +0100 Subject: 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(-) (limited to 'gnu/packages/gimp.scm') 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 -- cgit v1.2.3