67/107: gnu: gnome-shell: Update to 3.36.1.

[guix-commits]

kkebreau pushed a commit to branch wip-gnome3.36
in repository guix.

commit 178703d2997ba6de19b3b3365e3591058cf1238f
Author: Kei Kebreau <address@hidden>
AuthorDate: Tue Apr 21 13:50:18 2020 -0400

    gnu: gnome-shell: Update to 3.36.1.
    
    * gnu/packages/gnome.scm (gnome-shell): Update to 3.36.1.
    [arguments]: Add 'skip-gtk-update-icon-cache' phase.
    [inputs]: Add graphene.
    * gnu/packages/patches/gnome-shell-disable-test.patch,
    gnu/packages/patches/gnome-shell-theme.patch: Update patches.
---
 gnu/packages/gnome.scm                             | 12 ++++-
 .../patches/gnome-shell-disable-test.patch         | 10 ++--
 gnu/packages/patches/gnome-shell-theme.patch       | 58 +++++++++++-----------
 3 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6390843..7b0ba95 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7129,7 +7129,7 @@ properties, screen resolution, and other GNOME 
parameters.")
 (define-public gnome-shell
   (package
     (name "gnome-shell")
-    (version "3.34.2")
+    (version "3.36.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -7137,7 +7137,7 @@ properties, screen resolution, and other GNOME 
parameters.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh"))
+                "0696qw6bmbga30qlvh1k6bkiajl7877j8yis4bwmi1wxkcmkh854"))
               (patches (search-patches "gnome-shell-theme.patch"
                                        "gnome-shell-disable-test.patch"))
               (modules '((guix build utils)))
@@ -7179,6 +7179,13 @@ properties, screen resolution, and other GNOME 
parameters.")
                  (("keysdir =.*")
                   (string-append "keysdir = '" keysdir "'\n")))
                #t)))
+         (add-after 'unpack 'skip-gtk-update-icon-cache
+           ;; Don't create 'icon-theme.cache'.
+           (lambda _
+             (substitute* '("meson/postinstall.py"
+                            
"subprojects/extensions-app/build-aux/meson/postinstall.py")
+               (("gtk-update-icon-cache") "true"))
+             #t))
          (add-before 'configure 'convert-logo-to-png
            (lambda* (#:key inputs #:allow-other-keys)
              ;; Convert the logo from SVG to PNG.
@@ -7259,6 +7266,7 @@ properties, screen resolution, and other GNOME 
parameters.")
        ("gnome-bluetooth" ,gnome-bluetooth)
        ("gnome-desktop" ,gnome-desktop)
        ("gnome-settings-daemon" ,gnome-settings-daemon)
+       ("graphene" ,graphene)
        ("gst-plugins-base" ,gst-plugins-base)
        ("ibus" ,ibus)
        ("libcanberra" ,libcanberra)
diff --git a/gnu/packages/patches/gnome-shell-disable-test.patch 
b/gnu/packages/patches/gnome-shell-disable-test.patch
index b4c7e73..827bd98 100644
--- a/gnu/packages/patches/gnome-shell-disable-test.patch
+++ b/gnu/packages/patches/gnome-shell-disable-test.patch
@@ -1,17 +1,17 @@
 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 @@
+diff -ur a/src/st/meson.build b/src/st/meson.build
+--- a/src/st/meson.build       2020-03-30 18:29:41.351527000 -0400
++++ b/src/st/meson.build       2020-04-21 01:56:10.648607162 -0400
+@@ -193,18 +193,6 @@
    sources: st_enums[1]
  )
  
 -test_theme = executable('test-theme',
 -  sources: 'test-theme.c',
 -  c_args: st_cflags,
--  dependencies: [mutter_dep, gtk_dep],
+-  dependencies: [mutter_dep, gtk_dep, libxml_dep],
 -  build_rpath: mutter_typelibdir,
 -  link_with: libst
 -)
diff --git a/gnu/packages/patches/gnome-shell-theme.patch 
b/gnu/packages/patches/gnome-shell-theme.patch
index 3fa0670..421407a 100644
--- a/gnu/packages/patches/gnome-shell-theme.patch
+++ b/gnu/packages/patches/gnome-shell-theme.patch
@@ -3,49 +3,51 @@ Adjust GNOME-Shell so that it uses a Guix theme by default.
 Patch by Ludovic Courtès <address@hidden>.
 
 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 @@
+--- a/data/gnome-shell-theme.gresource.xml     2020-04-21 01:47:07.910448605 
-0400
++++ b/data/gnome-shell-theme.gresource.xml     2020-04-21 01:47:42.120963071 
-0400
+@@ -12,6 +12,8 @@
+     <file 
alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
      <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 
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 @@
+     <file 
alias="icons/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
+     <file 
alias="icons/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
+diff -ur a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss 
b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
+--- a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss   2020-03-30 
18:29:41.197531200 -0400
++++ b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss   2020-04-21 
01:51:12.214121888 -0400
+@@ -88,7 +88,16 @@
    }
  }
  
--  .login-dialog-logo-bin { padding: 24px 0px; }
-+  .login-dialog-logo-bin {
-+      /* Make it a bit narrower than .login-dialog-user-list.  */
-+      width: 12em;
-+      height: 8em;
-+      background: url(resource:///org/gnome/shell/theme/guix-logo.png);
-+      background-color: transparent;
-+      background-repeat: no-repeat;
-+      background-size: contain;
-+      background-position: center; }
+-.login-dialog-logo-bin { padding: 24px 0px; }
++.login-dialog-logo-bin {
++    /* Make it a bit narrower than .login-dialog-user-list.  */
++    width: 12em;
++    height: 8em;
++    background: url(resource:///org/gnome/shell/theme/guix-logo.png);
++    background-color: transparent;
++    background-repeat: no-repeat;
++    background-size: contain;
++    background-position: center; }
 +
-   .login-dialog-banner { color: darken($osd_fg_color,10%); }
-   .login-dialog-button-box { spacing: 5px; }
-   .login-dialog-message-warning { color: $warning_color; }
-@@ -2143,9 +2152,10 @@
+ .login-dialog-banner { color: darken($osd_fg_color,10%); }
+ .login-dialog-button-box { width: 23em; spacing: 5px; }
+ .login-dialog-message { text-align: center; }
+diff -ur a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss 
b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
+--- a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss  2020-03-30 
18:29:41.198531200 -0400
++++ b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss  2020-04-21 
01:52:22.645180571 -0400
+@@ -66,8 +66,10 @@
  }
  
  #lockDialogGroup {
--  background: lighten(#2e3436, 8%) 
url(resource:///org/gnome/shell/theme/noise-texture.png);
--  background-repeat: repeat;
+-  background-color: lighten(#2e3436, 8%);
 -}
-+  background: lighten(#2e3436, 8%) 
url(resource:///org/gnome/shell/theme/guix-background.png);
++  background-color: lighten(#2e3436, 8%) 
url(resource:///org/gnome/shell/theme/guix-background.png);
 +  background-repeat: no-repeat;
 +  background-size: cover;
 +  background-position: center; }
  
- #screenShieldNotifications {
+ #unlockDialogNotifications {
    StButton#vhandle, StButton#hhandle {