mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 23:36:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gdk-pixbuf: Remove obsolete jasper support.

Browse source 
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.
This commit is contained in:
Maxim Cournoyer 2021-10-27 16:13:52 -04:00
parent 33c7e18347
commit 86528cab04
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/gtk.scm
View file

@ -638,16 +638,12 @@ (define-public gdk-pixbuf
(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 @@ (define-public gdk-pixbuf
`(,@(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 @@ (define-public gdk-pixbuf
`(("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)