gnu: gnome-control-center: Update to 40.1.

* gnu/packages/gnome.scm (gnome-control-center): Update to 40.1.
[source]: Fix the URI.
[arguments]: Fix the source paths. Remove trailing #t. Remove
the 'set-cflags phase.
This commit is contained in:
Mathieu Othacehe 2021-09-26 08:06:17 +00:00
parent 605a0c48f5
commit d0bfb36a0a
No known key found for this signature in database
GPG key ID: 8354763531769CA6

View file

@ -8370,15 +8370,15 @@ (define-public gnome-bluetooth
(define-public gnome-control-center (define-public gnome-control-center
(package (package
(name "gnome-control-center") (name "gnome-control-center")
(version "3.34.2") (version "40.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/" (version-major version) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"054igagvmyzpaa5nwzz98gv7bk7l5dwp6g813707132si3szlpx8")))) "0rr4d5m2a72vrb31jgyx49dp0s2pwgyxsrk4hyw5ym66wq63c3v1"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:glib-or-gtk? #t '(#:glib-or-gtk? #t
@ -8406,8 +8406,8 @@ (define-public gnome-control-center
(("\"gkbd-keyboard-display") (("\"gkbd-keyboard-display")
(string-append "\"" libgnomekbd (string-append "\"" libgnomekbd
"/bin/gkbd-keyboard-display"))) "/bin/gkbd-keyboard-display")))
(substitute* '("panels/network/net-device-wifi.c" (substitute* '("panels/network/net-device-bluetooth.c"
"panels/network/net-device.c" "panels/network/net-device-mobile.c"
"panels/network/connection-editor/net-connection-editor.c") "panels/network/connection-editor/net-connection-editor.c")
(("\"nm-connection-editor") (("\"nm-connection-editor")
(string-append "\"" nm-applet (string-append "\"" nm-applet
@ -8415,23 +8415,15 @@ (define-public gnome-control-center
(substitute* '("panels/user-accounts/run-passwd.c") (substitute* '("panels/user-accounts/run-passwd.c")
(("/usr/bin/passwd") (("/usr/bin/passwd")
"/run/setuid-programs/passwd")) "/run/setuid-programs/passwd"))
(substitute* "panels/info/cc-info-overview-panel.c" (substitute* "panels/info-overview/cc-info-overview-panel.c"
(("DATADIR \"/gnome/gnome-version.xml\"") (("DATADIR \"/gnome/gnome-version.xml\"")
(string-append "\"" gnome-desktop (string-append "\"" gnome-desktop
"/share/gnome/gnome-version.xml\""))) "/share/gnome/gnome-version.xml\""))))))
#t)))
;; XXX: This appears to be fixed in 3.35.90:
;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957285.
(add-before 'configure 'set-cflags
(lambda _
(setenv "CFLAGS" "-fcommon")
#t))
(add-after 'unpack 'skip-gtk-update-icon-cache (add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'. ;; Don't create 'icon-theme.cache'.
(lambda _ (lambda _
(substitute* "build-aux/meson/meson_post_install.py" (substitute* "build-aux/meson/meson_post_install.py"
(("gtk-update-icon-cache") (which "true"))) (("gtk-update-icon-cache") (which "true"))))))))
#t)))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
("intltool" ,intltool) ("intltool" ,intltool)