[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
46/60: gnu: gnome-shell: Update to 3.34.2.
From: |
guix-commits |
Subject: |
46/60: gnu: gnome-shell: Update to 3.34.2. |
Date: |
Sat, 25 Jan 2020 14:47:16 -0500 (EST) |
kkebreau pushed a commit to branch wip-gnome3.34
in repository guix.
commit 0718d15d10f4cdc2b8397a190508ac1aab9343f6
Author: Kei Kebreau <address@hidden>
AuthorDate: Sat Dec 21 23:21:51 2019 -0500
gnu: gnome-shell: Update to 3.34.2.
* gnu/packages/gnome.scm (gnome-shell): Update to 3.34.2.
[source]: Add patch.
[native-inputs]: Add asciidoc.
[inputs]: Add gnome-autoar.
* gnu/packages/patches/gnome-shell-theme.patch: Adjust patch accordingly.
* gnu/packages/patches/gnome-shell-disable-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
gnu/packages/gnome.scm | 11 +++++---
.../patches/gnome-shell-disable-test.patch | 25 ++++++++++++++++++
gnu/packages/patches/gnome-shell-theme.patch | 30 ++++++++++------------
4 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index bc011c0..f192198 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -950,6 +950,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
%D%/packages/patches/gnome-shell-theme.patch \
+ %D%/packages/patches/gnome-shell-disable-test.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e57ea49..1e7de73 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7168,7 +7168,7 @@ properties, screen resolution, and other GNOME
parameters.")
(define-public gnome-shell
(package
(name "gnome-shell")
- (version "3.32.2")
+ (version "3.34.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -7176,8 +7176,9 @@ properties, screen resolution, and other GNOME
parameters.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5"))
- (patches (search-patches "gnome-shell-theme.patch"))
+ "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh"))
+ (patches (search-patches "gnome-shell-theme.patch"
+ "gnome-shell-disable-test.patch"))
(modules '((guix build utils)))
(snippet
#~(begin
@@ -7271,7 +7272,8 @@ properties, screen resolution, and other GNOME
parameters.")
'("inkscape" "intltool" "glib:bin"))
#:outputs outputs)))))))
(native-inputs
- `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
+ `(("asciidoc" ,asciidoc)
+ ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
("gobject-introspection" ,gobject-introspection)
("inkscape" ,inkscape)
@@ -7292,6 +7294,7 @@ properties, screen resolution, and other GNOME
parameters.")
("gdm" ,gdm)
("gdk-pixbuf" ,gdk-pixbuf+svg)
("gjs" ,gjs)
+ ("gnome-autoar" ,gnome-autoar)
("gnome-bluetooth" ,gnome-bluetooth)
("gnome-desktop" ,gnome-desktop)
("gnome-settings-daemon" ,gnome-settings-daemon)
diff --git a/gnu/packages/patches/gnome-shell-disable-test.patch
b/gnu/packages/patches/gnome-shell-disable-test.patch
new file mode 100644
index 0000000..b4c7e73
--- /dev/null
+++ b/gnu/packages/patches/gnome-shell-disable-test.patch
@@ -0,0 +1,25 @@
+This test seems to require a D-Bus connection not available in the build
+environment.
+
+diff -ur
/tmp/guix-build-gnome-shell-3.34.2.drv-0/gnome-shell-3.34.2/src/st/meson.build
b/src/st/meson.build
+---
/tmp/guix-build-gnome-shell-3.34.2.drv-0/gnome-shell-3.34.2/src/st/meson.build
1969-12-31 19:00:00.000000000 -0500
++++ b/src/st/meson.build 2019-12-23 00:46:14.721198022 -0500
+@@ -132,18 +132,6 @@
+ sources: st_enums[1]
+ )
+
+-test_theme = executable('test-theme',
+- sources: 'test-theme.c',
+- c_args: st_cflags,
+- dependencies: [mutter_dep, gtk_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',
diff --git a/gnu/packages/patches/gnome-shell-theme.patch
b/gnu/packages/patches/gnome-shell-theme.patch
index fc7f7ca..3fa0670 100644
--- a/gnu/packages/patches/gnome-shell-theme.patch
+++ b/gnu/packages/patches/gnome-shell-theme.patch
@@ -2,25 +2,23 @@ Adjust GNOME-Shell so that it uses a Guix theme by default.
Patch by Ludovic Courtès <address@hidden>.
-diff --git a/data/gnome-shell-theme.gresource.xml
b/data/gnome-shell-theme.gresource.xml
-index 76aeaa5..8eaf32e 100644
---- a/data/gnome-shell-theme.gresource.xml
-+++ b/data/gnome-shell-theme.gresource.xml
-@@ -22,6 +22,8 @@
+diff -ur a/data/gnome-shell-theme.gresource.xml
b/data/gnome-shell-theme.gresource.xml
+--- a/data/gnome-shell-theme.gresource.xml 2019-12-11 15:06:31.000000000
-0500
++++ b/data/gnome-shell-theme.gresource.xml 2019-12-21 00:31:55.895866241
-0500
+@@ -19,6 +19,8 @@
<file>no-events.svg</file>
<file>no-notifications.svg</file>
<file>noise-texture.png</file>
+ <file>guix-background.png</file>
+ <file>guix-logo.png</file>
<file>pad-osd.css</file>
- <file>page-indicator-active.svg</file>
- <file>page-indicator-inactive.svg</file>
-diff --git a/data/theme/gnome-shell-sass/_common.scss
b/data/theme/gnome-shell-sass/_common.scss
-index 54d9f39..b9badd0 100644
---- a/data/theme/gnome-shell-sass/_common.scss
-+++ b/data/theme/gnome-shell-sass/_common.scss
-@@ -1742,7 +1742,16 @@ $legacy_icon_size: 24px;
-
+ <file
alias="icons/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
+ <file
alias="icons/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
+diff -ur a/data/theme/gnome-shell-sass/_common.scss
b/data/theme/gnome-shell-sass/_common.scss
+--- a/data/theme/gnome-shell-sass/_common.scss 2019-12-11 15:06:31.000000000
-0500
++++ b/data/theme/gnome-shell-sass/_common.scss 2019-12-21 00:33:49.495832135
-0500
+@@ -1994,7 +1994,16 @@
+ }
}
- .login-dialog-logo-bin { padding: 24px 0px; }
@@ -37,14 +35,14 @@ index 54d9f39..b9badd0 100644
.login-dialog-banner { color: darken($osd_fg_color,10%); }
.login-dialog-button-box { spacing: 5px; }
.login-dialog-message-warning { color: $warning_color; }
-@@ -1889,9 +1898,10 @@ $legacy_icon_size: 24px;
+@@ -2143,9 +2152,10 @@
}
#lockDialogGroup {
-- background: #2e3436
url(resource:///org/gnome/shell/theme/noise-texture.png);
+- background: lighten(#2e3436, 8%)
url(resource:///org/gnome/shell/theme/noise-texture.png);
- background-repeat: repeat;
-}
-+ background: #2e3436
url(resource:///org/gnome/shell/theme/guix-background.png);
++ background: lighten(#2e3436, 8%)
url(resource:///org/gnome/shell/theme/guix-background.png);
+ background-repeat: no-repeat;
+ background-size: cover;
+ background-position: center; }
- 42/60: gnu: mutter: Update to 3.34.2., (continued)
- 42/60: gnu: mutter: Update to 3.34.2., guix-commits, 2020/01/25
- 43/60: gnu: gdm: Update to 3.34.1., guix-commits, 2020/01/25
- 36/60: gnu: pango: Update to 1.44.7., guix-commits, 2020/01/25
- 45/60: gnu: gjs: Update to 1.58.3., guix-commits, 2020/01/25
- 48/60: gnu: gnome-mines: Update to 3.34.0., guix-commits, 2020/01/25
- 50/60: gnu: devhelp: Update to 3.34.0., guix-commits, 2020/01/25
- 52/60: gnu: gnome-clocks: Update to 3.34.0., guix-commits, 2020/01/25
- 44/60: gnu: telepathy-glib: Disable failing tests., guix-commits, 2020/01/25
- 51/60: gnu: gnome-klotski: Update to 3.34.0., guix-commits, 2020/01/25
- 47/60: gnu: seahorse: Update to 3.34., guix-commits, 2020/01/25
- 46/60: gnu: gnome-shell: Update to 3.34.2.,
guix-commits <=
- 49/60: gnu: gnome-sudoku: Update to 3.34.1., guix-commits, 2020/01/25
- 55/60: gnu: gnome-shell-extensions: Update to 3.34.2., guix-commits, 2020/01/25
- 58/60: gnu: cheese: Update to 3.34.0., guix-commits, 2020/01/25
- 60/60: gnu: librsvg-next: Temporarily disable tests., guix-commits, 2020/01/25
- 57/60: gnu: tracker: Fix functional tests., guix-commits, 2020/01/25
- 56/60: gnu: orca: Update to 3.34.1., guix-commits, 2020/01/25
- 59/60: gnu: gnome-maps: Update to 3.34.2., guix-commits, 2020/01/25
- 54/60: gnu: gnome-tweaks: Update to 3.34.0., guix-commits, 2020/01/25
- 53/60: gnu: gnome-calendar: Update to 3.34.2., guix-commits, 2020/01/25