5 files changed, 285 insertions, 3 deletions
diff --git a/TODO-README.txt b/TODO-README.txt
index e5bcc89..63aa683 100644
--- a/TODO-README.txt
+++ b/TODO-README.txt
@@ -30,6 +30,9 @@ Patched: Clutter →
 Patched: Evince →
 	→ Update to next release → Introspection libdocument linking fix
 
+Using older file (glib-2.0.c): GObject-Introspection →
+	→ Update PyGobject to nexte relase → GVariant fix
+
 Resolve conflict in gnome-menus →
 etc/xdg/menus/applications.menu
 pkgadd: listed file(s) already installed (use -f to ignore and overwrite)
@@ -45,4 +48,3 @@ usr/share/themes/LowContrast/index.theme
 Add packages →
 	adg → gnome-account-panel (gnome-control-center)
 	gcm-calibrate → color (gnome-control-center)
-	gnome-shell → gnome-tweak-tools
diff --git a/gobject-introspection/.md5sum.i686 b/gobject-introspection/.md5sum.i686
index daffed0..51c9726 100644
--- a/gobject-introspection/.md5sum.i686
+++ b/gobject-introspection/.md5sum.i686
@@ -1 +1,2 @@
+1e8ae3d664652ad8f1f7021fb28c2ed8  glib-2.0.c
 bfeb66b36a9629b9e261d1d3e4bf0555  gobject-introspection-1.29.0.tar.xz
diff --git a/gobject-introspection/.md5sum.x86_64 b/gobject-introspection/.md5sum.x86_64
index 99c60e6..51c9726 100644
--- a/gobject-introspection/.md5sum.x86_64
+++ b/gobject-introspection/.md5sum.x86_64
@@ -1 +1,2 @@
-39147ea80600ee33efaa299439c24713  gobject-introspection-0.10.4.tar.bz2
+1e8ae3d664652ad8f1f7021fb28c2ed8  glib-2.0.c
+bfeb66b36a9629b9e261d1d3e4bf0555  gobject-introspection-1.29.0.tar.xz
diff --git a/gobject-introspection/Pkgfile b/gobject-introspection/Pkgfile
index 8f4ee6e..2cdf379 100644
--- a/gobject-introspection/Pkgfile
+++ b/gobject-introspection/Pkgfile
@@ -8,11 +8,19 @@
 name=gobject-introspection
 version=1.29.0
 release=1
