me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
* gnu/packages/gnome.scm (gnome-control-center): Update to 42.3.
[configure-flags]: Delete argument.
[phases]: Use gexps.
{patch-paths}: Use search-input-file.
{no-polkit-magic}: Delete phase.
[inputs]: Delete clutter-gtk, libcanberra and libsoup-minimal-2.  Add gnutls
and libadwaita.  Move docbook-xsl to...
[native-inputs]: ... here.  Replace intltool with gettext-minimal.  Remove
hicolor-icon-theme.  Sort.
This commit is contained in:
Maxim Cournoyer 2022-09-05 00:53:56 -04:00
parent b94e1572a5
commit 02b4c6f3ab
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 42 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
gnu/packages/gnome.scm
View file

@ -8739,7 +8739,7 @@ devices using the GNOME desktop.")
(define-public gnome-control-center (define-public gnome-control-center
(package (package
(name "gnome-control-center") (name "gnome-control-center")
(version "41.2") (version "42.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -8747,85 +8747,68 @@ devices using the GNOME desktop.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0j72ixhli621psbrma86qxy0spv6gpjx6k9hg2jih97c6dmzqwc2")) "0zhw6hcrrcpq1zjkyzr5ipznxnzd2aczrqd7n2y7xbz21mjy62nf"))))
(patches (search-patches
"gnome-control-center-libexecdir.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t (list
#:configure-flags #:glib-or-gtk? #t
(list "-Dcheese=false" #:phases
(string-append "-Dgnome_session_libexecdir=" #~(modify-phases %standard-phases
(assoc-ref %build-inputs "gnome-session") (add-before 'configure 'patch-paths
"/libexec")) (lambda* (#:key inputs #:allow-other-keys)
#:phases (substitute* "panels/datetime/tz.h"
(modify-phases %standard-phases (("/usr/share/zoneinfo/zone.tab")
(add-before 'configure 'patch-paths (search-input-file inputs "share/zoneinfo/zone.tab")))
(lambda* (#:key inputs #:allow-other-keys) (substitute* "tests/datetime/test-endianess.c"
(let ((libc (assoc-ref inputs "libc")) (("/usr/share/locale")
(tzdata (assoc-ref inputs "tzdata")) (search-input-directory inputs "share/locale")))
(libgnomekbd (assoc-ref inputs "libgnomekbd")) (substitute* "panels/region/cc-region-panel.c"
(nm-applet (assoc-ref inputs "network-manager-applet")) (("\"gkbd-keyboard-display")
(gnome-desktop (assoc-ref inputs "gnome-desktop"))) (string-append "\"" (search-input-file
(substitute* "panels/datetime/tz.h" inputs "bin/gkbd-keyboard-display"))))
(("/usr/share/zoneinfo/zone.tab") (substitute* '("panels/network/net-device-bluetooth.c"
(string-append tzdata "/share/zoneinfo/zone.tab"))) "panels/network/net-device-mobile.c"
(substitute* "tests/datetime/test-endianess.c" "panels/network/connection-editor/net-connection-editor.c")
(("/usr/share/locale") (("\"nm-connection-editor")
(string-append libc "/share/locale"))) (string-append "\"" (search-input-file
(substitute* "panels/region/cc-region-panel.c" inputs "bin/nm-connection-editor"))))
(("\"gkbd-keyboard-display") (substitute* "panels/user-accounts/run-passwd.c"
(string-append "\"" libgnomekbd (("/usr/bin/passwd")
"/bin/gkbd-keyboard-display"))) "/run/setuid-programs/passwd"))
(substitute* '("panels/network/net-device-bluetooth.c" (substitute* "panels/info-overview/cc-info-overview-panel.c"
"panels/network/net-device-mobile.c" (("DATADIR \"/gnome/gnome-version.xml\"")
"panels/network/connection-editor/net-connection-editor.c") (format #f "~s" (search-input-file
(("\"nm-connection-editor") inputs "share/gnome/gnome-version.xml"))))))
(string-append "\"" nm-applet (add-after 'unpack 'skip-gtk-update-icon-cache
"/bin/nm-connection-editor"))) ;; Don't create 'icon-theme.cache'.
(substitute* '("panels/user-accounts/run-passwd.c") (lambda _
(("/usr/bin/passwd") (substitute* "build-aux/meson/meson_post_install.py"
"/run/setuid-programs/passwd")) (("gtk-update-icon-cache") (which "true"))))))))
(substitute* "panels/info-overview/cc-info-overview-panel.c"
(("DATADIR \"/gnome/gnome-version.xml\"")
(string-append "\"" gnome-desktop
"/share/gnome/gnome-version.xml\""))))))
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "build-aux/meson/meson_post_install.py"
(("gtk-update-icon-cache") (which "true")))))
(add-before 'install 'no-polkit-magic
;; Meson ‘magically’ invokes pkexec, which fails (not setuid).
(lambda _
(setenv "PKEXEC_UID" "something"))))))
(native-inputs (native-inputs
(list `(,glib "bin") ;for glib-mkenums, etc. (list docbook-xsl
intltool gettext-minimal
`(,glib "bin") ;for glib-mkenums, etc.
libxslt
pkg-config pkg-config
python python
libxslt
;; For tests
hicolor-icon-theme
python-dbusmock python-dbusmock
xorg-server-for-tests)) xorg-server-for-tests))
(inputs (inputs
(list accountsservice (list accountsservice
clutter-gtk
colord-gtk colord-gtk
cups cups
dconf dconf
docbook-xsl
gcr gcr
gnome-bluetooth gnome-bluetooth
gnome-desktop gnome-desktop
gnome-online-accounts gnome-online-accounts
gnome-session gnome-session
gnome-settings-daemon gnome-settings-daemon
gnutls
grilo grilo
gsound gsound
ibus ibus
libcanberra libadwaita
libgnomekbd libgnomekbd
libgudev libgudev
libgtop libgtop
@ -8833,7 +8816,6 @@ devices using the GNOME desktop.")
libpwquality libpwquality
librsvg ;for loading SVG files librsvg ;for loading SVG files
libsecret libsecret
libsoup-minimal-2
libxml2 libxml2
libwacom libwacom
mesa mesa