[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
158/180: gnu: gdk-pixbuf: Remove obsolete jasper support.
From: |
guix-commits |
Subject: |
158/180: gnu: gdk-pixbuf: Remove obsolete jasper support. |
Date: |
Fri, 29 Oct 2021 15:57:13 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 6736f2329384bed58282e070aec405d9efd7f85f
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)
- 130/180: gnu: webkitgtk: Update to 2.34.1., (continued)
- 130/180: gnu: webkitgtk: Update to 2.34.1., guix-commits, 2021/10/29
- 134/180: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper., guix-commits, 2021/10/29
- 138/180: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/10/29
- 141/180: gnu: librsvg: Preserve the loaders.cache file., guix-commits, 2021/10/29
- 143/180: gnu: elogind: Update to 246.10., guix-commits, 2021/10/29
- 92/180: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/29
- 105/180: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/29
- 104/180: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/29
- 128/180: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/29
- 156/180: gnu: python-six-bootstrap: Update to 1.16.0., guix-commits, 2021/10/29
- 158/180: gnu: gdk-pixbuf: Remove obsolete jasper support.,
guix-commits <=
- 163/180: gnu: python-numpy: Update to 1.21.3 and cleanup., guix-commits, 2021/10/29
- 174/180: gnu: xkeyboard-config: Update to 2.34., guix-commits, 2021/10/29
- 180/180: gnu: network-manager: Update to 1.32.12., guix-commits, 2021/10/29
- 149/180: gnu: meson: Update to 0.60.0., guix-commits, 2021/10/29
- 154/180: gnu: python-dbusmock: Update to 0.24.0., guix-commits, 2021/10/29
- 151/180: gnu: python-hypothesis: Update to 6.23.4., guix-commits, 2021/10/29
- 157/180: gnu: python-dateutil: Update to 2.8.2., guix-commits, 2021/10/29
- 171/180: gnu: gtkmm: Update to 4.4.0., guix-commits, 2021/10/29
- 173/180: gnu: tracker: Use libsoup-minimal-2 to fix build., guix-commits, 2021/10/29
- 175/180: gnu: xorgproto: Update to 2021.5., guix-commits, 2021/10/29