3.24.17+4+g8c97702a07-2

4 files changed, 124 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ffefd5dd4d4..b49fb9df63b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gtk3-patched-filechooser-icon-view
 	pkgdesc = GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch.
-	pkgver = 3.24.17
+	pkgver = 3.24.17+4+g8c97702a07
 	pkgrel = 2
 	epoch = 1
 	url = https://github.com/Dudemanguy911/gtk
@@ -44,7 +44,7 @@ pkgbase = gtk3-patched-filechooser-icon-view
 	depends = iso-codes
 	depends = gtk-update-icon-cache
 	optdepends = glib2-patched-thumbnailer: Thumbnail generation in upload dialog
-	provides = gtk3=3.24.17
+	provides = gtk3=3.24.17+4+g8c97702a07
 	provides = gtk3-print-backends
 	provides = libgtk-3.so
 	provides = libgdk-3.so
@@ -52,11 +52,15 @@ pkgbase = gtk3-patched-filechooser-icon-view
 	conflicts = gtk3
 	conflicts = gtk3-print-backends
 	replaces = gtk3-print-backends<=3.22.26-1
-	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=4480c0ffc6858f8a324f841a318a6ed4b57dd629
+	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=8c97702a0771ccb186088ea04478dfc8c6616fe4
+	source = 1633.patch
+	source = 1634.patch
 	source = settings.ini
 	source = gtk-query-immodules-3.0.hook
 	source = gtk3-filechooser-icon-view.patch
 	sha256sums = SKIP
+	sha256sums = 7b7141c53de03d0bd6c73287b27c75e39a8eede1853037f52183c4648805255d
+	sha256sums = 59f5304bdbeff82fd08e43d1c19afc4c5b65703c36a243909b92681ae1519020
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229
 	sha256sums = 1e7758171795a524fac8e7220762c28a3aa146a15b7b9c9f953891bbbcdb9ae8
diff --git a/1633.patch b/1633.patch
new file mode 100644
index 000000000000..dc2848e45a55
--- /dev/null
+++ b/1633.patch
@@ -0,0 +1,57 @@
+From 12fc9a45efcbb546eb7de13c5c4d3183f2f5a3b8 Mon Sep 17 00:00:00 2001
+From: William Wold <wm@wmww.sh>
+Date: Sun, 5 Apr 2020 05:26:24 -0400
+Subject: [PATCH 1/2] Do not require an initial configure for custom Wayland
+ surfaces
+
+There is no way for custom Wayland surfaces to get configure events, so an
+initial configure event should not be required to resize a custom surface.
+
+Fixes #2578.
+---
+ 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 eba8361b21..5f39c5771c 100644
+--- a/gdk/wayland/gdkwindow-wayland.c
++++ b/gdk/wayland/gdkwindow-wayland.c
+@@ -1087,6 +1087,8 @@ needs_initial_configure (GdkWindow *window)
+ 
+   if (impl->display_server.wl_subsurface)
+     return FALSE;
++  else if (impl->use_custom_surface)
++    return FALSE;
+   else if (is_realized_toplevel (window))
+     return TRUE;
+   else if (is_realized_popup (window))
+-- 
+2.24.1
+
+
+From 5a52af20cba76474e631b2a7548963bcad22d66d Mon Sep 17 00:00:00 2001
+From: William Wold <wm@wmww.sh>
+Date: Sun, 5 Apr 2020 07:11:45 -0400
+Subject: [PATCH 2/2] Do not require an initial configure for DnD windows
+
+Fixes #2075
+---
+ 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 5f39c5771c..04506508f3 100644
+--- a/gdk/wayland/gdkwindow-wayland.c
++++ b/gdk/wayland/gdkwindow-wayland.c
+@@ -1089,6 +1089,8 @@ needs_initial_configure (GdkWindow *window)
+     return FALSE;
+   else if (impl->use_custom_surface)
+     return FALSE;
++  else if (impl->hint == GDK_WINDOW_TYPE_HINT_DND)
++    return FALSE;
+   else if (is_realized_toplevel (window))
+     return TRUE;
+   else if (is_realized_popup (window))
+-- 
+2.24.1
+
diff --git a/1634.patch b/1634.patch
new file mode 100644
index 000000000000..946ec7df839d
--- /dev/null
+++ b/1634.patch
@@ -0,0 +1,43 @@
+From 79732da1ed8cb167440fb047c72cfc0d888a187b Mon Sep 17 00:00:00 2001
+From: Jonas Witschel <diabonas@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
+
diff --git a/PKGBUILD b/PKGBUILD
index c13ba00d55d0..2535321d79fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3-patched-filechooser-icon-view
-pkgver=3.24.17
+pkgver=3.24.17+4+g8c97702a07
 pkgrel=2
 epoch=1
 pkgdesc="GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch."
@@ -22,13 +22,16 @@ makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
 
 license=(LGPL)
 install=gtk3.install
-_commit=4480c0ffc6858f8a324f841a318a6ed4b57dd629  # tags/3.24.17^0
+_commit=8c97702a0771ccb186088ea04478dfc8c6616fe4  # gtk-3-24
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+        1633.patch 1634.patch
         settings.ini
         gtk-query-immodules-3.0.hook
         gtk3-filechooser-icon-view.patch)        
 
 sha256sums=('SKIP'
+            '7b7141c53de03d0bd6c73287b27c75e39a8eede1853037f52183c4648805255d'
+            '59f5304bdbeff82fd08e43d1c19afc4c5b65703c36a243909b92681ae1519020'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
             '1e7758171795a524fac8e7220762c28a3aa146a15b7b9c9f953891bbbcdb9ae8')
@@ -42,6 +45,18 @@ prepare() {
 
   # apply icon-view patch
   patch -Np1 -i ../gtk3-filechooser-icon-view.patch
+
+  # https://bugs.archlinux.org/task/66106
+  # 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
 }
 
 build() {