Date: Friday, November 8, 2019 @ 23:42:28 Author: heftig Revision: 367230
archrelease: copy trunk to extra-x86_64 Added: gnome-shell/repos/extra-x86_64/739.patch (from rev 367229, gnome-shell/trunk/739.patch) gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 367229, gnome-shell/trunk/PKGBUILD) gnome-shell/repos/extra-x86_64/gnome-shell.install (from rev 367229, gnome-shell/trunk/gnome-shell.install) Deleted: gnome-shell/repos/extra-x86_64/739.patch gnome-shell/repos/extra-x86_64/PKGBUILD gnome-shell/repos/extra-x86_64/gnome-shell.install ---------------------+ 739.patch | 70 +++++++++++++++---------------- PKGBUILD | 112 +++++++++++++++++++++++++------------------------- gnome-shell.install | 14 +++--- 3 files changed, 98 insertions(+), 98 deletions(-) Deleted: 739.patch =================================================================== --- 739.patch 2019-11-08 23:25:17 UTC (rev 367229) +++ 739.patch 2019-11-08 23:42:28 UTC (rev 367230) @@ -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 - Copied: gnome-shell/repos/extra-x86_64/739.patch (from rev 367229, gnome-shell/trunk/739.patch) =================================================================== --- 739.patch (rev 0) +++ 739.patch 2019-11-08 23:42:28 UTC (rev 367230) @@ -0,0 +1,35 @@ +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 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-11-08 23:25:17 UTC (rev 367229) +++ PKGBUILD 2019-11-08 23:42:28 UTC (rev 367230) @@ -1,56 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Flamelab <panosfi...@gmail.com - -pkgname=gnome-shell -pkgver=3.34.1+7+g750c5acd3 -pkgrel=1 -epoch=1 -pkgdesc="Next generation desktop shell" -url="https://wiki.gnome.org/Projects/GnomeShell" -arch=(x86_64) -license=(GPL2) -depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gnome-settings-daemon - gnome-themes-extra gsettings-desktop-schemas libcanberra-pulse libcroco libgdm libsecret - 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' - 'evolution-data-server: Evolution calendar integration') -groups=(gnome) -install=gnome-shell.install -_commit=750c5acd30ef724b2398bb9d9178a130b58e046b # gnome-3-34 -source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit" - "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git" - 739.patch) -sha256sums=('SKIP' - 'SKIP' - '26c2e9672833e09ff63e314f477897bf67c89fd9769c6b4b73d7300b16afd932') - -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - -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 -} - -build() { - arch-meson $pkgname build -D gtk_doc=true - ninja -C build -} - -package() { - DESTDIR="$pkgdir" meson install -C build - - # https://bugs.archlinux.org/task/37412 - mkdir "$pkgdir/usr/share/gnome-shell/modes" -} Copied: gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 367229, gnome-shell/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-11-08 23:42:28 UTC (rev 367230) @@ -0,0 +1,56 @@ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Flamelab <panosfi...@gmail.com + +pkgname=gnome-shell +pkgver=3.34.1+12+ga43c22e3a +pkgrel=1 +epoch=1 +pkgdesc="Next generation desktop shell" +url="https://wiki.gnome.org/Projects/GnomeShell" +arch=(x86_64) +license=(GPL2) +depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gnome-settings-daemon + gnome-themes-extra gsettings-desktop-schemas libcanberra-pulse libcroco libgdm libsecret + 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' + 'evolution-data-server: Evolution calendar integration') +groups=(gnome) +install=gnome-shell.install +_commit=a43c22e3af01782cdb960c05f48d4bb8c2d63e3f # gnome-3-34 +source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit" + "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git" + 739.patch) +sha256sums=('SKIP' + 'SKIP' + '26c2e9672833e09ff63e314f477897bf67c89fd9769c6b4b73d7300b16afd932') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +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 +} + +build() { + arch-meson $pkgname build -D gtk_doc=true + ninja -C build +} + +package() { + DESTDIR="$pkgdir" meson install -C build + + # https://bugs.archlinux.org/task/37412 + mkdir "$pkgdir/usr/share/gnome-shell/modes" +} Deleted: gnome-shell.install =================================================================== --- gnome-shell.install 2019-11-08 23:25:17 UTC (rev 367229) +++ gnome-shell.install 2019-11-08 23:42:28 UTC (rev 367230) @@ -1,7 +0,0 @@ -post_install() { - setcap cap_sys_nice+ep usr/bin/gnome-shell -} - -post_upgrade() { - post_install -} Copied: gnome-shell/repos/extra-x86_64/gnome-shell.install (from rev 367229, gnome-shell/trunk/gnome-shell.install) =================================================================== --- gnome-shell.install (rev 0) +++ gnome-shell.install 2019-11-08 23:42:28 UTC (rev 367230) @@ -0,0 +1,7 @@ +post_install() { + setcap cap_sys_nice+ep usr/bin/gnome-shell +} + +post_upgrade() { + post_install +}