me
/
guix
Archived
1
0
Fork 0

gnu: gnome-shell: Update to 41.0.

* gnu/packages/gnome.scm (gnome-shell): Update to 41.0.
[origin]: Remove patches and modules fields.
[phases]{pre-check}: Set HOME.
* gnu/packages/patches/gnome-shell-disable-test.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
master
Maxim Cournoyer 2021-11-19 15:17:54 -05:00
parent b342b68c83
commit afacad8b67
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
3 changed files with 4 additions and 30 deletions

View File

@ -1165,7 +1165,6 @@ dist_patch_DATA = \
%D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \
%D%/packages/patches/gnome-online-miners-tracker-3.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \
%D%/packages/patches/gnome-screenshot-meson-0.60.patch \ %D%/packages/patches/gnome-screenshot-meson-0.60.patch \
%D%/packages/patches/gnome-shell-disable-test.patch \
%D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \

View File

@ -8753,7 +8753,7 @@ properties, screen resolution, and other GNOME parameters.")
(define-public gnome-shell (define-public gnome-shell
(package (package
(name "gnome-shell") (name "gnome-shell")
(version "40.5") (version "41.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -8761,9 +8761,7 @@ properties, screen resolution, and other GNOME parameters.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0kph3g4ix23sm3ip2b13rs7hx8sa7fvlvcyy4zdk2iaj56rmadvd")) "0ragmcln210zvzhc2br33yprbkj9drjzd7inp5sdxra0a7l73yaj"))))
(patches (search-patches "gnome-shell-disable-test.patch"))
(modules '((guix build utils)))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60 `(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
@ -8811,7 +8809,8 @@ properties, screen resolution, and other GNOME parameters.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Tests require a running X server. ;; Tests require a running X server.
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1"))) (setenv "DISPLAY" ":1")
(setenv "HOME" "/tmp"))) ;to avoid "fatal" warnings
(add-after 'install 'wrap-programs (add-after 'install 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))

View File

@ -1,24 +0,0 @@
This test seems to require a D-Bus connection not available in the build
environment.
--- a/src/st/meson.build 2021-09-21 19:07:38.673049200 +0000
+++ b/src/st/meson.build 2021-09-26 18:23:38.461569826 +0000
@@ -191,18 +191,6 @@
sources: st_enums[1]
)
-test_theme = executable('test-theme',
- sources: 'test-theme.c',
- c_args: st_cflags,
- dependencies: [mutter_dep, gtk_dep, libxml_dep],
- build_rpath: mutter_typelibdir,
- link_with: libst
-)
-
-test('CSS styling support', test_theme,
- workdir: meson.current_source_dir()
-)
-
libst_gir = gnome.generate_gir(libst,
sources: st_gir_sources,
nsversion: '1.0',