diff --git a/packages/gobject-introspection/build.sh b/packages/gobject-introspection/build.sh
index b1dbe35939..5298aa0381 100644
--- a/packages/gobject-introspection/build.sh
+++ b/packages/gobject-introspection/build.sh
@@ -2,14 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://gi.readthedocs.io/
 TERMUX_PKG_DESCRIPTION="Uniform machine readable API"
 TERMUX_PKG_LICENSE="LGPL-2.0, GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.78.1"
+TERMUX_PKG_VERSION="1.80.1"
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gobject-introspection/${TERMUX_PKG_VERSION%.*}/gobject-introspection-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4
-TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_SHA256=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
 TERMUX_PKG_DEPENDS="glib, libffi"
 TERMUX_PKG_SUGGESTS="g-ir-scanner"
 TERMUX_PKG_DISABLE_GIR=false
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_DEPS="packaging, wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dcairo_libname=libcairo-gobject.so
 -Dpython=python
diff --git a/packages/gobject-introspection/gir/Bar-1.0.xml b/packages/gobject-introspection/gir/Bar-1.0.xml
new file mode 100644
index 0000000000..ad20711df8
--- /dev/null
+++ b/packages/gobject-introspection/gir/Bar-1.0.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<dump>
+  <class name="BarBaz" get-type="bar_baz_get_type" parents="GObject">
+  </class>
+  <class name="MutterWindow" get-type="mutter_window_get_type" parents="GObject">
+  </class>
+</dump>
diff --git a/packages/gobject-introspection/gir/Everything-1.0.xml b/packages/gobject-introspection/gir/Everything-1.0.xml
new file mode 100644
index 0000000000..87ec2e1574
--- /dev/null
+++ b/packages/gobject-introspection/gir/Everything-1.0.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<dump>
+</dump>
diff --git a/packages/gobject-introspection/gir/GIMarshallingTests-1.0.xml b/packages/gobject-introspection/gir/GIMarshallingTests-1.0.xml
new file mode 100644
index 0000000000..34198cc963
--- /dev/null
+++ b/packages/gobject-introspection/gir/GIMarshallingTests-1.0.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<dump>
+  <enum name="GIMarshallingTestsGEnum" get-type="gi_marshalling_tests_genum_get_type">
+    <member name="GI_MARSHALLING_TESTS_GENUM_VALUE1" nick="value1" value="0"/>
+    <member name="GI_MARSHALLING_TESTS_GENUM_VALUE2" nick="value2" value="1"/>
+    <member name="GI_MARSHALLING_TESTS_GENUM_VALUE3" nick="value3" value="42"/>
+  </enum>  <flags name="GIMarshallingTestsFlags" get-type="gi_marshalling_tests_flags_get_type">
+    <member name="GI_MARSHALLING_TESTS_FLAGS_VALUE1" nick="value1" value="1"/>
+    <member name="GI_MARSHALLING_TESTS_FLAGS_VALUE2" nick="value2" value="2"/>
+    <member name="GI_MARSHALLING_TESTS_FLAGS_VALUE3" nick="value3" value="4"/>
+    <member name="GI_MARSHALLING_TESTS_FLAGS_MASK" nick="mask" value="3"/>
+    <member name="GI_MARSHALLING_TESTS_FLAGS_MASK2" nick="mask2" value="3"/>
+  </flags>
+  <boxed name="GIMarshallingTestsBoxedStruct" get-type="gi_marshalling_tests_boxed_struct_get_type"/>
+  <boxed name="GIMarshallingTestsUnion" get-type="gi_marshalling_tests_union_get_type"/>
+  <boxed name="GIMarshallingTestsStructuredUnion" get-type="gi_marshalling_tests_structured_union_get_type"/>
+  <class name="GIMarshallingTestsObject" get-type="gi_marshalling_tests_object_get_type" parents="GObject">
+    <property name="int" type="gint" flags="7" default-value="0"/>
+  </class>
+  <class name="GIMarshallingTestsSubObject" get-type="gi_marshalling_tests_sub_object_get_type" parents="GIMarshallingTestsObject,GObject">
+  </class>
+  <class name="GIMarshallingTestsSubSubObject" get-type="gi_marshalling_tests_sub_sub_object_get_type" parents="GIMarshallingTestsSubObject,GIMarshallingTestsObject,GObject">
+  </class>
+  <interface name="GIMarshallingTestsInterface" get-type="gi_marshalling_tests_interface_get_type">
+  </interface>
+  <class name="GIMarshallingTestsInterfaceImpl" get-type="gi_marshalling_tests_interface_impl_get_type" parents="GObject">
+    <implements name="GIMarshallingTestsInterface"/>
+  </class>
+  <interface name="GIMarshallingTestsInterface2" get-type="gi_marshalling_tests_interface2_get_type">
+  </interface>
+  <interface name="GIMarshallingTestsInterface3" get-type="gi_marshalling_tests_interface3_get_type">
+  </interface>
+  <boxed name="GIMarshallingTestsOverridesStruct" get-type="gi_marshalling_tests_overrides_struct_get_type"/>
+  <class name="GIMarshallingTestsOverridesObject" get-type="gi_marshalling_tests_overrides_object_get_type" parents="GObject">
+  </class>
+  <class name="GIMarshallingTestsPropertiesObject" get-type="gi_marshalling_tests_properties_object_get_type" parents="GObject">
+    <property name="some-boolean" type="gboolean" flags="7" default-value="FALSE"/>
+    <property name="some-char" type="gchar" flags="7" default-value="0"/>
+    <property name="some-uchar" type="guchar" flags="7" default-value="0"/>
+    <property name="some-int" type="gint" flags="7" default-value="0"/>
+    <property name="some-uint" type="guint" flags="7" default-value="0"/>
+    <property name="some-long" type="glong" flags="7" default-value="0"/>
+    <property name="some-ulong" type="gulong" flags="7" default-value="0"/>
+    <property name="some-int64" type="gint64" flags="7" default-value="0"/>
+    <property name="some-uint64" type="guint64" flags="7" default-value="0"/>
+    <property name="some-float" type="gfloat" flags="7" default-value="0.000000"/>
+    <property name="some-string" type="gchararray" flags="7" default-value="NULL"/>
+    <property name="some-double" type="gdouble" flags="7" default-value="0.000000"/>
+    <property name="some-strv" type="GStrv" flags="7"/>
+    <property name="some-boxed-struct" type="GIMarshallingTestsBoxedStruct" flags="7"/>
+    <property name="some-variant" type="GVariant" flags="7"/>
+    <property name="some-boxed-glist" type="GIMarshallingTestsBoxedGList" flags="7"/>
+    <property name="some-gvalue" type="GValue" flags="7"/>
+    <property name="some-object" type="GObject" flags="7"/>
+    <property name="some-flags" type="GIMarshallingTestsFlags" flags="7" default-value="GI_MARSHALLING_TESTS_FLAGS_VALUE1"/>
+    <property name="some-enum" type="GIMarshallingTestsGEnum" flags="7" default-value="GI_MARSHALLING_TESTS_GENUM_VALUE1"/>
+    <property name="some-byte-array" type="GByteArray" flags="7"/>
+    <property name="some-readonly" type="gint" flags="1" default-value="0"/>
+  </class>
+  <class name="GIMarshallingTestsSignalsObject" get-type="gi_marshalling_tests_signals_object_get_type" parents="GObject">
+    <signal name="some-boxed-struct" return="void" when="last">
+      <param type="GIMarshallingTestsBoxedStruct"/>
+    </signal>
+    <signal name="some-boxed-gptrarray-utf8" return="void" when="last">
+      <param type="GPtrArray"/>
+    </signal>
+    <signal name="some-boxed-gptrarray-utf8-container" return="void" when="last">
+      <param type="GPtrArray"/>
+    </signal>
+    <signal name="some-boxed-gptrarray-utf8-full" return="void" when="last">
+      <param type="GPtrArray"/>
+    </signal>
+    <signal name="some-boxed-gptrarray-boxed-struct" return="void" when="last">
+      <param type="GPtrArray"/>
+    </signal>
+    <signal name="some-boxed-gptrarray-boxed-struct-container" return="void" when="last">
+      <param type="GPtrArray"/>
+    </signal>
+    <signal name="some-boxed-gptrarray-boxed-struct-full" return="void" when="last">
+      <param type="GPtrArray"/>
+    </signal>
+    <signal name="some-hash-table-utf8-int" return="void" when="last">
+      <param type="GHashTable"/>
+    </signal>
+    <signal name="some-hash-table-utf8-int-container" return="void" when="last">
+      <param type="GHashTable"/>
+    </signal>
+    <signal name="some-hash-table-utf8-int-full" return="void" when="last">
+      <param type="GHashTable"/>
+    </signal>
+    <signal name="some-boxed-struct-full" return="void" when="last">
+      <param type="GIMarshallingTestsBoxedStruct"/>
+    </signal>
+  </class>
+</dump>
diff --git a/packages/gobject-introspection/gir/GLib-2.0.xml b/packages/gobject-introspection/gir/GLib-2.0.xml
index 7cae677227..01480be1b2 100644
--- a/packages/gobject-introspection/gir/GLib-2.0.xml
+++ b/packages/gobject-introspection/gir/GLib-2.0.xml
@@ -39,6 +39,10 @@
   <boxed name="GTree" get-type="g_tree_get_type"/>
   <boxed name="GPatternSpec" get-type="g_pattern_spec_get_type"/>
   <boxed name="GBookmarkFile" get-type="g_bookmark_file_get_type"/>
