[bug#51106] [PATCH 0/7] Update GIMP to 2.10.28.

[bug#51106] [PATCH 0/7] Update GIMP to 2.10.28.

[Vinicius Monego]

The GIR patches will be required for GIMP 3.x (it will support plugins written in Vala). I am submitting it now to make it easier to setup a development environment for 3.x.

Vinicius Monego (7):
  gnu: babl: Update to 0.1.88.
  gnu: babl: Enable GIR.
  gnu: gegl: Update to 0.4.32.
  gnu: gegl: Enable GIR.
  gnu: gegl: Add optional dependencies.
  gnu: gimp: Update to 2.10.28.
  gnu: gimp: Add optional dependencies.

 gnu/packages/gimp.scm | 91 ++++++++++++++++++++++++++++---------------
 1 file changed, 60 insertions(+), 31 deletions(-)

-- 
2.30.2

[bug#51106] [PATCH 1/7] gnu: babl: Update to 0.1.88.

[Vinicius Monego]

* gnu/packages/gimp.scm (babl): Update to 0.1.88.
---
 gnu/packages/gimp.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 <t_w_@freenet.de>
 ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
 ;;;
 ;;; 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
-- 
2.30.2

[bug#51106] [PATCH 2/7] gnu: babl: Enable GIR.

[Vinicius Monego]

* gnu/packages/gimp.scm (babl)[arguments]<#:configure-flags>: Pass
"-Denable-gir=true" and "-Denable-vapi=true".
[native-inputs]: Add gobject-introspection, vala.
---
 gnu/packages/gimp.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index d524e50245..a2050b4f34 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -188,9 +188,12 @@ of a larger interface.")
     (arguments
      `(#:meson ,meson-0.55
        #:configure-flags
-       (list "-Denable-gir=false")))
+       (list "-Denable-gir=true"
+             "-Denable-vapi=true")))
     (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)))
-- 
2.30.2

[bug#51106] [PATCH 2/7] gnu: babl: Enable GIR.

[Liliana Marie Prikler]

Hi,

Am Samstag, den 09.10.2021, 01:07 +0000 schrieb Vinicius Monego:
> * gnu/packages/gimp.scm (babl)[arguments]<#:configure-flags>: Pass
> "-Denable-gir=true" and "-Denable-vapi=true".
> [native-inputs]: Add gobject-introspection, vala.
> ---
>  gnu/packages/gimp.scm | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
> index d524e50245..a2050b4f34 100644
> --- a/gnu/packages/gimp.scm
> +++ b/gnu/packages/gimp.scm
> @@ -188,9 +188,12 @@ of a larger interface.")
>      (arguments
>       `(#:meson ,meson-0.55
>         #:configure-flags
> -       (list "-Denable-gir=false")))
> +       (list "-Denable-gir=true"
> +             "-Denable-vapi=true")))
If those are enabled by default, we don't need to enable them
explicitly.
>      (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)))
Otherwise LGTM.

[bug#51106] [PATCH 3/7] gnu: gegl: Update to 0.4.32.

[Vinicius Monego]

* gnu/packages/gimp.scm (gegl): Update to 0.4.32.
[arguments]<#:phases>: Don't return #t.
---
 gnu/packages/gimp.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index a2050b4f34..37879cf5bf 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -212,7 +212,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/"
@@ -226,7 +226,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
@@ -245,8 +245,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)
-- 
2.30.2

