From 4469c63d34f7374feea886672b8e6656df7146ae Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 9 Oct 2021 17:08:41 +0000 Subject: gnu: babl: Update to 0.1.88. * gnu/packages/gimp.scm (babl): Update to 0.1.88. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gimp.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 2da57ee8ee..d524e50245 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -168,7 +169,7 @@ of a larger interface.") (define-public babl (package (name "babl") - (version "0.1.86") + (version "0.1.88") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -182,7 +183,7 @@ of a larger interface.") "/babl-" version ".tar.xz"))) (sha256 (base32 - "1w68h81kqkqnziixrx21qs0gfv2z79651h19sxn226xdb58mjgqb")))) + "0fbh2ss1dy3sba4xjmfm4vxxjmx9a6rzgba9ycjygchbm957y3ag")))) (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 -- cgit 1.4.1 From 7975ee953447ca4be658fa4192eed20be543d808 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 9 Oct 2021 17:08:42 +0000 Subject: gnu: babl: Enable GIR. * gnu/packages/gimp.scm (babl)[arguments]<#:configure-flags>: Remove. [native-inputs]: Add gobject-introspection, vala. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gimp.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index d524e50245..ae3852863b 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -186,11 +186,11 @@ of a larger interface.") "0fbh2ss1dy3sba4xjmfm4vxxjmx9a6rzgba9ycjygchbm957y3ag")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.55 - #:configure-flags - (list "-Denable-gir=false"))) + `(#:meson ,meson-0.55)) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (propagated-inputs ;; Propagated to satisfy ‘babl.pc’. `(("lcms" ,lcms))) -- cgit 1.4.1 From c6318c84340bedafb6ba4ae23a0312b7ba0442c3 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 9 Oct 2021 17:08:43 +0000 Subject: gnu: gegl: Update to 0.4.32. * gnu/packages/gimp.scm (gegl): Update to 0.4.32. [arguments]<#:phases>: Don't return #t. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gimp.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index ae3852863b..d69425fde9 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -209,7 +209,7 @@ provided, as well as a framework to add new color models and data types.") (define-public gegl (package (name "gegl") - (version "0.4.30") + (version "0.4.32") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" @@ -223,7 +223,7 @@ provided, as well as a framework to add new color models and data types.") "/gegl-" version ".tar.xz"))) (sha256 (base32 - "1pd8xkx70k0fsi1hrzrmaify7112wjmxzk0p6bi6js89yhn7h4n1")))) + "18cg566lplw7y7dn5v05pal24vxbfiic6097a40gnxdgkxmkr3k6")))) (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 @@ -242,8 +242,7 @@ provided, as well as a framework to add new color models and data types.") (string-append match "0"))) (substitute* (find-files "tests" "^meson\\.build$") (("timeout ?: [0-9]+" match) - (string-append match "0"))) - #t))))) + (string-append match "0")))))))) ;; These are propagated to satisfy 'gegl-0.4.pc'. (propagated-inputs `(("babl" ,babl) -- cgit 1.4.1 From 655b227c2b7f84950dbdc6791e61358bed35831b Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 9 Oct 2021 17:08:44 +0000 Subject: gnu: gegl: Enable GIR. * gnu/packages/gimp.scm (gegl)[arguments]<#:configure-flags>: Remove. [native-inputs]: Sort alphabetically. Add gobject-introspection, vala. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gimp.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index d69425fde9..5e46eb36b7 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -227,8 +227,6 @@ provided, as well as a framework to add new color models and data types.") (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 - #:configure-flags - (list "-Dintrospection=false") #:phases (modify-phases %standard-phases (add-after 'unpack 'extend-test-time-outs @@ -254,9 +252,11 @@ provided, as well as a framework to add new color models and data types.") ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo))) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; for gtester - ("intltool" ,intltool))) + `(("glib" ,glib "bin") ; for gtester + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (home-page "https://gegl.org") (synopsis "Graph based image processing framework") (description "GEGL (Generic Graphics Library) provides infrastructure to -- cgit 1.4.1 From 6f892bc29afbcf71bc2783ccb47de1537450f71f Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 9 Oct 2021 17:08:45 +0000 Subject: gnu: gegl: Add optional dependencies. * gnu/packages/gimp.scm (gegl)[inputs]: Add gdk-pixbuf, gexiv2, jasper, libnsgif, libraw, librsvg, libspiro, libtiff, libwebp, maxflow, openexr, poppler, sdl2. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gimp.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 5e46eb36b7..a1b205484e 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages build-tools) #:use-module (gnu packages documentation) + #:use-module (gnu packages fontutils) #:use-module (gnu packages graphviz) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) @@ -50,11 +51,13 @@ #:use-module (gnu packages compression) #:use-module (gnu packages xml) #:use-module (gnu packages linux) + #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages patchutils) #:use-module (gnu packages pdf) #:use-module (gnu packages photo) #:use-module (gnu packages python) + #:use-module (gnu packages sdl) #:use-module (gnu packages web) #:use-module (gnu packages xorg)) @@ -247,10 +250,24 @@ provided, as well as a framework to add new color models and data types.") ("glib" ,glib) ("json-glib" ,json-glib))) (inputs + ;; All inputs except libjpeg and libpng are optional. `(("cairo" ,cairo) - ("pango" ,pango) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gexiv2" ,gexiv2) + ("jasper" ,jasper) + ("libjpeg" ,libjpeg-turbo) + ("libnsgif" ,libnsgif) ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo))) + ("libraw" ,libraw) + ("librsvg" ,librsvg) + ("libspiro" ,libspiro) + ("libtiff" ,libtiff) + ("libwebp" ,libwebp) + ("maxflow" ,maxflow) + ("openexr" ,openexr) + ("pango" ,pango) + ("poppler" ,poppler) + ("sdl2" ,sdl2))) (native-inputs `(("glib" ,glib "bin") ; for gtester ("gobject-introspection" ,gobject-introspection) -- cgit 1.4.1 From 5c212abefa0f05e4ad2f1b30475111c0018cc572 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 9 Oct 2021 17:08:46 +0000 Subject: gnu: gimp: Update to 2.10.28. * gnu/packages/gimp.scm (gimp): Update to 2.10.28. Signed-off-by: Liliana Marie Prikler --- 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 a1b205484e..13a025cb67 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -286,7 +286,7 @@ buffers.") (define-public gimp (package (name "gimp") - (version "2.10.24") + (version "2.10.28") (source (origin (method url-fetch) @@ -294,7 +294,7 @@ buffers.") (version-major+minor version) "/gimp-" version ".tar.bz2")) (sha256 - (base32 "17lq6ns5qhspd171zqh76yf98xnn5n0hcl7hbhbx63cc6ribf6xx")))) + (base32 "09l80zxcnydbpm3nn64qw48klnvp0mgbaamazqkg1d8szwnc4kag")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML -- cgit 1.4.1 From 511af23f2672e4dda22d0239b0109b604a5e7767 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 9 Oct 2021 17:08:47 +0000 Subject: gnu: gimp: Add optional dependencies. * gnu/packages/gimp.scm (gimp)[inputs]: Sort non-optional and optional inputs alphabetically. Add ghostscript, libheif, libmng, openexr, openjpeg. [native-inputs]: Add desktop-file-utils. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gimp.scm | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 13a025cb67..ae59385d45 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages build-tools) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages graphviz) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) @@ -332,30 +333,36 @@ buffers.") (format port "for dir in '~a'.split(':'):~%" pythonpath) (format port " site.addsitedir(dir)~%"))))))))) (inputs - `(("babl" ,babl) + `(("atk" ,atk) + ("babl" ,babl) + ("gegl" ,gegl) + ("gexiv2" ,gexiv2) ("glib" ,glib) ("glib-networking" ,glib-networking) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp) - ("libjpeg" ,libjpeg-turbo) - ("atk" ,atk) - ("gexiv2" ,gexiv2) ("gtk+" ,gtk+-2) + ("libjpeg" ,libjpeg-turbo) ("libmypaint" ,libmypaint) + ("libtiff" ,libtiff) + ("libwebp" ,libwebp) ("mypaint-brushes" ,mypaint-brushes-1.3) - ("exif" ,libexif) ; optional, EXIF + XMP support - ("lcms" ,lcms) ; optional, color management - ("librsvg" ,librsvg) ; optional, SVG support - ("libxcursor" ,libxcursor) ; optional, Mouse Cursor support - ("poppler" ,poppler) ; optional, PDF support - ("poppler-data" ,poppler-data) - ("python" ,python-2) ; optional, Python support - ("python2-pygtk" ,python2-pygtk) ; optional, Python support - ("gegl" ,gegl))) + ("exif" ,libexif) ; optional, EXIF + XMP support + ("ghostscript" ,ghostscript) ; optional, EPS + PS support + ("lcms" ,lcms) ; optional, color management + ("libheif" ,libheif) ; optional, HEIF + AVIF support + ("libmng" ,libmng) ; optional, MNG support + ("librsvg" ,librsvg) ; optional, SVG support + ("libxcursor" ,libxcursor) ; optional, Mouse Cursor support + ("openexr" ,openexr) ; optional, EXR support + ("openjpeg" ,openjpeg) ; optional, JPEG 2000 support + ("poppler" ,poppler) ; optional, PDF support + ("poppler-data" ,poppler-data) ; optional, PDF support + ("python" ,python-2) ; optional, Python support + ("python2-pygtk" ,python2-pygtk))) ; optional, Python support (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-resources and gdbus-codegen - ("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + `(("desktop-file-utils" ,desktop-file-utils) + ("glib:bin" ,glib "bin") ; for glib-compile-resources and gdbus-codegen + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) (home-page "https://www.gimp.org") (synopsis "GNU Image Manipulation Program") (description -- cgit 1.4.1