+  <boxed name="GHmac" get-type="g_hmac_get_type"/>
+  <boxed name="GDir" get-type="g_dir_get_type"/>
+  <boxed name="GRand" get-type="g_rand_get_type"/>
+  <boxed name="GStrvBuilder" get-type="g_strv_builder_get_type"/>
   <error-quark function="g_thread_error_quark" domain="g_thread_error"/>
   <error-quark function="g_bookmark_file_error_quark" domain="g-bookmark-file-error-quark"/>
   <error-quark function="g_convert_error_quark" domain="g_convert_error"/>
diff --git a/packages/gobject-introspection/gir/GetType-1.0.xml b/packages/gobject-introspection/gir/GetType-1.0.xml
new file mode 100644
index 0000000000..7d0addc638
--- /dev/null
+++ b/packages/gobject-introspection/gir/GetType-1.0.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<dump>
+  <class name="GetTypeObject" get-type="gettype_object_get_type" parents="GObject">
+  </class>
+</dump>
diff --git a/packages/gobject-introspection/gir/Gio-2.0.xml b/packages/gobject-introspection/gir/Gio-2.0.xml
index 3331596a2a..a9098bdb35 100644
--- a/packages/gobject-introspection/gir/Gio-2.0.xml
+++ b/packages/gobject-introspection/gir/Gio-2.0.xml
@@ -48,6 +48,7 @@
     <implements name="GActionGroup"/>
     <implements name="GActionMap"/>
     <property name="application-id" type="gchararray" flags="231" default-value="NULL"/>
