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

[Jan Steffens]

    Date: Sunday, March 15, 2020 @ 02:23:46
  Author: heftig
Revision: 377548

3.36.0+35+gd9a75412c-1

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

------------+
 1080.patch |   27 ---------------------------
 PKGBUILD   |   15 +++++----------
 2 files changed, 5 insertions(+), 37 deletions(-)

Deleted: 1080.patch
===================================================================
--- 1080.patch	2020-03-15 02:18:11 UTC (rev 377547)
+++ 1080.patch	2020-03-15 02:23:46 UTC (rev 377548)
@@ -1,27 +0,0 @@
-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-15 02:18:11 UTC (rev 377547)
+++ PKGBUILD	2020-03-15 02:23:46 UTC (rev 377548)
@@ -3,8 +3,8 @@
 # Contributor: Flamelab <panosfilip at gmail.com
 
 pkgname=gnome-shell
-pkgver=3.36.0
-pkgrel=3
+pkgver=3.36.0+35+gd9a75412c
+pkgrel=1
 epoch=1
 pkgdesc="Next generation desktop shell"
 url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -19,13 +19,11 @@
             'evolution-data-server: Evolution calendar integration')
 groups=(gnome)
 install=gnome-shell.install
-_commit=4baa091bc54856b191394c70bcedcd3fb4d1a2b5  # tags/3.36.0^0
+_commit=d9a75412c3e843890588a1e794f3014ee65e5619  # master
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-        1080.patch)
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
 sha256sums=('SKIP'
-            'SKIP'
-            '2e514ec86160c37c22a01803703a5bf656983634bda02b52e8f6e6542099e070')
+            'SKIP')
 
 pkgver() {
   cd $pkgname
@@ -35,9 +33,6 @@
 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