diff --git a/x11-packages/gtk3/0000-no-introspection.patch b/x11-packages/gtk3/0000-no-introspection.patch
deleted file mode 100644
index 373c2bb849..0000000000
--- a/x11-packages/gtk3/0000-no-introspection.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -uNr gtk-3.24.8/autogen.sh gtk-3.24.8.mod/autogen.sh
---- gtk-3.24.8/autogen.sh	2019-04-11 00:12:29.000000000 +0300
-+++ gtk-3.24.8.mod/autogen.sh	2019-05-20 01:01:58.516541976 +0300
-@@ -23,12 +23,6 @@
-         exit 1
- fi
- 
--pkg-config --print-errors gobject-introspection-1.0
--if [ $? != 0 ]; then
--	echo "You probably need to install 'libgirepository1.0-dev'"
--	exit 1
--fi
--
- # README and INSTALL are required by automake, but may be deleted by clean
- # up rules. to get automake to work, simply touch these here, they will be
- # regenerated from their corresponding *.in files by ./configure anyway.
diff --git a/x11-packages/gtk3/0001-no-atk-bridge.patch b/x11-packages/gtk3/0001-no-atk-bridge.patch
index 7f378438a8..6d9fa6b169 100644
--- a/x11-packages/gtk3/0001-no-atk-bridge.patch
+++ b/x11-packages/gtk3/0001-no-atk-bridge.patch
@@ -1,19 +1,3 @@
-diff -uNr gtk-3.22.30/configure.ac gtk-3.22.30.mod/configure.ac
---- gtk-3.22.30/configure.ac	2018-04-16 21:06:02.000000000 +0300
-+++ gtk-3.22.30.mod/configure.ac	2018-06-22 20:55:46.617959590 +0300
-@@ -1393,11 +1393,7 @@
- # Check for Accessibility Toolkit flags
- ########################################
- 
--if test x$enable_x11_backend = xyes; then
--   ATK_PACKAGES="atk atk-bridge-2.0"
--else
--   ATK_PACKAGES="atk"
--fi
-+ATK_PACKAGES="atk"
- 
- PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
- 
 diff -uNr gtk-3.22.30/gtk/a11y/gtkaccessibility.c gtk-3.22.30.mod/gtk/a11y/gtkaccessibility.c
 --- gtk-3.22.30/gtk/a11y/gtkaccessibility.c	2018-04-16 21:06:02.000000000 +0300
 +++ gtk-3.22.30.mod/gtk/a11y/gtkaccessibility.c	2018-06-22 20:55:46.611292924 +0300