-source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz)
+source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz
+	glib-2.0.c)
 
 build() {
 	cd $name-$version
 
+	# From Ubuntu:
+	# Roll back to gir/glib-2.0 as of before upstream commit 6d30588c1.
+	# Later commits have a GVariant which current pygobject does not
+	# deal with. This is fixed in the invoke-rewrite branch of
+	# pygobject, so until this lands we need the older annotations.
+	cp ../glib-2.0.c gir/
+
 	PYTHON=/usr/bin/python2	./configure --prefix=/usr
 
 	make
diff --git a/gobject-introspection/glib-2.0.c b/gobject-introspection/glib-2.0.c
new file mode 100644
index 0000000..f8f4234
--- /dev/null
+++ b/gobject-introspection/glib-2.0.c
@@ -0,0 +1,270 @@
+/**
+ * g_file_get_contents:
+ * @contents: (out):
+ * @length: (out) (allow-none):
+ */
+
+/**
+ * g_file_set_contents:
+ * @contents: (array length=length) (element-type guint8):
+ */
+
+/**
+ * g_file_open_tmp:
+ * @name_used: (out):
+ */
+
+/**
+ * g_filename_to_uri:
+ * @hostname: (allow-none):
+ */
+
+/**
+ * g_build_pathv:
+ * @separator:
+ * @args: (array zero-terminated=1):
+ * Return value:
+ */
+
+/**
+ * g_build_filenamev:
+ * @args: (array zero-terminated=1):
+ * Return value:
+ */
+
+/**
+ * g_markup_escape_text:
+ * Return value: (transfer full):
+ */
+
+/**
+ * g_thread_init:
+ * @vtable: (allow-none):
+ */
+
+/**
+ * g_main_loop_new:
+ * @context: (allow-none):
+ */
+
+/**
+ * g_idle_add_full:
+ *
+ * Rename to: g_idle_add
+ */
+
+/**
+ * g_child_watch_add_full:
+ *
+ * Rename to: g_child_watch_add
+ */
+
+/**
+ * g_io_add_watch_full:
+ *
+ * Rename to: g_io_add_watch
+ */
+
+/**
+ * g_timeout_add_full:
+ *
+ * Rename to: g_timeout_add
+ */
+
+/**
+ * g_timeout_add_seconds_full:
+ *
+ * Rename to: g_timeout_add_seconds
+ */
+
+/**
+ * g_option_context_parse:
+ * @argc: (inout):
+ * @argv: (array length=argc) (inout) (allow-none):
+ */
+
+/**
+ * GSourceFunc:
+ * @data: (closure data):
+ */
+
+/**
+ * GIOFunc:
+ * @data: (closure data):
+ */
+
+/**
+ * g_spawn_async:
+ * @working_directory: (allow-none):
+ * @argv: (array zero-terminated=1):
+ * @envp: (array zero-terminated=1) (allow-none):
+ * @child_setup: (scope async) (allow-none):
+ * @user_data: (allow-none):
+ * @child_pid: (out):
+ */
+
+/**
+ * g_spawn_async_with_pipes:
+ * @working_directory: (allow-none):
+ * @argv: (array zero-terminated=1):
+ * @envp: (array zero-terminated=1) (allow-none):
+ * @child_setup: (scope async) (allow-none):
+ * @user_data: (allow-none):
+ * @child_pid: (out):
+ * @standard_input: (out):
+ * @standard_output: (out):
+ * @standard_error: (out):
+ */
+
+/**
+ * g_spawn_sync:
+ * @working_directory: (allow-none):
+ * @argv: (array zero-terminated=1):
+ * @envp: (array zero-terminated=1) (allow-none):
+ * @child_setup: (scope call) (allow-none):
+ * @user_data: (allow-none):
+ * @standard_output: (out):
+ * @standard_error: (out):
+ * @exit_status: (out):
+ */
+
+/**
+ * g_spawn_command_line_sync:
+ * @standard_output: (out):
+ * @standard_error: (out):
+ * @exit_status: (out):
+ */
+
+/**
+ * g_get_system_config_dirs:
+ * Return value: (array zero-terminated=1) (transfer none):
+ */
+
+/**
+ * g_get_system_data_dirs:
+ * Return value: (array zero-terminated=1) (transfer none):
+ */
+
+/**
+ * g_shell_parse_argv:
+ * @command_line:
+ * @argcp: (out):
+ * @argvp: (out) (array zero-terminated=1):
+ * @error:
+ */
+
+/**
+ * g_completion_complete_utf8:
+ * Return value: (element-type utf8) (transfer none):
+ */
+
+/**
+ * g_convert:
+ * @bytes_read: (out):
+ * @bytes_written: (out):
+ */
+
+/**
+ * g_key_file_get_string:
+ * Return value: (transfer full):
+ */
+
+/**
+  * g_key_file_get_string_list:
+  * @length: (out):
+  * Return value: (array zero-terminated=1 length=length) (element-type utf8) (transfer full):
+  */
+
+/**
+  * g_key_file_set_string_list:
+  * @list: (array zero-terminated=1 length=length) (element-type utf8):
+  * @length: (out):
+  */
+
+/**
+ * g_key_file_get_locale_string:
+ * @locale: (null-ok):
+ * Return value: (transfer full):
+ */
+
+/**
+  * g_key_file_get_locale_string_list:
+  * @length: (out):
+  * @locale: (null-ok):
+  * Return value: (array zero-terminated=1 length=length) (element-type utf8) (transfer full):
+  */
+
+/**
+  * g_key_file_set_locale_string_list:
+  * @list: (array zero-terminated=1 length=length) (element-type utf8):
+  * @length: (out):
+  */
+
+/**
+  * GVariant: (foreign)
+  *
+  */
+
+/**
+ * g_variant_new_strv:
+ * @strv: (array length=length) (element-type utf8):
+ */
+
+/**
+ * g_variant_new_variant: (constructor)
+ * @value:
+ * @returns:
+ */
+
+/**
+ * g_variant_get_strv:
+ * @length: (allow-none):
+ * @returns: (array length=length) (transfer container):
+ */
+
+/**
+ * g_variant_get_string:
+ * @length: (allow-none) (default NULL) (out):
+ * @returns:
+ */
+
+/**
+ * g_variant_builder_end:
+ * @returns: (transfer none):
+ */
+
+/**
+ * g_get_language_names:
+ * @returns: (array zero-terminated=1) (transfer none):
+ */
+
+// Skip this as "tm" is not available at present.
+
+/**
+ * g_date_to_struct_tm: (skip)
+ */
+
+/**
+ * g_get_environ:
+ * @returns: (array zero-terminated=1) (transfer full):
+ */
+
+/**
+ * g_listenv:
+ * @returns: (array zero-terminated=1) (transfer full):
+ */
+
+/**
+ * g_base64_encode:
+ * @data: (array length=len) (element-type guint8):
+ *
+ * @returns: (transfer full):
+ */
+
+/**
+ * g_base64_decode:
+ * @text:
+ * @out_len: (out):
+ *
+ * @returns: (array length=out_len) (element-type guint8) (transfer full):
+ */