+    <property name="version" type="gchararray" flags="1073742051" default-value="NULL"/>
     <property name="flags" type="GApplicationFlags" flags="227" default-value="G_APPLICATION_FLAGS_NONE"/>
     <property name="resource-base-path" type="gchararray" flags="227" default-value="NULL"/>
     <property name="is-registered" type="gboolean" flags="225" default-value="FALSE"/>
@@ -524,6 +525,7 @@
     <member name="G_FILE_COPY_ALL_METADATA" nick="all-metadata" value="8"/>
     <member name="G_FILE_COPY_NO_FALLBACK_FOR_MOVE" nick="no-fallback-for-move" value="16"/>
     <member name="G_FILE_COPY_TARGET_DEFAULT_PERMS" nick="target-default-perms" value="32"/>
+    <member name="G_FILE_COPY_TARGET_DEFAULT_MODIFIED_TIME" nick="target-default-modified-time" value="64"/>
   </flags>
   <flags name="GFileMonitorFlags" get-type="g_file_monitor_flags_get_type">
     <member name="G_FILE_MONITOR_NONE" nick="none" value="0"/>
@@ -606,6 +608,7 @@
     <member name="G_IO_ERROR_NOT_CONNECTED" nick="not-connected" value="45"/>
     <member name="G_IO_ERROR_MESSAGE_TOO_LARGE" nick="message-too-large" value="46"/>
     <member name="G_IO_ERROR_NO_SUCH_DEVICE" nick="no-such-device" value="47"/>
