1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-29 12:35:15 +02:00

gnu: cheese: Fix parse error in cheese-window.vala

* gnu/packages/gnome.scm (cheese): Update to current upstream master branch to
pull in the fix for the parse error and also remove the need for the
'relax-gcc-14-strictness stage (commit 405f796495).

Error message was:
```
** (cheese:2058): ERROR **: 21:35:09.133: cheese-window.vala:1322: Error:
<data>:56:5: Parse error: unexpected character `'', expected character `]'
```

Change-Id: I883fab82ecc05b1f898bb9b60db63fbd3bfcd431
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
Christopher O'Neill
2025-10-13 22:47:50 +01:00
committed by Liliana Marie Prikler
parent e4f7118ddd
commit 38b8ebad0c
+67 -69
View File
@@ -11775,77 +11775,75 @@ photo-booth-like software, such as Cheese.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public cheese (define-public cheese
(package (let ((commit "c059d4f1cdfa209ac98d9df82adcc2ade9001c24")
(name "cheese") (revision "1"))
(version "44.1") (package
(source (origin (name "cheese")
(method url-fetch) (version (git-version "44.1" revision commit))
(uri (string-append "mirror://gnome/sources/" name "/" (source (origin
(version-major version) "/" name "-" (method git-fetch)
version ".tar.xz")) (uri (git-reference
(sha256 (url "https://gitlab.gnome.org/GNOME/cheese.git")
(base32 (commit commit)))
"13pnz35yvwvmk1iyhcp1a94yal4rh610rxmsp3rdsm4yr728a8az")))) (sha256
(arguments (base32
(list #:glib-or-gtk? #t "1zi9p7xxbkz7pjb2mbdk95sawyigb1hwgs3yms2drchk5vznnxav"))))
#:phases (arguments
#~(modify-phases %standard-phases (list #:glib-or-gtk? #t
(add-after 'unpack 'skip-gtk-update-icon-cache #:phases
(lambda _ #~(modify-phases %standard-phases
;; Don't create 'icon-theme.cache'. (add-after 'unpack 'skip-gtk-update-icon-cache
(substitute* "meson.build" (lambda _
(("gtk_update_icon_cache: true") ;; Don't create 'icon-theme.cache'.
"gtk_update_icon_cache: false")))) (substitute* "meson.build"
(add-before 'configure 'relax-gcc-14-strictness (("gtk_update_icon_cache: true")
(lambda _ "gtk_update_icon_cache: false"))))
(setenv "CFLAGS" (add-after 'install 'wrap-cheese
"-g -O2 -Wno-error=incompatible-pointer-types"))) (lambda* (#:key inputs outputs #:allow-other-keys)
(add-after 'install 'wrap-cheese (wrap-program (search-input-file outputs "bin/cheese")
(lambda* (#:key inputs outputs #:allow-other-keys) `("GST_PLUGIN_SYSTEM_PATH" prefix
(wrap-program (search-input-file outputs "bin/cheese") (,(getenv "GST_PLUGIN_SYSTEM_PATH")))
`("GST_PLUGIN_SYSTEM_PATH" prefix `("GST_PRESET_PATH" prefix
(,(getenv "GST_PLUGIN_SYSTEM_PATH"))) (,(dirname (search-input-file inputs
`("GST_PRESET_PATH" prefix "share/gstreamer-1.0\
(,(dirname (search-input-file inputs
"share/gstreamer-1.0\
/presets/GstVP8Enc.prs")))))))))) /presets/GstVP8Enc.prs"))))))))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
(list docbook-xml-4.3 (list docbook-xml-4.3
docbook-xsl docbook-xsl
gettext-minimal gettext-minimal
`(,glib "bin") `(,glib "bin")
gobject-introspection gobject-introspection
gtk-doc/stable gtk-doc/stable
itstool itstool
libxml2 libxml2
libxslt libxslt
pkg-config pkg-config
vala)) vala))
(propagated-inputs (propagated-inputs
(list clutter (list clutter
clutter-gst clutter-gst
clutter-gtk clutter-gtk
gdk-pixbuf gdk-pixbuf
glib glib
gnome-video-effects gnome-video-effects
gstreamer gstreamer
libcanberra)) libcanberra))
(inputs (inputs
(list bash-minimal (list bash-minimal
gnome-desktop gnome-desktop
gst-plugins-bad gst-plugins-bad
gst-plugins-base gst-plugins-base
gst-plugins-good gst-plugins-good
gtk+ gtk+
libx11 libx11
libxtst)) libxtst))
(home-page "https://wiki.gnome.org/Apps/Cheese") (home-page "https://wiki.gnome.org/Apps/Cheese")
(synopsis "Webcam photo booth software for GNOME") (synopsis "Webcam photo booth software for GNOME")
(description (description
"Cheese uses your webcam to take photos and videos. Cheese can also "Cheese uses your webcam to take photos and videos. Cheese can also
apply fancy special effects and lets you share the fun with others.") apply fancy special effects and lets you share the fun with others.")
(license license:gpl2+))) (license license:gpl2+))))
(define-public secrets (define-public secrets
(package (package