[arch-commits] Commit in gnome-shell/trunk (739.patch 742.patch PKGBUILD)

[Jan Steffens]

    Date: Monday, September 23, 2019 @ 17:47:02
  Author: heftig
Revision: 363273

3.34.0+152+g0fdbde910-1

Added:
  gnome-shell/trunk/739.patch
  gnome-shell/trunk/742.patch
Modified:
  gnome-shell/trunk/PKGBUILD

-----------+
 739.patch |   35 +++++++++++++++++++++++++++++++++++
 742.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 PKGBUILD  |   17 +++++++++++++----
 3 files changed, 89 insertions(+), 4 deletions(-)

Added: 739.patch
===================================================================
--- 739.patch	                        (rev 0)
+++ 739.patch	2019-09-23 17:47:02 UTC (rev 363273)
@@ -0,0 +1,35 @@
+From 4411d9db6ee6112f987fac8469a2cc617f4f9b6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Fri, 20 Sep 2019 21:08:45 +0200
+Subject: [PATCH] shellDBus: Don't assume devices have a node
+
+Clutter.InputDevice.get_device_node() may return null. Handle that
+case when building the 'AcceleratorActivated' vardict parameter.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/issues/1641
+---
+ js/ui/shellDBus.js | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
+index e750c207f9..fca0b64255 100644
+--- a/js/ui/shellDBus.js
++++ b/js/ui/shellDBus.js
+@@ -151,9 +151,13 @@ var GnomeShell = class {
+         let connection = this._dbusImpl.get_connection();
+         let info = this._dbusImpl.get_info();
+         let params = { 'device-id': GLib.Variant.new('u', device.get_device_id()),
+-                       'device-node': GLib.Variant.new('s', device.get_device_node()),
+                        'timestamp': GLib.Variant.new('u', timestamp),
+                        'action-mode': GLib.Variant.new('u', Main.actionMode) };
++
++        let deviceNode = device.get_device_node();
++        if (deviceNode)
++            params['device-node'] = GLib.Variant.new('s', deviceNode);
++
+         connection.emit_signal(destination,
+                                this._dbusImpl.get_object_path(),
+                                info ? info.name : null,
+-- 
+2.22.0
+

Added: 742.patch
===================================================================
--- 742.patch	                        (rev 0)
+++ 742.patch	2019-09-23 17:47:02 UTC (rev 363273)
@@ -0,0 +1,41 @@
+From 10a9798f79adc379fd8e425254a6b7fe7fa759ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Mon, 23 Sep 2019 13:46:05 +0200
+Subject: [PATCH] shell-util: Handle NULL from meta_window_get_image()
+
+Until commit 506b75fc7f3 we got away with not handling a NULL return
+value, as cairo_surface_destroy() deals with a NULL surface; the same
+isn't true for get_width/get_height, so guard to code in question to
+prevent a crash.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/issues/1678
+---
+ src/shell-util.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/shell-util.c b/src/shell-util.c
+index e94f3c364d..c22dd1c6e5 100644
+--- a/src/shell-util.c
++++ b/src/shell-util.c
+@@ -419,7 +419,7 @@ canvas_draw_cb (ClutterContent *content,
+  * @window_actor: a #MetaWindowActor
+  * @window_rect: a #MetaRectangle
+  *
+- * Returns: (transfer full): a new #ClutterContent
++ * Returns: (transfer full) (nullable): a new #ClutterContent
+  */
+ ClutterContent *
+ shell_util_get_content_for_window_actor (MetaWindowActor *window_actor,
+@@ -439,6 +439,9 @@ shell_util_get_content_for_window_actor (MetaWindowActor *window_actor,
+ 
+   surface = meta_window_actor_get_image (window_actor, &clip);
+ 
++  if (!surface)
++    return NULL;
++
+   content = clutter_canvas_new ();
+   clutter_canvas_set_size (CLUTTER_CANVAS (content),
+                            cairo_image_surface_get_width (surface),
+-- 
+2.22.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-23 16:49:31 UTC (rev 363272)
+++ PKGBUILD	2019-09-23 17:47:02 UTC (rev 363273)
@@ -3,7 +3,7 @@
 # Contributor: Flamelab <panosfilip at gmail.com
 
 pkgname=gnome-shell
-pkgver=3.34.0+148+g506b75fc7
+pkgver=3.34.0+152+g0fdbde910
 pkgrel=1
 epoch=1
 pkgdesc="Next generation desktop shell"
@@ -19,11 +19,14 @@
             'evolution-data-server: Evolution calendar integration')
 groups=(gnome)
 install=gnome-shell.install
-_commit=506b75fc7f3a1beeee6141ccb8edb6731c45cc6a  # master
+_commit=0fdbde9101ee5bfe87344cbb2ee43dad32a7f7a6  # master
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
+        739.patch 742.patch)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            '26c2e9672833e09ff63e314f477897bf67c89fd9769c6b4b73d7300b16afd932'
+            'fdf3252bd8a6b1ea882c3de177bc58cbfcaa29b03c0cf00aca67e1f3d97883a4')
 
 pkgver() {
   cd $pkgname
@@ -33,6 +36,12 @@
 prepare() {
   cd $pkgname
 
+  # https://gitlab.gnome.org/GNOME/gnome-shell/issues/1641
+  git apply -3 ../739.patch
+
+  # https://gitlab.gnome.org/GNOME/gnome-shell/issues/1678
+  git apply -3 ../742.patch
+
   git submodule init
   git config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control"
   git submodule update