Update GTK & disable too large menu patch

This commit disables "fixes__too-large-menu-covers-bar" patch. It's incompatible
with recent changes in GTK source code and I won't update it because I don't use
this package anymore. Also, this patch is hacky and unstable so it will be kept
disabled until someone will make it more stable.

5 files changed, 13 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b7b567f04aa..d6fe0e7a8cf2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gtk3-mushrooms
 	pkgdesc = GTK3 patched for classic desktops like XFCE or MATE. Please see README.
-	pkgver = 3.24.5
+	pkgver = 3.24.7
 	pkgrel = 1
 	url = https://github.com/TomaszGasior/gtk3-mushrooms
 	arch = x86_64
@@ -18,6 +18,7 @@ pkgbase = gtk3-mushrooms
 	depends = libxi
 	depends = libepoxy
 	depends = gdk-pixbuf2
+	depends = fribidi
 	depends = libxcomposite
 	depends = libxdamage
 	depends = pango
@@ -36,8 +37,8 @@ pkgbase = gtk3-mushrooms
 	optdepends = libcanberra: sounds events
 	optdepends = adwaita-icon-theme: default icon theme
 	optdepends = cantarell-fonts: default font
-	provides = gtk3=3.24.5
-	provides = gtk3-classic=3.24.5
+	provides = gtk3=3.24.7
+	provides = gtk3-classic=3.24.7
 	provides = gtk3-print-backends
 	conflicts = gtk3
 	conflicts = gtk3-print-backends
@@ -54,8 +55,6 @@ pkgbase = gtk3-mushrooms
 	source = file-chooser__typeahead.patch
 	source = fixes__atk-bridge-errors.patch
 	source = fixes__labels-wrapping.patch
-	source = fixes__too-large-menu-covers-bar.patch
-	source = fixes__xfce-inhibit-errors.patch
 	source = other__default-settings.patch
 	source = other__hide-insert-emoji.patch
 	source = other__mnemonics-delay.patch
@@ -63,9 +62,9 @@ pkgbase = gtk3-mushrooms
 	source = popovers__file-chooser-list.patch
 	source = popovers__places-sidebar.patch
 	source = smaller-adwaita.css
-	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.5.tar.xz
-	source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=c60087d9efa09603917116d34474adb79f400b96
-	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=c60087d9efa09603917116d34474adb79f400b96
+	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.7.tar.xz
+	source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=c6a411f17a7db022a770b0ecf053524b83c52612
+	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=c6a411f17a7db022a770b0ecf053524b83c52612
 	sha256sums = 68b26360764a2ea7e057a2aaa29c6fdfe164b9987866e038d8d0188a025477fb
 	sha256sums = eade303471a5929ccf6cf14ff434deccb0da017d5c4fdce3f5a3ffa117c1c954
 	sha256sums = 86f48054a2df6319d97db14fd17ea15d50b32ea6ba594d83e8faa1596ec657ab
@@ -79,8 +78,6 @@ pkgbase = gtk3-mushrooms
 	sha256sums = 7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672
 	sha256sums = 99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b
 	sha256sums = 7a604d453beb9c425b8ed4a60b5e9435c3f4ee10438490641c0ade448401306a
-	sha256sums = 21b8c90ceec02300affb5b30fecf390531cb76322faaf1dd01e2f1ca239ed729
-	sha256sums = 40ea6615a9f9942e3a9ae52297c9f88a3fbbb70c8da9a559143d649414ab7076
 	sha256sums = 37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd
 	sha256sums = acd3babd22add981690728e84a89fb8bb332b7ac746e9db7cdb27c47f1ac0042
 	sha256sums = c213812e1fafeb5565f7e329c4501195f04adcfe377b88439a6d51d478edc071
@@ -88,7 +85,7 @@ pkgbase = gtk3-mushrooms
 	sha256sums = ef4fed3a364db8eb9c15c9ce0e733035722f168dc88b385df2178fc1168ada54
 	sha256sums = 2de68b575494d0d034accd7cd0ce881f366d5201a48496d8748c43f297836eac
 	sha256sums = ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31
-	sha256sums = 0be5fb0d302bc3de26ab58c32990d895831e2b7c7418d0ffea1206d6a3ddb02f
+	sha256sums = 52121144a2df4babed75eb5f34de130a46420101fde3ae216d3142df8a481520
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845
 
diff --git a/PKGBUILD b/PKGBUILD
index b5d9b6e54e31..e10a930d7ce1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 # This file is based on original PKGBUILD of GTK3 package.
 # https://git.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/gtk3
 
