Patches update.

- Menu bar fix corrected. Now it does not break submenus in some cases.
- Window background fix removed. It's unneeded now.
- Properly apply upstream patches for transparent window background. Add missing second patch from upstream. Fixes problems in i3wm and
Awesome.

5 files changed, 21 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 467325e20ddb..71321b7fd587 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gtk3-mushrooms
-	pkgdesc = GTK3 patched for classic desktops like MATE/XFCE (see README).
+	pkgdesc = GTK3 patched for classic desktops like XFCE or MATE. Please see README.
 	pkgver = 3.22.30
-	pkgrel = 7
+	pkgrel = 8
 	url = https://github.com/TomaszGasior/gtk3-mushrooms
 	arch = x86_64
 	license = LGPL
@@ -55,7 +55,6 @@ pkgbase = gtk3-mushrooms
 	source = fixes__atk-bridge-errors.patch
 	source = fixes__labels-wrapping.patch
 	source = fixes__too-large-menu-covers-bar.patch
-	source = fixes__window-background.patch
 	source = other__default-settings.patch
 	source = other__hide-insert-emoji.patch
 	source = other__mnemonics-delay.patch
@@ -64,7 +63,8 @@ pkgbase = gtk3-mushrooms
 	source = popovers__places-sidebar.patch
 	source = smaller-adwaita.css
 	source = https://download.gnome.org/sources/gtk+/3.22/gtk+-3.22.30.tar.xz
-	source = upstream_window_background._patch::https://github.com/GNOME/gtk/commit/2ce63a86ba689aa41eb47409c889c469497478b0.patch
+	source = upstream_transparent_window_bg_1._patch::https://github.com/GNOME/gtk/commit/2ce63a86ba689aa41eb47409c889c469497478b0.patch
+	source = upstream_transparent_window_bg_2._patch::https://github.com/GNOME/gtk/commit/01d1bc3c75fd0eff5665f5b9c690c5e1e6c65f13.patch
 	source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=fbcc57e8a97827926b6624bb8bc570f675c7188d
 	source = gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=fbcc57e8a97827926b6624bb8bc570f675c7188d
 	sha256sums = 68b26360764a2ea7e057a2aaa29c6fdfe164b9987866e038d8d0188a025477fb
@@ -80,8 +80,7 @@ pkgbase = gtk3-mushrooms
 	sha256sums = 7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672
 	sha256sums = 99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b
 	sha256sums = 7a604d453beb9c425b8ed4a60b5e9435c3f4ee10438490641c0ade448401306a
-	sha256sums = d4d27ccc5735ee1d2c8483da659ded3a05e9d33b3fe41d8ed77495e9ec38be96
-	sha256sums = ad9e393da9d6f8c6750fff122b2f2b6ba1f6ba99439259ce4b5f3c9bbaca7e41
+	sha256sums = 21b8c90ceec02300affb5b30fecf390531cb76322faaf1dd01e2f1ca239ed729
 	sha256sums = 37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd
 	sha256sums = acd3babd22add981690728e84a89fb8bb332b7ac746e9db7cdb27c47f1ac0042
 	sha256sums = c213812e1fafeb5565f7e329c4501195f04adcfe377b88439a6d51d478edc071
@@ -91,6 +90,7 @@ pkgbase = gtk3-mushrooms
 	sha256sums = cae4474d2ef9b4b56316efe2b53d717188f3ef578d5513d1067ceaff87f2270d
 	sha256sums = a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567
 	sha256sums = ceb95c0952ccd3ded84cd55a2386a33edac91597052b077d12fa4a3cc62a1612
+	sha256sums = 68e3ea59140ee565a146fff2db2d2e2ed99536bbad8ba818bee124325d516e01
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845
 
diff --git a/PKGBUILD b/PKGBUILD
index b1d3dfc9e92f..e3b851e287f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ __arch_pkg_commit="fbcc57e8a97827926b6624bb8bc570f675c7188d"
 
 pkgname=gtk3-mushrooms
 pkgver=3.22.30
-pkgrel=7
-pkgdesc="GTK3 patched for classic desktops like MATE/XFCE (see README)."
+pkgrel=8
+pkgdesc="GTK3 patched for classic desktops like XFCE or MATE. Please see README."
 url="https://github.com/TomaszGasior/gtk3-mushrooms"
 conflicts=(gtk3 gtk3-print-backends)
 provides=(gtk3=$pkgver gtk3-classic=$pkgver gtk3-print-backends)
