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

[Jan Steffens]

    Date: Wednesday, March 11, 2020 @ 09:36:37
  Author: heftig
Revision: 377355

3.36.0-3: more FS#65771

Added:
  gnome-shell/trunk/1080.patch
Modified:
  gnome-shell/trunk/PKGBUILD

------------+
 1080.patch |   27 +++++++++++++++++++++++++++
 PKGBUILD   |   13 +++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

Added: 1080.patch
===================================================================
--- 1080.patch	                        (rev 0)
+++ 1080.patch	2020-03-11 09:36:37 UTC (rev 377355)
@@ -0,0 +1,27 @@
+From 08c0d5059d6549833a19a4465fbe04146b47112e Mon Sep 17 00:00:00 2001
+From: Alynx Zhou <alynx.zhou at gmail.com>
+Date: Mon, 9 Mar 2020 10:09:47 +0800
+Subject: [PATCH] ibusManager: fix ibus launch error because of wrong method
+ name
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1080
+---
+ js/misc/ibusManager.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
+index aa1f510602..e27e9f06dd 100644
+--- a/js/misc/ibusManager.js
++++ b/js/misc/ibusManager.js
+@@ -66,7 +66,7 @@ var IBusManager = class {
+             let display = GLib.getenv('GNOME_SETUP_DISPLAY');
+             if (display)
+                 launcher.setenv('DISPLAY', display, true);
+-            launcher.launch(cmdLine);
++            launcher.spawnv(cmdLine);
+         } catch (e) {
+             log(`Failed to launch ibus-daemon: ${e.message}`);
+         }
+-- 
+2.24.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-11 09:29:12 UTC (rev 377354)
+++ PKGBUILD	2020-03-11 09:36:37 UTC (rev 377355)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-shell
 pkgver=3.36.0
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Next generation desktop shell"
 url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -12,7 +12,7 @@
 license=(GPL2)
 depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gnome-settings-daemon
          gnome-themes-extra gsettings-desktop-schemas libcanberra-pulse libgdm libsecret
-         mutter nm-connection-editor unzip gstreamer ibus gnome-autoar)
+         mutter nm-connection-editor unzip gstreamer libibus gnome-autoar)
 makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson
              sassc asciidoc)
 optdepends=('gnome-control-center: System settings'
@@ -21,9 +21,11 @@
 install=gnome-shell.install
 _commit=4baa091bc54856b191394c70bcedcd3fb4d1a2b5  # tags/3.36.0^0
 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"
+        1080.patch)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            '2e514ec86160c37c22a01803703a5bf656983634bda02b52e8f6e6542099e070')
 
 pkgver() {
   cd $pkgname
@@ -33,6 +35,9 @@
 prepare() {
   cd $pkgname
 
+  # https://bugs.archlinux.org/task/65771
+  git apply -3 ../1080.patch
+
   git submodule init
   git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
   git submodule update