diff --git a/x11-packages/gtk3/0002-dont-update-icon-cache.patch b/x11-packages/gtk3/0002-dont-update-icon-cache.patch
index 0f212b457f..554c158681 100644
--- a/x11-packages/gtk3/0002-dont-update-icon-cache.patch
+++ b/x11-packages/gtk3/0002-dont-update-icon-cache.patch
@@ -1,24 +1,11 @@
-diff -uNr gtk-3.22.30/demos/gtk-demo/Makefile.am gtk-3.22.30.mod/demos/gtk-demo/Makefile.am
---- gtk-3.22.30/demos/gtk-demo/Makefile.am	2018-04-16 21:06:02.000000000 +0300
-+++ gtk-3.22.30.mod/demos/gtk-demo/Makefile.am	2018-06-22 20:55:46.621292924 +0300
-@@ -176,7 +176,7 @@
- dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+--- a/meson.build
++++ b/meson.build
+@@ -995,7 +995,7 @@
  
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = true
+ install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
  
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff -uNr gtk-3.22.30/demos/widget-factory/Makefile.am gtk-3.22.30.mod/demos/widget-factory/Makefile.am
---- gtk-3.22.30/demos/widget-factory/Makefile.am	2018-04-16 21:06:02.000000000 +0300
-+++ gtk-3.22.30.mod/demos/widget-factory/Makefile.am	2018-06-22 20:55:46.624626257 +0300
-@@ -47,7 +47,7 @@
- dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
- 
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = true
- 
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
+-if not meson.is_cross_build()
++if false
+   gnome.post_install(
+     glib_compile_schemas: true,
+     gio_querymodules: gio_module_dirs,
diff --git a/x11-packages/gtk3/0005-fix-immodules-linking.patch b/x11-packages/gtk3/0005-fix-immodules-linking.patch
index 38d1a85c5d..3e229a5bb6 100644
--- a/x11-packages/gtk3/0005-fix-immodules-linking.patch
+++ b/x11-packages/gtk3/0005-fix-immodules-linking.patch
@@ -1,17 +1,11 @@
-diff -uNr gtk-3.24.8/modules/input/Makefile.am gtk-3.24.8.mod/modules/input/Makefile.am
---- gtk-3.24.8/modules/input/Makefile.am	2019-04-11 00:12:29.000000000 +0300
-+++ gtk-3.24.8.mod/modules/input/Makefile.am	2019-05-26 21:56:54.467063059 +0300
-@@ -13,10 +13,12 @@
- 	$(INCLUDED_IMMODULE_DEFINE)
- 
- DEPS = \
--	$(top_builddir)/gtk/libgtk-3.la
-+	$(top_builddir)/gtk/libgtk-3.la \
-+	$(top_builddir)/gdk/libgdk-3.la
- 
- LDADDS = \
- 	$(top_builddir)/gtk/libgtk-3.la	\
-+	$(top_builddir)/gdk/libgdk-3.la	\
- 	$(GTK_DEP_LIBS)
- 
- moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules
+--- a/modules/input/meson.build
++++ b/modules/input/meson.build
+@@ -14,7 +14,7 @@
+     shared_module('im-@0@'.format(name),
+                   immod_sources,
+                   c_args: common_cflags + cflags,
+-                  dependencies: [ libgtk_dep ],
++                  dependencies: [ libgtk_dep, libgdk_dep ],
+                   install_dir: immodules_install_dir,
+                   include_directories: [confinc, gtkinc],
+                   install : true,
diff --git a/x11-packages/gtk3/0006-fix-libintl.patch b/x11-packages/gtk3/0006-fix-libintl.patch
new file mode 100644
index 0000000000..0b451a6160
--- /dev/null
+++ b/x11-packages/gtk3/0006-fix-libintl.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -769,7 +769,7 @@
+ # Check for bind_textdomain_codeset, including -lintl if GLib brings it in by
+ # doing the same check as glib. We can't check that by linking to glib because
+ # it might be a subproject and hence not built yet.
+-if cc.has_function('ngettext')
++if true
+   libintl_dep = []
+   cdata.set('HAVE_BIND_TEXTDOMAIN_CODESET', 1)
+ else
diff --git a/x11-packages/gtk3/0006-glib-tools-fix.patch b/x11-packages/gtk3/0006-glib-tools-fix.patch
deleted file mode 100644
index 19d58a1c11..0000000000
--- a/x11-packages/gtk3/0006-glib-tools-fix.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -uNr gtk-3.24.10/gdk/Makefile.am gtk-3.24.10.mod/gdk/Makefile.am
---- gtk-3.24.10/gdk/Makefile.am	2019-07-03 23:25:10.000000000 +0300
-+++ gtk-3.24.10.mod/gdk/Makefile.am	2019-07-23 00:25:53.122144498 +0300
-@@ -434,13 +434,13 @@
- gdkenumtypes.h: stamp-gdkenumtypes.h
- 	@true
- stamp-gdkenumtypes.h: $(gdk_h_sources) gdkenumtypes.h.template
--	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
-+	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gdkenumtypes.h.template \
- 		$(gdk_h_sources) ) >> xgen-geth \
- 	&& (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
- 	&& rm -f xgen-geth \
- 	&& echo timestamp > $(@F)
- gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template
--	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
-+	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gdkenumtypes.c.template \
- 		$(gdk_h_sources) ) > xgen-getc \
- 	&& cp xgen-getc gdkenumtypes.c  \
- 	&& rm -f xgen-getc
-@@ -449,7 +449,7 @@
- # Marshaller generation
- #
- gdkmarshalers.h: gdkmarshalers.list
--	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
-+	$(AM_V_GEN) glib-genmarshal \
- 		--prefix=_gdk_marshal \
- 		--valist-marshallers \
- 		--header \
-@@ -457,7 +457,7 @@
- 	&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
- 	|| ( rm -f gdkmarshalers-h.tmp && exit 1)
- gdkmarshalers.c: gdkmarshalers.list
--	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
-+	$(AM_V_GEN) glib-genmarshal \
- 		--prefix=_gdk_marshal \
- 		--valist-marshallers \
- 		--body \
-diff -uNr gtk-3.24.10/gtk/Makefile.am gtk-3.24.10.mod/gtk/Makefile.am
---- gtk-3.24.10/gtk/Makefile.am	2019-07-03 23:25:10.000000000 +0300
-+++ gtk-3.24.10.mod/gtk/Makefile.am	2019-07-23 00:24:47.805264300 +0300
-@@ -1252,7 +1252,7 @@
- gtkmarshalers.h: stamp-gtkmarshalers.h
- 	@true
- stamp-gtkmarshalers.h: gtkmarshalers.list
--	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
-+	$(AM_V_GEN) glib-genmarshal \
- 		--prefix=_gtk_marshal \
- 		--header \
- 		--valist-marshallers \
-@@ -1262,7 +1262,7 @@
- 	&& echo timestamp > $(@F)
- gtkmarshalers.c: gtkmarshalers.list
- 	$(AM_V_GEN) (echo "#undef G_ENABLE_DEBUG"; \
--	 $(GLIB_GENMARSHAL) \
-+	 glib-genmarshal \
- 	 	--prefix=_gtk_marshal \
- 		--body \
- 		--valist-marshallers $(srcdir)/gtkmarshalers.list) >> xgen-gmlc \
-@@ -1272,13 +1272,13 @@
- gtktypebuiltins.h: stamp-gtktypebuiltins.h
- 	@true
- stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.h.template
--	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
-+	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gtktypebuiltins.h.template \
- 		$(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbh \
- 	&& (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
- 	&& rm -f xgen-gtbh \
- 	&& echo timestamp > $(@F)
- gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.c.template
--	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
-+	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gtktypebuiltins.c.template \
- 		$(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbc \
- 	&& cp xgen-gtbc gtktypebuiltins.c  \
- 	&& rm -f xgen-gtbc
-@@ -1430,13 +1430,13 @@
- gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h
- 	@true
- stamp-gtkprivatetypebuiltins.h: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template
--	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.h.template \
-+	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gtkprivatetypebuiltins.h.template \
- 		$(gtk_private_type_h_sources) ) > xgen-gptbh \
- 	&& (cmp -s xgen-gptbh gtkprivatetypebuiltins.h || cp xgen-gptbh gtkprivatetypebuiltins.h ) \
- 	&& rm -f xgen-gptbh \
- 	&& echo timestamp > $(@F)
- gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.c.template
--	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.c.template \
-+	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gtkprivatetypebuiltins.c.template \
- 		$(gtk_private_type_h_sources) ) > xgen-gptbc \
- 	&& cp xgen-gptbc gtkprivatetypebuiltins.c  \
- 	&& rm -f xgen-gptbc
diff --git a/x11-packages/gtk3/build.sh b/x11-packages/gtk3/build.sh
index 65b606441f..05f8bf5677 100644
--- a/x11-packages/gtk3/build.sh
+++ b/x11-packages/gtk3/build.sh
@@ -2,42 +2,26 @@ TERMUX_PKG_HOMEPAGE=https://www.gtk.org/
 TERMUX_PKG_DESCRIPTION="GObject-based multi-platform GUI toolkit"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=3.24.35
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=3.24.36
 TERMUX_PKG_SRCURL=https://gitlab.gnome.org/GNOME/gtk/-/archive/$TERMUX_PKG_VERSION/gtk-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=8b08020b183729fbc14c959c46124de10e43563334f4811a283ded0e8ba5463e
-TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_DEPENDS="adwaita-icon-theme, atk, coreutils, desktop-file-utils, fontconfig, freetype, fribidi, gdk-pixbuf, glib, glib-bin, gtk-update-icon-cache, harfbuzz, libcairo, libepoxy, libxcomposite, libxcursor, libxdamage, libxfixes, libxi, libxinerama, libxrandr, pango, shared-mime-info, ttf-dejavu"
+TERMUX_PKG_SHA256=8c5c6f56da1a6700662853279ef68602fd24733677cd1bcf346b88318c88a991
+TERMUX_PKG_DEPENDS="adwaita-icon-theme, atk, coreutils, desktop-file-utils, fontconfig, fribidi, gdk-pixbuf, glib, glib-bin, gtk-update-icon-cache, harfbuzz, libcairo, libepoxy, libxcomposite, libxcursor, libxdamage, libxfixes, libxi, libxinerama, libxrandr, pango, shared-mime-info, ttf-dejavu"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, xorgproto"
 TERMUX_PKG_CONFLICTS="libgtk3"
 TERMUX_PKG_REPLACES="libgtk3"
 TERMUX_PKG_DISABLE_GIR=false
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
---enable-introspection
---disable-cups
---enable-xinerama
---enable-xfixes
---enable-xcomposite
---enable-xdamage
---enable-x11-backend
---enable-broadway-backend
---disable-wayland-backend
+-Dx11_backend=true
+-Dwayland_backend=false
+-Dbroadway_backend=true
+-Dxinerama=yes
+-Dprint_backends=file,lpr
+-Dman=true
+-Dintrospection=true
 "
-TERMUX_PKG_RM_AFTER_INSTALL="share/glib-2.0/schemas/gschemas.compiled"
 
 termux_step_pre_configure() {
-	# prevent permission denied on build scripts
-	find . -type f | xargs chmod u+x
-
-	NOCONFIGURE=1 ./autogen.sh
-
 	termux_setup_gir
-
-	export GLIB_COMPILE_RESOURCES=glib-compile-resources
-}
-
-termux_step_post_configure() {
-	touch ./gtk/g-ir-scanner
 }
 
 termux_step_create_debscripts() {
diff --git a/x11-packages/gtk3/gir/3.24.35/Gdk-3.0.xml b/x11-packages/gtk3/gir/3.24.36/Gdk-3.0.xml
similarity index 100%
rename from x11-packages/gtk3/gir/3.24.35/Gdk-3.0.xml
rename to x11-packages/gtk3/gir/3.24.36/Gdk-3.0.xml
diff --git a/x11-packages/gtk3/gir/3.24.35/GdkX11-3.0.xml b/x11-packages/gtk3/gir/3.24.36/GdkX11-3.0.xml
similarity index 100%
rename from x11-packages/gtk3/gir/3.24.35/GdkX11-3.0.xml
rename to x11-packages/gtk3/gir/3.24.36/GdkX11-3.0.xml
diff --git a/x11-packages/gtk3/gir/3.24.35/Gtk-3.0.xml b/x11-packages/gtk3/gir/3.24.36/Gtk-3.0.xml
similarity index 100%
rename from x11-packages/gtk3/gir/3.24.35/Gtk-3.0.xml
rename to x11-packages/gtk3/gir/3.24.36/Gtk-3.0.xml