@@ -45,7 +45,6 @@ source=(
 	"fixes__atk-bridge-errors.patch"
 	"fixes__labels-wrapping.patch"
 	"fixes__too-large-menu-covers-bar.patch"
-	"fixes__window-background.patch"
 	"other__default-settings.patch"
 	"other__hide-insert-emoji.patch"
 	"other__mnemonics-delay.patch"
@@ -60,7 +59,8 @@ source=(
 	"https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz"
 
 	# Temporary. Will be removed with next GTK3 release.
-	"upstream_window_background._patch::https://github.com/GNOME/gtk/commit/2ce63a86ba689aa41eb47409c889c469497478b0.patch"
+	"upstream_transparent_window_bg_1._patch::https://github.com/GNOME/gtk/commit/2ce63a86ba689aa41eb47409c889c469497478b0.patch"
+	"upstream_transparent_window_bg_2._patch::https://github.com/GNOME/gtk/commit/01d1bc3c75fd0eff5665f5b9c690c5e1e6c65f13.patch"
 
 	# Arch Linux package files.
 	"settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=$__arch_pkg_commit"
@@ -80,8 +80,7 @@ sha256sums=(
 	"7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672"
 	"99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b"
 	"7a604d453beb9c425b8ed4a60b5e9435c3f4ee10438490641c0ade448401306a"
-	"d4d27ccc5735ee1d2c8483da659ded3a05e9d33b3fe41d8ed77495e9ec38be96"
-	"ad9e393da9d6f8c6750fff122b2f2b6ba1f6ba99439259ce4b5f3c9bbaca7e41"
+	"21b8c90ceec02300affb5b30fecf390531cb76322faaf1dd01e2f1ca239ed729"
 	"37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd"
 	"acd3babd22add981690728e84a89fb8bb332b7ac746e9db7cdb27c47f1ac0042"
 	"c213812e1fafeb5565f7e329c4501195f04adcfe377b88439a6d51d478edc071"
@@ -91,6 +90,7 @@ sha256sums=(
 	"cae4474d2ef9b4b56316efe2b53d717188f3ef578d5513d1067ceaff87f2270d"
 	"a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567"
 	"ceb95c0952ccd3ded84cd55a2386a33edac91597052b077d12fa4a3cc62a1612"
+	"68e3ea59140ee565a146fff2db2d2e2ed99536bbad8ba818bee124325d516e01"
 	"01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202"
 	"de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845"
 )
@@ -143,8 +143,9 @@ prepare()
 	# Apply patches to GTK code.
 	__patch_gtk_code
 
-	# Temporary patch. Will be removed with next GTK3 release.
-	patch -p 1 -i "$srcdir/upstream_window_background._patch"
+	# Temporary. Will be removed with next GTK3 release.
+	patch -p 1 -i "$srcdir/upstream_transparent_window_bg_1._patch"
+	patch -p 1 -i "$srcdir/upstream_transparent_window_bg_2._patch"
 
 	NOCONFIGURE=1 ./autogen.sh
 }
diff --git a/README.md b/README.md
index 86dcb0a599bb..bff148431e3b 100644
--- a/README.md
+++ b/README.md
@@ -51,5 +51,4 @@ Fixes
 
 * Menu bars are not covered by too high popup menus. See https://gitlab.gnome.org/GNOME/gtk/issues/1016.
 * Labels are wrapped similarly to GTK2. This patch fixes too wide windows in applications improperly ported from GTK2.
-* Errors in console output because of integration with Accessibility Toolkit are hidden. See https://unix.stackexchange.com/questions/230238.
-* Window background is set to theme background, only on Xorg when window manager doesn't support client side shadows. This patch fixes bug in i3 and Awesome window managers. See https://github.com/i3/i3/issues/3297.
\ No newline at end of file
+* Errors in console output because of integration with Accessibility Toolkit are hidden. See https://unix.stackexchange.com/questions/230238.
\ No newline at end of file
diff --git a/fixes__too-large-menu-covers-bar.patch b/fixes__too-large-menu-covers-bar.patch
index 5e1cd4d91771..0105688aa36d 100644
--- a/fixes__too-large-menu-covers-bar.patch
+++ b/fixes__too-large-menu-covers-bar.patch
@@ -1,13 +1,14 @@
 diff --color -U 5 -r -Z -B ./org/gtk/gtkmenu.c ./mod/gtk/gtkmenu.c
---- ./org/gtk/gtkmenu.c	2017-10-02 18:00:49.000000000 +0200
-+++ ./mod/gtk/gtkmenu.c	2018-01-21 12:47:04.050097042 +0100
-@@ -1393,10 +1393,16 @@
+--- ./org/gtk/gtkmenu.c	2018-01-31 18:37:18.000000000 +0100
++++ ./mod/gtk/gtkmenu.c	2018-07-16 23:43:51.061469725 +0200
+@@ -1393,10 +1393,17 @@
                    const GdkRectangle *final_rect,
                    gboolean            flipped_x,
                    gboolean            flipped_y,
                    GtkMenu            *menu)
  {
-+  if (GTK_IS_MENU_ITEM (menu->priv->widget) && !flipped_y && flipped_rect->y > final_rect->y)
++  if (GTK_IS_MENU_ITEM (menu->priv->widget) && GTK_IS_MENU_BAR (gtk_widget_get_parent (menu->priv->widget))
++      && flipped_rect != NULL && final_rect != NULL && !flipped_y && flipped_rect->y > final_rect->y)
 +    {
 +      gint new_height = final_rect->height - (flipped_rect->y - final_rect->y);
 +      if (new_height > 200)
diff --git a/fixes__window-background.patch b/fixes__window-background.patch
deleted file mode 100644
index 4ccb52c4d1dc..000000000000
--- a/fixes__window-background.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --color -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2018-01-15 14:21:38.000000000 +0100
-+++ ./mod/gtk/gtkwindow.c	2018-06-01 23:18:47.828882837 +0200
-@@ -7435,10 +7435,15 @@
-     }
- 
-   gtk_widget_set_window (widget, gdk_window);
-   gtk_widget_register_window (widget, gdk_window);
-   gtk_widget_set_realized (widget, TRUE);
-+#ifdef GDK_WINDOWING_X11
-+  if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget)) && !gtk_widget_get_app_paintable (widget) &&
-+      !gdk_x11_screen_supports_net_wm_hint (priv->screen, gdk_atom_intern_static_string ("_GTK_FRAME_EXTENTS")))
-+    gtk_style_context_set_background (gtk_widget_get_style_context (widget), gdk_window);
-+#endif
- 
-   attributes.x = allocation.x;
-   attributes.y = allocation.y;
-   attributes.width = allocation.width;
-   attributes.height = allocation.height;