+    <member name="G_IO_ERROR_DESTINATION_UNSET" nick="destination-unset" value="48"/>
   </enum>  <flags name="GAskPasswordFlags" get-type="g_ask_password_flags_get_type">
     <member name="G_ASK_PASSWORD_NEED_PASSWORD" nick="need-password" value="1"/>
     <member name="G_ASK_PASSWORD_NEED_USERNAME" nick="need-username" value="2"/>
@@ -1208,6 +1211,7 @@
     <prerequisite name="GActionGroup"/>
   </interface>
   <class name="GResolver" get-type="g_resolver_get_type" parents="GObject" abstract="1">
+    <property name="timeout" type="guint" flags="1073742051" default-value="0"/>
     <signal name="reload" return="void" when="last">
     </signal>
   </class>
diff --git a/packages/gobject-introspection/gir/GtkFrob-1.0.xml b/packages/gobject-introspection/gir/GtkFrob-1.0.xml
new file mode 100644
index 0000000000..87ec2e1574
--- /dev/null
+++ b/packages/gobject-introspection/gir/GtkFrob-1.0.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<dump>
+</dump>
diff --git a/packages/gobject-introspection/gir/Offsets-1.0.xml b/packages/gobject-introspection/gir/Offsets-1.0.xml
new file mode 100644
index 0000000000..87ec2e1574
--- /dev/null
+++ b/packages/gobject-introspection/gir/Offsets-1.0.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<dump>
+</dump>
diff --git a/packages/gobject-introspection/gir/Regress-1.0.xml b/packages/gobject-introspection/gir/Regress-1.0.xml
new file mode 100644
index 0000000000..6d5074dd5d
--- /dev/null
+++ b/packages/gobject-introspection/gir/Regress-1.0.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<dump>
+  <enum name="RegressTestEnum" get-type="regress_test_enum_get_type">
+    <member name="REGRESS_TEST_VALUE1" nick="value1" value="0"/>
+    <member name="REGRESS_TEST_VALUE2" nick="value2" value="1"/>
+    <member name="REGRESS_TEST_VALUE3" nick="value3" value="-1"/>
+    <member name="REGRESS_TEST_VALUE4" nick="value4" value="48"/>
+    <member name="REGRESS_TEST_VALUE5" nick="value5" value="49"/>
+  </enum>  <enum name="RegressTestEnumUnsigned" get-type="regress_test_enum_unsigned_get_type">
+    <member name="REGRESS_TEST_UNSIGNED_VALUE1" nick="value1" value="1"/>
+    <member name="REGRESS_TEST_UNSIGNED_VALUE2" nick="value2" value="-2147483648"/>
+  </enum>  <flags name="RegressTestFlags" get-type="regress_test_flags_get_type">
+    <member name="TEST_FLAG1" nick="flag1" value="1"/>
+    <member name="TEST_FLAG2" nick="flag2" value="2"/>
+    <member name="TEST_FLAG3" nick="flag3" value="4"/>
+  </flags>
+  <enum name="RegressTestError" get-type="regress_test_error_get_type">
+    <member name="REGRESS_TEST_ERROR_CODE1" nick="code1" value="1"/>
+    <member name="REGRESS_TEST_ERROR_CODE2" nick="code2" value="2"/>
+    <member name="REGRESS_TEST_ERROR_CODE3" nick="code3" value="3"/>
+  </enum>  <enum name="RegressTestABCError" get-type="regress_test_abc_error_get_type">
+    <member name="REGRESS_TEST_ABC_ERROR_CODE1" nick="code1" value="1"/>
+    <member name="REGRESS_TEST_ABC_ERROR_CODE2" nick="code2" value="2"/>
+    <member name="REGRESS_TEST_ABC_ERROR_CODE3" nick="code3" value="3"/>
+  </enum>  <enum name="RegressTestOtherError" get-type="regress_test_unconventional_error_get_type">
+    <member name="REGRESS_TEST_OTHER_ERROR_CODE1" nick="code1" value="1"/>
+    <member name="REGRESS_TEST_OTHER_ERROR_CODE2" nick="code2" value="2"/>
+    <member name="REGRESS_TEST_OTHER_ERROR_CODE3" nick="code3" value="3"/>
+  </enum>  <boxed name="RegressTestSimpleBoxedA" get-type="regress_test_simple_boxed_a_get_gtype"/>
+  <boxed name="RegressTestSimpleBoxedB" get-type="regress_test_simple_boxed_b_get_type"/>
+  <boxed name="RegressTestBoxed" get-type="regress_test_boxed_get_type"/>
+  <boxed name="RegressTestBoxedB" get-type="regress_test_boxed_b_get_type"/>
+  <boxed name="RegressTestBoxedC" get-type="regress_test_boxed_c_get_type"/>
+  <boxed name="RegressTestBoxedD" get-type="regress_test_boxed_d_get_type"/>
+  <class name="RegressTestObj" get-type="regress_test_obj_get_type" parents="GObject">
+    <property name="bare" type="GObject" flags="3"/>
+    <property name="boxed" type="RegressTestBoxed" flags="3"/>
+    <property name="hash-table" type="GHashTable" flags="3"/>
+    <property name="list" type="gpointer" flags="3"/>
+    <property name="pptrarray" type="gpointer" flags="3"/>
+    <property name="hash-table-old" type="GHashTable" flags="3"/>
+    <property name="list-old" type="gpointer" flags="3"/>
+    <property name="int" type="gint" flags="3" default-value="0"/>
+    <property name="float" type="gfloat" flags="3" default-value="1.000000"/>
+    <property name="double" type="gdouble" flags="3" default-value="1.000000"/>
+    <property name="string" type="gchararray" flags="3" default-value="NULL"/>
+    <property name="gtype" type="GType" flags="3"/>
+    <property name="name-conflict" type="gint" flags="7" default-value="42"/>
+    <property name="byte-array" type="GByteArray" flags="7"/>
+    <property name="write-only" type="gboolean" flags="2" default-value="FALSE"/>
+    <signal name="test" return="void" when="last" no-recurse="1" no-hooks="1">
+    </signal>
+    <signal name="test-with-static-scope-arg" return="void" when="last" no-recurse="1" no-hooks="1">
+      <param type="RegressTestSimpleBoxedA"/>
+    </signal>
+    <signal name="sig-with-array-prop" return="void" when="last">
+      <param type="GArray"/>
+    </signal>
+    <signal name="sig-with-array-len-prop" return="void" when="last">
+      <param type="gpointer"/>
+      <param type="gint"/>
+    </signal>
+    <signal name="sig-with-hash-prop" return="void" when="last">
+      <param type="GHashTable"/>
+    </signal>
+    <signal name="sig-with-strv" return="void" when="last">
+      <param type="GStrv"/>
+    </signal>
+    <signal name="sig-with-strv-full" return="void" when="last">
+      <param type="GStrv"/>
+    </signal>
+    <signal name="sig-with-obj" return="void" when="last">
+      <param type="GObject"/>
+    </signal>
+    <signal name="sig-with-obj-full" return="void" when="last">
+      <param type="GObject"/>
+    </signal>
+    <signal name="sig-with-foreign-struct" return="void" when="last">
+      <param type="CairoContext"/>
+    </signal>
+    <signal name="first" return="void" when="first">
+    </signal>
+    <signal name="cleanup" return="void" when="cleanup">
+    </signal>
+    <signal name="all" return="void" when="first" no-recurse="1" detailed="1" action="1" no-hooks="1">
+    </signal>
+    <signal name="sig-with-int64-prop" return="gint64" when="last">
+      <param type="gint64"/>
+    </signal>
+    <signal name="sig-with-uint64-prop" return="guint64" when="last">
+      <param type="guint64"/>
+    </signal>
+    <signal name="sig-with-intarray-ret" return="GArray" when="last">
+      <param type="gint"/>
+    </signal>
+    <signal name="sig-with-inout-int" return="void" when="last">
+      <param type="gpointer"/>
+    </signal>
+    <signal name="sig-with-gerror" return="void" when="last">
+      <param type="GError"/>
+    </signal>
+  </class>
+  <class name="RegressTestSubObj" get-type="regress_test_sub_obj_get_type" parents="RegressTestObj,GObject">
+    <implements name="RegressTestInterface"/>
+    <property name="boolean" type="gboolean" flags="231" default-value="TRUE"/>
+  </class>
+  <fundamental name="RegressTestFundamentalObject" get-type="regress_test_fundamental_object_get_type" abstract="1" instantiatable="1">
+  </fundamental>
+  <fundamental name="RegressTestFundamentalSubObject" get-type="regress_test_fundamental_sub_object_get_type" instantiatable="1" parents="RegressTestFundamentalObject">
+  </fundamental>
+  <fundamental name="RegressTestFundamentalObjectNoGetSetFunc" get-type="regress_test_fundamental_object_no_get_set_func_get_type" instantiatable="1">
+  </fundamental>
+  <fundamental name="RegressTestFundamentalSubObjectNoGetSetFunc" get-type="regress_test_fundamental_sub_object_no_get_set_func_get_type" instantiatable="1" parents="RegressTestFundamentalObjectNoGetSetFunc">
+  </fundamental>
+  <interface name="RegressTestInterface" get-type="regress_test_interface_get_type">
+    <property name="number" type="gint" flags="231" default-value="0"/>
+    <signal name="interface-signal" return="void" when="last">
+      <param type="gpointer"/>
+    </signal>
+  </interface>
+  <class name="RegressTestWi8021x" get-type="regress_test_wi_802_1x_get_type" parents="GObject">
+    <property name="testbool" type="gboolean" flags="3" default-value="TRUE"/>
+  </class>
+  <class name="RegressTestFloating" get-type="regress_test_floating_get_type" parents="GInitiallyUnowned,GObject">
+  </class>
+  <class name="RegressAnnotationObject" get-type="regress_annotation_object_get_type" parents="GObject">
+    <property name="string-property" type="gchararray" flags="7" default-value="NULL"/>
+    <property name="function-property" type="gpointer" flags="7"/>
+    <property name="tab-property" type="gchararray" flags="7" default-value="NULL"/>
+    <signal name="string-signal" return="void" when="last">
+      <param type="gpointer"/>
+    </signal>
+    <signal name="list-signal" return="void" when="last">
+      <param type="gpointer"/>
+    </signal>
+    <signal name="doc-empty-arg-parsing" return="void" when="last">
+      <param type="gpointer"/>
+    </signal>
+    <signal name="attribute-signal" return="gchararray" when="last">
+      <param type="gchararray"/>
+      <param type="gchararray"/>
+    </signal>
+  </class>
+  <interface name="RegressFooInterface" get-type="regress_foo_interface_get_type">
+  </interface>
+  <interface name="RegressFooSubInterface" get-type="regress_foo_sub_interface_get_type">
+    <prerequisite name="RegressFooInterface"/>
+    <signal name="destroy-event" return="void" when="last">
+    </signal>
+  </interface>
+  <class name="RegressFooObject" get-type="regress_foo_object_get_type" parents="GObject">
+    <implements name="RegressFooInterface"/>
+    <property name="string" type="gchararray" flags="7" default-value="NULL"/>
+    <property name="hidden" type="RegressFooHidden" flags="11"/>
+    <signal name="signal" return="gchararray" when="last">
+      <param type="GObject"/>
+      <param type="gpointer"/>
+    </signal>
+  </class>
+  <class name="RegressFooSubobject" get-type="regress_foo_subobject_get_type" parents="RegressFooObject,GObject" abstract="1">
+    <implements name="RegressFooInterface"/>
+  </class>
+  <class name="RegressFooBuffer" get-type="regress_foo_buffer_get_type" parents="RegressFooTileHandler,RegressFooObject,GObject">
+    <implements name="RegressFooInterface"/>
+  </class>
+  <class name="RegressFooOtherObject" get-type="regress_foo_other_object_get_type" parents="GObject">
+  </class>
+  <enum name="RegressFooEnumType" get-type="regress_foo_enum_type_get_type">
+    <member name="REGRESS_FOO_ENUM_ALPHA" nick="alpha" value="0"/>
+    <member name="REGRESS_FOO_ENUM_BETA" nick="beta" value="1"/>
+    <member name="REGRESS_FOO_ENUM_DELTA" nick="delta" value="2"/>
+  </enum>  <flags name="RegressFooFlagsType" get-type="regress_foo_flags_type_get_type">
+    <member name="REGRESS_FOO_FLAGS_FIRST" nick="first" value="1"/>
+    <member name="REGRESS_FOO_FLAGS_SECOND" nick="second" value="2"/>
+    <member name="REGRESS_FOO_FLAGS_THIRD" nick="third" value="4"/>
+  </flags>
+  <boxed name="RegressFooBoxed" get-type="regress_foo_boxed_get_type"/>
+  <boxed name="RegressFooDBusData" get-type="regress_foo_dbus_data_get_type"/>
+  <boxed name="RegressFooBRect" get-type="regress_foo_brect_get_type"/>
+  <boxed name="RegressFooBUnion" get-type="regress_foo_bunion_get_type"/>
+  <enum name="RegressFooError" get-type="regress_foo_error_get_type">
+    <member name="REGRESS_FOO_ERROR_GOOD" nick="good" value="0"/>
+    <member name="REGRESS_FOO_ERROR_BAD" nick="bad" value="1"/>
+    <member name="REGRESS_FOO_ERROR_UGLY" nick="ugly" value="2"/>
+  </enum>  <class name="RegressTestInheritDrawable" get-type="regress_test_inherit_drawable_get_type" parents="GObject" abstract="1">
+  </class>
+  <error-quark function="regress_test_error_quark" domain="regress-test-error"/>
+  <error-quark function="regress_test_abc_error_quark" domain="regress-test-abc-error"/>
+  <error-quark function="regress_test_unconventional_error_quark" domain="regress-test-other-error"/>
+  <error-quark function="regress_test_def_error_quark" domain="regress-test-def-error"/>
+  <error-quark function="regress_atest_error_quark" domain="regress-atest-error"/>
+  <error-quark function="regress_foo_error_quark" domain="regress_foo-error-quark"/>
+</dump>
diff --git a/packages/gobject-introspection/gir/SLetter-1.0.xml b/packages/gobject-introspection/gir/SLetter-1.0.xml
new file mode 100644
index 0000000000..354a5f2761
--- /dev/null
+++ b/packages/gobject-introspection/gir/SLetter-1.0.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<dump>
+  <error-quark function="s_spawn_error_quark" domain="s-spawn-error"/>
+  <error-quark function="s_dbus_error_quark" domain="s-dbus-error"/>
+</dump>
diff --git a/packages/gobject-introspection/gir/Typedefs-1.0.xml b/packages/gobject-introspection/gir/Typedefs-1.0.xml
new file mode 100644
index 0000000000..29d565ab5b
--- /dev/null
+++ b/packages/gobject-introspection/gir/Typedefs-1.0.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<dump>
+  <boxed name="TypedefsBoxedWithTypedefBefore" get-type="typedefs_boxed_with_typedef_before_get_type"/>
+  <boxed name="TypedefsBoxedWithTypedefAfter" get-type="typedefs_boxed_with_typedef_after_get_type"/>
+  <boxed name="TypedefsBoxedWithTagAndTypedef" get-type="typedefs_boxed_with_tag_and_typedef_get_type"/>
+  <boxed name="TypedefsBoxedWithAnonymousTypedef" get-type="typedefs_boxed_with_anonymous_typedef_get_type"/>
+  <boxed name="TypedefsBoxedWithHiddenStruct" get-type="typedefs_boxed_with_hidden_struct_get_type"/>
+</dump>
diff --git a/packages/gobject-introspection/gir/Utility-1.0.xml b/packages/gobject-introspection/gir/Utility-1.0.xml
new file mode 100644
index 0000000000..3cc1644235
--- /dev/null
+++ b/packages/gobject-introspection/gir/Utility-1.0.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<dump>
+  <class name="UtilityObject" get-type="utility_object_get_type" parents="GObject">
+  </class>
+</dump>
diff --git a/packages/gobject-introspection/gir/WarnLib-1.0.xml b/packages/gobject-introspection/gir/WarnLib-1.0.xml
new file mode 100644
index 0000000000..a75f4759e4
--- /dev/null
+++ b/packages/gobject-introspection/gir/WarnLib-1.0.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<dump>
+  <interface name="WarnLibWhatever" get-type="warnlib_whatever_get_type">
+  </interface>
+  <error-quark function="warnlib_unpaired_error_quark" domain="warnlib-unpaired-error"/>
+</dump>
diff --git a/packages/gobject-introspection/meson-python.diff b/packages/gobject-introspection/meson-python.diff
index 176de7c876..8dc618452b 100644
--- a/packages/gobject-introspection/meson-python.diff
+++ b/packages/gobject-introspection/meson-python.diff
@@ -1,7 +1,6 @@
-diff -uNr gobject-introspection/giscanner/meson.build gobject-introspection.mod/giscanner/meson.build
---- gobject-introspection/giscanner/meson.build	2021-06-03 13:43:38.060569823 +0000
-+++ gobject-introspection.mod/giscanner/meson.build	2021-06-03 13:55:08.705053742 +0000
-@@ -98,24 +98,12 @@
+--- a/giscanner/meson.build
++++ b/giscanner/meson.build
+@@ -95,29 +95,12 @@
    dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep],
  )
  
