Date: Thursday, December 12, 2019 @ 21:12:53 Author: heftig Revision: 371326
3.34.2-1 Modified: gnome-shell/trunk/PKGBUILD Deleted: gnome-shell/trunk/739.patch -----------+ 739.patch | 35 ----------------------------------- PKGBUILD | 16 ++++------------ 2 files changed, 4 insertions(+), 47 deletions(-) Deleted: 739.patch =================================================================== --- 739.patch 2019-12-12 21:11:20 UTC (rev 371325) +++ 739.patch 2019-12-12 21:12:53 UTC (rev 371326) @@ -1,35 +0,0 @@ -From 4411d9db6ee6112f987fac8469a2cc617f4f9b6c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuell...@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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-12 21:11:20 UTC (rev 371325) +++ PKGBUILD 2019-12-12 21:12:53 UTC (rev 371326) @@ -3,7 +3,7 @@ # Contributor: Flamelab <panosfi...@gmail.com pkgname=gnome-shell -pkgver=3.34.1+56+gbb24df2f9 +pkgver=3.34.2 pkgrel=1 epoch=1 pkgdesc="Next generation desktop shell" @@ -19,13 +19,11 @@ 'evolution-data-server: Evolution calendar integration') groups=(gnome) install=gnome-shell.install -_commit=bb24df2f9d3693dd39dbc573b880cecdbd283705 # gnome-3-34 +_commit=9f7b1bd677584cab84ec6a1f925087c4a04b4ddf # tags/3.34.2^0 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit" - "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git" - 739.patch) + "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git") sha256sums=('SKIP' - 'SKIP' - '26c2e9672833e09ff63e314f477897bf67c89fd9769c6b4b73d7300b16afd932') + 'SKIP') pkgver() { cd $pkgname @@ -35,9 +33,6 @@ prepare() { cd $pkgname - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/1641 - git apply -3 ../739.patch - git submodule init git config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control" git submodule update @@ -50,7 +45,4 @@ package() { DESTDIR="$pkgdir" meson install -C build - - # https://bugs.archlinux.org/task/37412 - mkdir "$pkgdir/usr/share/gnome-shell/modes" }