1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-26 11:01:48 +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+)))
(define-public cheese
(package
(name "cheese")
(version "44.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major version) "/" name "-"
version ".tar.xz"))
(sha256
(base32
"13pnz35yvwvmk1iyhcp1a94yal4rh610rxmsp3rdsm4yr728a8az"))))
(arguments
(list #:glib-or-gtk? #t
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
(lambda _
;; Don't create 'icon-theme.cache'.
(substitute* "meson.build"
(("gtk_update_icon_cache: true")
"gtk_update_icon_cache: false"))))
(add-before 'configure 'relax-gcc-14-strictness
(lambda _
(setenv "CFLAGS"
"-g -O2 -Wno-error=incompatible-pointer-types")))
(add-after 'install 'wrap-cheese
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (search-input-file outputs "bin/cheese")
`("GST_PLUGIN_SYSTEM_PATH" prefix
(,(getenv "GST_PLUGIN_SYSTEM_PATH")))
`("GST_PRESET_PATH" prefix
(,(dirname (search-input-file inputs
"share/gstreamer-1.0\
(let ((commit "c059d4f1cdfa209ac98d9df82adcc2ade9001c24")
(revision "1"))
(package
(name "cheese")
(version (git-version "44.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.gnome.org/GNOME/cheese.git")
(commit commit)))
(sha256
(base32
"1zi9p7xxbkz7pjb2mbdk95sawyigb1hwgs3yms2drchk5vznnxav"))))
(arguments
(list #:glib-or-gtk? #t
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
(lambda _
;; Don't create 'icon-theme.cache'.
(substitute* "meson.build"
(("gtk_update_icon_cache: true")
"gtk_update_icon_cache: false"))))
(add-after 'install 'wrap-cheese
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (search-input-file outputs "bin/cheese")
`("GST_PLUGIN_SYSTEM_PATH" prefix
(,(getenv "GST_PLUGIN_SYSTEM_PATH")))
`("GST_PRESET_PATH" prefix
(,(dirname (search-input-file inputs
"share/gstreamer-1.0\
/presets/GstVP8Enc.prs"))))))))))
(build-system meson-build-system)
(native-inputs
(list docbook-xml-4.3
docbook-xsl
gettext-minimal
`(,glib "bin")
gobject-introspection
gtk-doc/stable
itstool
libxml2
libxslt
pkg-config
vala))
(propagated-inputs
(list clutter
clutter-gst
clutter-gtk
gdk-pixbuf
glib
gnome-video-effects
gstreamer
libcanberra))
(inputs
(list bash-minimal
gnome-desktop
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gtk+
libx11
libxtst))
(home-page "https://wiki.gnome.org/Apps/Cheese")
(synopsis "Webcam photo booth software for GNOME")
(description
"Cheese uses your webcam to take photos and videos. Cheese can also
(build-system meson-build-system)
(native-inputs
(list docbook-xml-4.3
docbook-xsl
gettext-minimal
`(,glib "bin")
gobject-introspection
gtk-doc/stable
itstool
libxml2
libxslt
pkg-config
vala))
(propagated-inputs
(list clutter
clutter-gst
clutter-gtk
gdk-pixbuf
glib
gnome-video-effects
gstreamer
libcanberra))
(inputs
(list bash-minimal
gnome-desktop
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gtk+
libx11
libxtst))
(home-page "https://wiki.gnome.org/Apps/Cheese")
(synopsis "Webcam photo booth software for GNOME")
(description
"Cheese uses your webcam to take photos and videos. Cheese can also
apply fancy special effects and lets you share the fun with others.")
(license license:gpl2+)))
(license license:gpl2+))))
(define-public secrets
(package