@@ -21,27 +20,31 @@ diff -uNr gobject-introspection/giscanner/meson.build gobject-introspection.mod/
    link_with: giscanner_lib,
    c_args: gi_hidden_visibility_cflags + custom_c_args,
    include_directories : configinc,
--  dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep,
--                 python_ext_dep],
+-  dependencies: [
+-    glib_dep,
+-    gobject_dep,
+-    gio_dep,
+-    gmodule_dep,
+-    python_ext_dep,
+-  ],
 +  dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep],
 +  link_args: '-lpython@PYTHON_VERSION@',
    install: true,
    install_dir: giscannerdir,
  )
-diff -uNr gobject-introspection/meson.build gobject-introspection.mod/meson.build
---- gobject-introspection/meson.build	2021-06-03 13:43:38.062569940 +0000
-+++ gobject-introspection.mod/meson.build	2021-06-03 13:57:59.063038610 +0000
-@@ -3,6 +3,7 @@
-   meson_version: '>= 0.58.2',
+--- a/meson.build
++++ b/meson.build
+@@ -4,6 +4,7 @@
    default_options: [
+     'c_std=gnu99',
      'warning_level=2',
 +    'c_link_args=-lpython@PYTHON_VERSION@',
      'buildtype=debugoptimized',
    ],
  )
