Date: Saturday, September 28, 2019 @ 13:35:04 Author: heftig Revision: 363500
3.34.0+157+g2dbdf792d-1 Modified: gnome-shell/trunk/PKGBUILD Deleted: gnome-shell/trunk/742.patch -----------+ 742.patch | 41 ----------------------------------------- PKGBUILD | 12 ++++-------- 2 files changed, 4 insertions(+), 49 deletions(-) Deleted: 742.patch =================================================================== --- 742.patch 2019-09-28 13:32:19 UTC (rev 363499) +++ 742.patch 2019-09-28 13:35:04 UTC (rev 363500) @@ -1,41 +0,0 @@ -From 10a9798f79adc379fd8e425254a6b7fe7fa759ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= <[email protected]> -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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-09-28 13:32:19 UTC (rev 363499) +++ PKGBUILD 2019-09-28 13:35:04 UTC (rev 363500) @@ -3,7 +3,7 @@ # Contributor: Flamelab <[email protected] pkgname=gnome-shell -pkgver=3.34.0+152+g0fdbde910 +pkgver=3.34.0+157+g2dbdf792d pkgrel=1 epoch=1 pkgdesc="Next generation desktop shell" @@ -19,14 +19,13 @@ 'evolution-data-server: Evolution calendar integration') groups=(gnome) install=gnome-shell.install -_commit=0fdbde9101ee5bfe87344cbb2ee43dad32a7f7a6 # master +_commit=2dbdf792db061a2935eb8649fddbb27af6a19da6 # 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) + 739.patch) sha256sums=('SKIP' 'SKIP' - '26c2e9672833e09ff63e314f477897bf67c89fd9769c6b4b73d7300b16afd932' - 'fdf3252bd8a6b1ea882c3de177bc58cbfcaa29b03c0cf00aca67e1f3d97883a4') + '26c2e9672833e09ff63e314f477897bf67c89fd9769c6b4b73d7300b16afd932') pkgver() { cd $pkgname @@ -39,9 +38,6 @@ # 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
