[arch-commits] Commit in gtk3/trunk (1634.patch PKGBUILD)

[Jan Steffens]

    Date: Sunday, April 5, 2020 @ 18:58:38
  Author: heftig
Revision: 379591

3.24.17+4+g8c97702a07-2: FS#66106: Add another patch

Added:
  gtk3/trunk/1634.patch
Modified:
  gtk3/trunk/PKGBUILD

------------+
 1634.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD   |    9 +++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

Added: 1634.patch
===================================================================
--- 1634.patch	                        (rev 0)
+++ 1634.patch	2020-04-05 18:58:38 UTC (rev 379591)
@@ -0,0 +1,43 @@
+From 79732da1ed8cb167440fb047c72cfc0d888a187b Mon Sep 17 00:00:00 2001
+From: Jonas Witschel <diabonas at archlinux.org>
+Date: Sun, 5 Apr 2020 20:16:52 +0200
+Subject: [PATCH] wayland: don't call gdk_wayland_window_configure without
+ valid size
+
+Commit 7f12dc2b66bba15b2e1c0ca077fa4ae58962ec0f ("wayland: Postpone
+window resize requests until configured") runs
+gdk_wayland_window_configure unconditionally even if no valid size is
+set. This breaks GtkDialogs, which are not shown any more, and results
+in warnings like
+
+gtk_widget_size_allocate(): attempt to allocate widget with width -3 and
+height -3
+
+Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/2574
+---
+ gdk/wayland/gdkwindow-wayland.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
+index eba8361b21..2d3e31906e 100644
+--- a/gdk/wayland/gdkwindow-wayland.c
++++ b/gdk/wayland/gdkwindow-wayland.c
+@@ -1635,10 +1635,11 @@ gdk_wayland_window_handle_configure (GdkWindow *window,
+     }
+   else
+     {
+-      gdk_wayland_window_configure (window,
+-                                    impl->unconfigured_width,
+-                                    impl->unconfigured_height,
+-                                    impl->scale);
++      if (impl->unconfigured_width > 0 && impl->unconfigured_height > 0)
++        gdk_wayland_window_configure (window,
++                                      impl->unconfigured_width,
++                                      impl->unconfigured_height,
++                                      impl->scale);
+     }
+ 
+   if (fixed_size)
+-- 
+2.24.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-05 18:51:52 UTC (rev 379590)
+++ PKGBUILD	2020-04-05 18:58:38 UTC (rev 379591)
@@ -4,7 +4,7 @@
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
 pkgver=3.24.17+4+g8c97702a07
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(x86_64)
@@ -17,7 +17,7 @@
 license=(LGPL)
 _commit=8c97702a0771ccb186088ea04478dfc8c6616fe4  # gtk-3-24
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
-        1633.patch
+        1633.patch 1634.patch
         settings.ini
         gtk-query-immodules-3.0.hook
         gtk-update-icon-cache.hook
@@ -24,6 +24,7 @@
         gtk-update-icon-cache.script)
 sha256sums=('SKIP'
             '7b7141c53de03d0bd6c73287b27c75e39a8eede1853037f52183c4648805255d'
+            '59f5304bdbeff82fd08e43d1c19afc4c5b65703c36a243909b92681ae1519020'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
             '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
@@ -41,6 +42,10 @@
   # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1633
   git apply -3 ../1633.patch
 
+  # https://bugs.archlinux.org/task/66106
+  # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1634
+  git apply -3 ../1634.patch
+
   # https://bugs.archlinux.org/task/66119
   # https://gitlab.gnome.org/GNOME/gtk/-/issues/2576
   # no patch yet