diff options
| author | Kei Kebreau <kkebreau@posteo.net> | 2019-12-23 13:00:36 -0500 |
|---|---|---|
| committer | Kei Kebreau <kkebreau@posteo.net> | 2020-04-18 16:51:31 -0400 |
| commit | 3a7e066f717754133c71306bcf7c8dccf1fff314 (patch) | |
| tree | 7fc45acb67198283b006f649eeeaee17ea60a789 | |
| parent | 30e76da11586f4034d527ecf2303f56c2da0e2dd (diff) | |
| download | guix-3a7e066f717754133c71306bcf7c8dccf1fff314.tar guix-3a7e066f717754133c71306bcf7c8dccf1fff314.tar.gz | |
gnu: cheese: Update to 3.34.0.
* gnu/packages/gnome.scm (cheese): Update to 3.34.0.
[build-system]: Use meson-build-system.
[arguments]: Set #:glib-or-gtk? flag. Adjust 'skip-gtk-update-icon-cache'
phase and run it after the 'unpack' phase.
[native-inputs]: Add docbook-xsl, gtk-doc, and libxslt.
(cherry picked from commit e96f871c3603da785e31a3c130ae1d1a64827a93)
| -rw-r--r-- | gnu/packages/gnome.scm | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c33e8ab022..6de7aaf7c6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9034,7 +9034,7 @@ photo-booth-like software, such as Cheese.") (define-public cheese (package (name "cheese") - (version "3.32.1") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9042,16 +9042,17 @@ photo-booth-like software, such as Cheese.") version ".tar.xz")) (sha256 (base32 - "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv")))) + "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni")))) (arguments - ;; Tests require GDK. - `(#:tests? #f + `(#:glib-or-gtk? #t + ;; Tests require GDK. + #:tests? #f #:phases (modify-phases %standard-phases - (add-before 'install 'skip-gtk-update-icon-cache + (add-after 'unpack 'skip-gtk-update-icon-cache (lambda _ ;; Don't create 'icon-theme.cache' - (substitute* "Makefile" + (substitute* "meson_post_install.py" (("gtk-update-icon-cache") (which "true"))) #t)) (add-after 'install 'wrap-cheese @@ -9061,12 +9062,15 @@ photo-booth-like software, such as Cheese.") (wrap-program (string-append out "/bin/cheese") `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))) #t))))) - (build-system glib-or-gtk-build-system) + (build-system meson-build-system) (native-inputs - `(("glib:bin" ,glib "bin") + `(("docbook-xsl" ,docbook-xsl) + ("glib:bin" ,glib "bin") + ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) ("itstool" ,itstool) ("libxml2" ,libxml2) + ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) ("vala" ,vala))) (propagated-inputs |