-__arch_pkg_commit="c60087d9efa09603917116d34474adb79f400b96"
+__arch_pkg_commit="c6a411f17a7db022a770b0ecf053524b83c52612"
 
 pkgname=gtk3-mushrooms
-pkgver=3.24.5
+pkgver=3.24.7
 pkgrel=1
 pkgdesc="GTK3 patched for classic desktops like XFCE or MATE. Please see README."
 url="https://github.com/TomaszGasior/gtk3-mushrooms"
@@ -15,7 +15,7 @@ provides=(gtk3=$pkgver gtk3-classic=$pkgver gtk3-print-backends)
 arch=(x86_64)
 license=(LGPL)
 depends=(
-	atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
+	atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 fribidi
 	libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
 	json-glib librsvg wayland-protocols desktop-file-utils mesa gtk-update-icon-cache
 )
@@ -44,8 +44,6 @@ source=(
 	"file-chooser__typeahead.patch"
 	"fixes__atk-bridge-errors.patch"
 	"fixes__labels-wrapping.patch"
-	"fixes__too-large-menu-covers-bar.patch"
-	"fixes__xfce-inhibit-errors.patch"
 	"other__default-settings.patch"
 	"other__hide-insert-emoji.patch"
 	"other__mnemonics-delay.patch"
@@ -77,8 +75,6 @@ sha256sums=(
 	"7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672"
 	"99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b"
 	"7a604d453beb9c425b8ed4a60b5e9435c3f4ee10438490641c0ade448401306a"
-	"21b8c90ceec02300affb5b30fecf390531cb76322faaf1dd01e2f1ca239ed729"
-	"40ea6615a9f9942e3a9ae52297c9f88a3fbbb70c8da9a559143d649414ab7076"
 	"37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd"
 	"acd3babd22add981690728e84a89fb8bb332b7ac746e9db7cdb27c47f1ac0042"
 	"c213812e1fafeb5565f7e329c4501195f04adcfe377b88439a6d51d478edc071"
@@ -86,7 +82,7 @@ sha256sums=(
 	"ef4fed3a364db8eb9c15c9ce0e733035722f168dc88b385df2178fc1168ada54"
 	"2de68b575494d0d034accd7cd0ce881f366d5201a48496d8748c43f297836eac"
 	"ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31"
-	"0be5fb0d302bc3de26ab58c32990d895831e2b7c7418d0ffea1206d6a3ddb02f"
+	"52121144a2df4babed75eb5f34de130a46420101fde3ae216d3142df8a481520"
 	"01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202"
 	"de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845"
 )
diff --git a/README.md b/README.md
index 1e1ee827d2d2..7a5df4d05417 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,6 @@ Other
 Fixes
 ---
 
-* Menu bars are not covered by too high popup menus. See https://gitlab.gnome.org/GNOME/gtk/issues/1016.
+* ~~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 caused by integration with Accessibility Toolkit are hidden. See https://unix.stackexchange.com/questions/230238.
-* Errors in console output about non-existent "inhibit" method in XFCE are hidden. See example on https://bugzilla.redhat.com/show_bug.cgi?id=1515272#c1.
diff --git a/fixes__too-large-menu-covers-bar.patch b/fixes__too-large-menu-covers-bar.disabled-patch
index 0105688aa36d..0105688aa36d 100644
--- a/fixes__too-large-menu-covers-bar.patch
+++ b/fixes__too-large-menu-covers-bar.disabled-patch
diff --git a/fixes__xfce-inhibit-errors.patch b/fixes__xfce-inhibit-errors.patch
deleted file mode 100644
index fc086a97f55a..000000000000
--- a/fixes__xfce-inhibit-errors.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --color -U 5 -r -Z -B ./org/gtk/gtkapplication-dbus.c ./mod/gtk/gtkapplication-dbus.c
---- ./org/gtk/gtkapplication-dbus.c	2018-09-14 05:32:45.000000000 +0200
-+++ ./mod/gtk/gtkapplication-dbus.c	2018-09-22 00:05:37.731044507 +0200
-@@ -644,11 +644,11 @@
-           return cookie;
-         }
- 
-       if (error)
-         {
--          if (!warned)
-+          if (FALSE)
-             {
-               g_warning ("Calling %s.Inhibit failed: %s",
-                          g_dbus_proxy_get_interface_name (dbus->sm_proxy),
-                          error->message);
-               warned = TRUE;