[arch-commits] Commit in gnome-shell/repos/extra-x86_64 (6 files)
Jan Steffens
heftig at archlinux.org
Mon Sep 23 18:12:36 UTC 2019
Date: Monday, September 23, 2019 @ 18:12:36
Author: heftig
Revision: 363278
archrelease: copy trunk to extra-x86_64
Added:
gnome-shell/repos/extra-x86_64/739.patch
(from rev 363275, gnome-shell/trunk/739.patch)
gnome-shell/repos/extra-x86_64/742.patch
(from rev 363275, gnome-shell/trunk/742.patch)
gnome-shell/repos/extra-x86_64/PKGBUILD
(from rev 363275, gnome-shell/trunk/PKGBUILD)
gnome-shell/repos/extra-x86_64/gnome-shell.install
(from rev 363277, gnome-shell/trunk/gnome-shell.install)
Deleted:
gnome-shell/repos/extra-x86_64/PKGBUILD
gnome-shell/repos/extra-x86_64/gnome-shell.install
---------------------+
739.patch | 35 +++++++++++++++
742.patch | 41 ++++++++++++++++++
PKGBUILD | 111 +++++++++++++++++++++++++++-----------------------
gnome-shell.install | 14 +++---
4 files changed, 143 insertions(+), 58 deletions(-)
Copied: gnome-shell/repos/extra-x86_64/739.patch (from rev 363275, gnome-shell/trunk/739.patch)
===================================================================
--- 739.patch (rev 0)
+++ 739.patch 2019-09-23 18:12:36 UTC (rev 363278)
@@ -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/extra-x86_64/742.patch (from rev 363275, gnome-shell/trunk/742.patch)
===================================================================
--- 742.patch (rev 0)
+++ 742.patch 2019-09-23 18:12:36 UTC (rev 363278)
@@ -0,0 +1,41 @@
+From 10a9798f79adc379fd8e425254a6b7fe7fa759ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Mon, 23 Sep 2019 13:46:05 +0200
+Subject: [PATCH] shell-util: Handle NULL from meta_window_get_image()
+
+Until commit 506b75fc7f3 we got away with not handling a NULL return
+value, as cairo_surface_destroy() deals with a NULL surface; the same
+isn't true for get_width/get_height, so guard to code in question to
+prevent a crash.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/issues/1678
+---
+ src/shell-util.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/shell-util.c b/src/shell-util.c
+index e94f3c364d..c22dd1c6e5 100644
+--- a/src/shell-util.c
++++ b/src/shell-util.c
+@@ -419,7 +419,7 @@ canvas_draw_cb (ClutterContent *content,
+ * @window_actor: a #MetaWindowActor
+ * @window_rect: a #MetaRectangle
+ *
+- * Returns: (transfer full): a new #ClutterContent
++ * Returns: (transfer full) (nullable): a new #ClutterContent
+ */
+ ClutterContent *
+ shell_util_get_content_for_window_actor (MetaWindowActor *window_actor,
+@@ -439,6 +439,9 @@ shell_util_get_content_for_window_actor (MetaWindowActor *window_actor,
+
+ surface = meta_window_actor_get_image (window_actor, &clip);
+
++ if (!surface)
++ return NULL;
++
+ content = clutter_canvas_new ();
+ clutter_canvas_set_size (CLUTTER_CANVAS (content),
+ cairo_image_surface_get_width (surface),
+--
+2.22.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-09-23 18:12:33 UTC (rev 363277)
+++ PKGBUILD 2019-09-23 18:12:36 UTC (rev 363278)
@@ -1,51 +0,0 @@
-# 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.0+148+g506b75fc7
-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=506b75fc7f3a1beeee6141ccb8edb6731c45cc6a # master
-source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
- "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
-sha256sums=('SKIP'
- 'SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-
- 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 363275, gnome-shell/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-09-23 18:12:36 UTC (rev 363278)
@@ -0,0 +1,60 @@
+# 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.0+152+g0fdbde910
+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=0fdbde9101ee5bfe87344cbb2ee43dad32a7f7a6 # master
+source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
+ "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
+ 739.patch 742.patch)
+sha256sums=('SKIP'
+ 'SKIP'
+ '26c2e9672833e09ff63e314f477897bf67c89fd9769c6b4b73d7300b16afd932'
+ 'fdf3252bd8a6b1ea882c3de177bc58cbfcaa29b03c0cf00aca67e1f3d97883a4')
+
+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
+
+ # https://gitlab.gnome.org/GNOME/gnome-shell/issues/1678
+ git apply -3 ../742.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-09-23 18:12:33 UTC (rev 363277)
+++ gnome-shell.install 2019-09-23 18:12:36 UTC (rev 363278)
@@ -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 363277, gnome-shell/trunk/gnome-shell.install)
===================================================================
--- gnome-shell.install (rev 0)
+++ gnome-shell.install 2019-09-23 18:12:36 UTC (rev 363278)
@@ -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