-@@ -157,9 +158,6 @@
- libffi_dep = dependency('libffi',
-   fallback : ['libffi', 'ffi_dep'])
+@@ -174,9 +175,6 @@
+   output: 'config.h'
+ )
  
 -# python headers
 -cc.check_header('Python.h', dependencies: [python.dependency()], required: true)
diff --git a/packages/gobject-introspection/meson.build.patch b/packages/gobject-introspection/meson.build.patch
index ce578ffe45..9e7445aa11 100644
--- a/packages/gobject-introspection/meson.build.patch
+++ b/packages/gobject-introspection/meson.build.patch
@@ -1,7 +1,7 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -151,7 +152,7 @@
-   fallback : ['libffi', 'ffi_dep'])
+@@ -155,7 +155,7 @@
+ libffi_dep = dependency('libffi')
  
  if not (host_system == 'darwin' and host_arch == 'aarch64' or
 -        host_system == 'linux' and libffi_dep.version().version_compare('>= 3.4'))
@@ -9,10 +9,10 @@
    config.set('LEGACY_GIRFFI_FREE', 1)
  endif
  
-@@ -251,9 +249,9 @@
+@@ -265,9 +265,9 @@
+ endif
+ 
  pkgconfig_variables = [
-   'datadir=' + '${prefix}' / get_option('datadir'),
-   'bindir=' + '${prefix}' / get_option('bindir'),
 -  'g_ir_scanner=${bindir}/g-ir-scanner',
 -  'g_ir_compiler=${bindir}/g-ir-compiler@0@'.format(exe_ext),
 -  'g_ir_generate=${bindir}/g-ir-generate@0@'.format(exe_ext),