[bug#51106] [PATCH 4/7] gnu: gegl: Enable GIR.

[Vinicius Monego]

* gnu/packages/gimp.scm (gegl)[arguments]<#:configure-flags>: Pass
"-Dintrospection=true".
[native-inputs]: Add gobject-introspection, vala.
---
 gnu/packages/gimp.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 37879cf5bf..fc4b882912 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -231,7 +231,7 @@ provided, as well as a framework to add new color models and data types.")
     (arguments
      `(#:meson ,meson-0.55
        #:configure-flags
-       (list "-Dintrospection=false")
+       (list "-Dintrospection=true")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'extend-test-time-outs
@@ -259,7 +259,9 @@ provided, as well as a framework to add new color models and data types.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("glib" ,glib "bin")             ; for gtester
-       ("intltool" ,intltool)))
+       ("gobject-introspection" ,gobject-introspection)
+       ("intltool" ,intltool)
+       ("vala" ,vala)))
     (home-page "https://gegl.org")
     (synopsis "Graph based image processing framework")
     (description "GEGL (Generic Graphics Library) provides infrastructure to
-- 
2.30.2

[bug#51106] [PATCH 4/7] gnu: gegl: Enable GIR.

[Liliana Marie Prikler]

Hi,

Am Samstag, den 09.10.2021, 01:07 +0000 schrieb Vinicius Monego:
> * gnu/packages/gimp.scm (gegl)[arguments]<#:configure-flags>: Pass
> "-Dintrospection=true".
> [native-inputs]: Add gobject-introspection, vala.
> ---
>  gnu/packages/gimp.scm | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
> index 37879cf5bf..fc4b882912 100644
> --- a/gnu/packages/gimp.scm
> +++ b/gnu/packages/gimp.scm
> @@ -231,7 +231,7 @@ provided, as well as a framework to add new color
> models and data types.")
>      (arguments
>       `(#:meson ,meson-0.55
>         #:configure-flags
> -       (list "-Dintrospection=false")
> +       (list "-Dintrospection=true")
As with babl, I don't think we ened to explicitly pass this.
>         #:phases
>         (modify-phases %standard-phases
>           (add-after 'unpack 'extend-test-time-outs
> @@ -259,7 +259,9 @@ provided, as well as a framework to add new color
> models and data types.")
>      (native-inputs
>       `(("pkg-config" ,pkg-config)
>         ("glib" ,glib "bin")             ; for gtester
> -       ("intltool" ,intltool)))
> +       ("gobject-introspection" ,gobject-introspection)
> +       ("intltool" ,intltool)
> +       ("vala" ,vala)))
It'd be good to sort these, no?
>      (home-page "https://gegl.org")
>      (synopsis "Graph based image processing framework")
>      (description "GEGL (Generic Graphics Library) provides
> infrastructure to

[bug#51106] [PATCH 5/7] gnu: gegl: Add optional dependencies.

[Vinicius Monego]

* gnu/packages/gimp.scm (gegl)[inputs]: Add gdk-pixbuf, gexiv2, jasper,
libnsgif, libraw, librsvg, libspiro, libtiff, libwebp, maxflow, openexr,
poppler, sdl2.
---
 gnu/packages/gimp.scm | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index fc4b882912..e99ab7f8e0 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))
 
@@ -252,10 +255,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 libpng and libjpeg 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
      `(("pkg-config" ,pkg-config)
        ("glib" ,glib "bin")             ; for gtester
-- 
2.30.2

[bug#51106] [PATCH 6/7] gnu: gimp: Update to 2.10.28.

[Vinicius Monego]

* gnu/packages/gimp.scm (gimp): Update to 2.10.28.
---
 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 e99ab7f8e0..c82a70db49 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -291,7 +291,7 @@ buffers.")
 (define-public gimp
   (package
     (name "gimp")
-    (version "2.10.24")
+    (version "2.10.28")
     (source
      (origin
        (method url-fetch)
@@ -299,7 +299,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
-- 
2.30.2

[bug#51106] [PATCH 7/7] gnu: gimp: Add optional dependencies.

[Vinicius Monego]

* gnu/packages/gimp.scm (gimp)[inputs]: Sort non-optional and optional inputs
alphabetically. Add ghostscript, libheif, libmng, openexr, openjpeg.
[native-inputs]: Sort alphabetically. Add desktop-file-utils.
---
 gnu/packages/gimp.scm | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index c82a70db49..0137a4d7ad 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)
@@ -337,30 +338,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
+       ("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
-- 
2.30.2

[bug#51106] [PATCH v2 1/7] gnu: babl: Update to 0.1.88.

[Vinicius Monego]

* gnu/packages/gimp.scm (babl): Update to 0.1.88.
---
 gnu/packages/gimp.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 <t_w_@freenet.de>
 ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
 ;;;
 ;;; 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
-- 
2.30.2

[bug#51106] [PATCH v2 2/7] gnu: babl: Enable GIR.

[Vinicius Monego]

* gnu/packages/gimp.scm (babl)[arguments]<#:configure-flags>: Remove.
[native-inputs]: Add gobject-introspection, vala.
---
Removed the enable-gir configure flag as suggested by Liliana.

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

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)))
-- 
2.30.2

[bug#51106] [PATCH v2 3/7] gnu: gegl: Update to 0.4.32.

[Vinicius Monego]

* gnu/packages/gimp.scm (gegl): Update to 0.4.32.
[arguments]<#:phases>: Don't return #t.
---
 gnu/packages/gimp.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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)
-- 
2.30.2

[bug#51106] [PATCH v2 4/7] gnu: gegl: Enable GIR.

[Vinicius Monego]

* gnu/packages/gimp.scm (gegl)[arguments]<#:configure-flags>: Remove.
[native-inputs]: Sort alphabetically. Add gobject-introspection, vala.
---
Removed the instropection configure flag and sorted native-inputs as suggested by Liliana.

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

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
-- 
2.30.2

[bug#51106] [PATCH v2 5/7] gnu: gegl: Add optional dependencies.

[Vinicius Monego]

* gnu/packages/gimp.scm (gegl)[inputs]: Add gdk-pixbuf, gexiv2, jasper,
libnsgif, libraw, librsvg, libspiro, libtiff, libwebp, maxflow, openexr,
poppler, sdl2.
---
Only swapped libjpeg and libpng in the comment.

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

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 5e46eb36b7..59c7afaaa8 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)
-- 
2.30.2

[bug#51106] [PATCH v2 6/7] gnu: gimp: Update to 2.10.28.

[Vinicius Monego]

* gnu/packages/gimp.scm (gimp): Update to 2.10.28.
---
 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 59c7afaaa8..4f09beff8e 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
-- 
2.30.2

[bug#51106] [PATCH v2 7/7] gnu: gimp: Add optional dependencies.

[Vinicius Monego]

* 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.
---
 gnu/packages/gimp.scm | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 4f09beff8e..d22bb34921 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
+       ("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
-- 
2.30.2

bug#51106: [PATCH v2 7/7] gnu: gimp: Add optional dependencies.

[Liliana Marie Prikler]

Hi,

Am Samstag, den 09.10.2021, 17:08 +0000 schrieb Vinicius Monego:
> * 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.
Pushed this and the rest of the series with the following adjustment:

> -       ("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
> +       ("python" ,python-2)               ; optional, Python support
> +       ("python2-pygtk" ,python2-pygtk))) ; optional, Python support
poppler-data belongs to poppler, so added it there with a comment.

Cheers