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

[Jan Steffens]

    Date: Tuesday, April 7, 2020 @ 09:46:38
  Author: heftig
Revision: 379742

3.24.17+18+gcdd4349bfe-1

Modified:
  gtk3/trunk/1638.patch
  gtk3/trunk/PKGBUILD

------------+
 1638.patch |   31 +++++++++++++------------------
 PKGBUILD   |    6 +++---
 2 files changed, 16 insertions(+), 21 deletions(-)

Modified: 1638.patch
===================================================================
--- 1638.patch	2020-04-07 09:43:53 UTC (rev 379741)
+++ 1638.patch	2020-04-07 09:46:38 UTC (rev 379742)
@@ -1,4 +1,4 @@
-From f7811616819040acc66dddd1762101d8ad87a2fa Mon Sep 17 00:00:00 2001
+From c5d9c8be2bda087ce33b36f46971dfb77f976827 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
 Date: Mon, 6 Apr 2020 14:20:43 +0200
 Subject: [PATCH] wayland: Always store unconfigured size
@@ -6,15 +6,21 @@
 This means it'll always be as up to date GdkWindow::width/height. We
 still skip the resize for non-configured windows though, to avoid
 mapping with the wrong size.
+
+The commit f06ee688fe86ec8e1db1c515a7bf2ccc8decc310 also accidentally
+removed the unconfigured size setting completely, so this essentially
+adds it back, but always sets it.
+
+Closes: https://gitlab.gnome.org/GNOME/gtk/-/issues/2582
 ---
- gdk/wayland/gdkwindow-wayland.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
+ gdk/wayland/gdkwindow-wayland.c | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
-index 6c555443bd..05a673eb61 100644
+index f6acc74366..30d4353826 100644
 --- a/gdk/wayland/gdkwindow-wayland.c
 +++ b/gdk/wayland/gdkwindow-wayland.c
-@@ -1145,16 +1145,12 @@ gdk_wayland_window_maybe_configure (GdkWindow *window,
+@@ -1156,6 +1156,8 @@ gdk_wayland_window_maybe_configure (GdkWindow *window,
    gboolean is_xdg_popup;
    gboolean is_visible;
  
@@ -21,19 +27,8 @@
 +  impl->unconfigured_width = calculate_width_without_margin (window, width);
 +  impl->unconfigured_height = calculate_height_without_margin (window, height);
  
-   if (needs_initial_configure (window) &&
-       !impl->initial_configure_received)
--    {
--      impl->unconfigured_width = calculate_width_without_margin (window,
--                                                                 width);
--      impl->unconfigured_height = calculate_height_without_margin (window,
--                                                                   height);
--      return;
--    }
-+    return;
- 
-   if (window->width == width &&
-       window->height == height &&
+   if (should_inhibit_resize (window))
+     return;
 -- 
 2.24.1
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-07 09:43:53 UTC (rev 379741)
+++ PKGBUILD	2020-04-07 09:46:38 UTC (rev 379742)
@@ -3,7 +3,7 @@
 
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.24.17+15+gdc79e07228
+pkgver=3.24.17+18+gcdd4349bfe
 pkgrel=1
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
@@ -15,7 +15,7 @@
          cantarell-fonts colord rest libcups libcanberra fribidi iso-codes)
 makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
 license=(LGPL)
-_commit=dc79e07228800dafa1062c959c68afcc7b4a1bef  # gtk-3-24
+_commit=cdd4349bfed91cbc69b5f4b5e620f98b14247897  # gtk-3-24
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
         1638.patch
         settings.ini
@@ -23,7 +23,7 @@
         gtk-update-icon-cache.hook
         gtk-update-icon-cache.script)
 sha256sums=('SKIP'
-            '45be674b2596b16d5778a85a51a31b59b3e3a198daaea34eec4400e4cdb9bd4e'
+            '10ebcb8ec56c12e8f413c6af0c585877bca6b6530791c0c23698967a932c8e58'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
             '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'