[arch-commits] Commit in gnome-shell/repos (4 files)
Jan Steffens
heftig at archlinux.org
Wed Oct 16 11:01:27 UTC 2019
Date: Wednesday, October 16, 2019 @ 11:01:27
Author: heftig
Revision: 365072
archrelease: copy trunk to testing-x86_64
Added:
gnome-shell/repos/testing-x86_64/
gnome-shell/repos/testing-x86_64/739.patch
(from rev 365071, gnome-shell/trunk/739.patch)
gnome-shell/repos/testing-x86_64/PKGBUILD
(from rev 365071, gnome-shell/trunk/PKGBUILD)
gnome-shell/repos/testing-x86_64/gnome-shell.install
(from rev 365071, gnome-shell/trunk/gnome-shell.install)
---------------------+
739.patch | 35 +++++++++++++++++++++++++++++++
PKGBUILD | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
gnome-shell.install | 7 ++++++
3 files changed, 98 insertions(+)
Copied: gnome-shell/repos/testing-x86_64/739.patch (from rev 365071, gnome-shell/trunk/739.patch)
===================================================================
--- testing-x86_64/739.patch (rev 0)
+++ testing-x86_64/739.patch 2019-10-16 11:01:27 UTC (rev 365072)
@@ -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
+
Copied: gnome-shell/repos/testing-x86_64/PKGBUILD (from rev 365071, gnome-shell/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2019-10-16 11:01:27 UTC (rev 365072)
@@ -0,0 +1,56 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.34.1+3+g6c2a82258
+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=6c2a82258e839c31944549ee4a45acccdbb6931b # 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/testing-x86_64/gnome-shell.install (from rev 365071, gnome-shell/trunk/gnome-shell.install)
===================================================================
--- testing-x86_64/gnome-shell.install (rev 0)
+++ testing-x86_64/gnome-shell.install 2019-10-16 11:01:27 UTC (rev 365072)
@@ -0,0 +1,7 @@
+post_install() {
+ setcap cap_sys_nice+ep usr/bin/gnome-shell
+}
+
+post_upgrade() {
+ post_install
+}
More information about the arch-commits
mailing list