158/217: gnu: gdk-pixbuf: Remove obsolete jasper support.

[guix-commits]

vagrantc pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.

commit 4ce81d4045414a047efa601f2d93e7d4008b467c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Oct 27 16:13:52 2021 -0400

    gnu: gdk-pixbuf: Remove obsolete jasper support.
    
    The newer meson 0.60 failed the build because the jasper flag no longer
    exists.
    
    * gnu/packages/gtk.scm (gdk-pixbuf)[configure-flags]<jasper>: Remove 
configure
    flag.
    [phases]{patch-docbook}: Remove condition and TODO comment.
    [inputs]: Remove jasper.
---
 gnu/packages/gtk.scm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b199032..daeb445 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -638,16 +638,12 @@ highlighting and other features typical of a source code 
editor.")
     (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
-     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
-       #:configure-flags '("-Dinstalled_tests=false" "-Djasper=true")
+     `(#:glib-or-gtk? #t             ; To wrap binaries and/or compile schemas
+       #:configure-flags '("-Dinstalled_tests=false")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-docbook
-           ;; TODO(core-updates): Unconditionally look in (or native-inputs 
inputs)
-           (lambda* (#:key ,@(if (%current-target-system)
-                                 '(native-inputs)
-                                 '())
-                     inputs #:allow-other-keys)
+           (lambda* (#:key native-inputs inputs #:allow-other-keys)
              (with-directory-excursion "docs"
                (substitute* "meson.build"
                  (("http://docbook.sourceforge.net/release/xsl/current/";)
@@ -684,7 +680,6 @@ highlighting and other features typical of a source code 
editor.")
      `(,@(if (%current-target-system)
              `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap
              '())
-       ("jasper" ,jasper)
        ("libjpeg" ,libjpeg-turbo)
        ("libpng"  ,libpng)
        ("libtiff" ,libtiff)))
@@ -692,7 +687,7 @@ highlighting and other features typical of a source code 
editor.")
      `(("docbook-xml" ,docbook-xml-4.3)
        ("docbook-xsl" ,docbook-xsl)
        ("gettext" ,gettext-minimal)
-       ("glib" ,glib "bin")             ; glib-mkenums, etc.
+       ("glib" ,glib "bin")                             ; glib-mkenums, etc.
        ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler, etc.
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)