From db528a1dbda16ebf5d0f375fa49fa460fd074feb Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 22 Mar 2018 18:03:14 +0100
Subject: [PATCH] libgsf-1: Fix metadata warnings and Outfile.new_child*()

---
 vapi/Makefile.am                |  2 +-
 vapi/libgsf-1.vapi              |  6 +++---
 vapi/metadata/Gsf-1-custom.vala |  5 +++++
 vapi/metadata/Gsf-1.metadata    | 10 +++++-----
 4 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 vapi/metadata/Gsf-1-custom.vala

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 61f9213fe..5e8a208b8 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -631,7 +631,7 @@ libgrss:
 	$(GENVAPI) --library $(srcdir)/libgrss --metadatadir $(METADATADIR) --pkg gio-2.0 --pkg libsoup-2.4 --pkg libxml-2.0 $(GIRDIR)/Grss-0.7.gir
 
 libgsf-1:
-	$(GENVAPI) --library $(srcdir)/libgsf-1 --pkg gio-2.0 --pkg libxml-2.0 --metadatadir $(METADATADIR) $(GIRDIR)/Gsf-1.gir
+	$(GENVAPI) --library $(srcdir)/libgsf-1 --pkg gio-2.0 --pkg libxml-2.0 --metadatadir $(METADATADIR) $(METADATADIR)/Gsf-1-custom.vala $(GIRDIR)/Gsf-1.gir
 
 libnotify:
 	$(GENVAPI) --library $(srcdir)/libnotify --pkg gdk-pixbuf-2.0 --pkg gio-2.0 --metadatadir $(METADATADIR) $(GIRDIR)/Notify-0.7.gir
diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi
index 58beb041a..2480d0dc6 100644
--- a/vapi/libgsf-1.vapi
+++ b/vapi/libgsf-1.vapi
@@ -249,10 +249,10 @@ namespace Gsf {
 	public abstract class Outfile : Gsf.Output {
 		[CCode (has_construct_function = false)]
 		protected Outfile ();
-		[NoWrapper]
-		public virtual unowned Gsf.Output new_child (string name, bool is_dir, string first_property_name, va_list args);
+		public Gsf.Output new_child (string name, bool is_dir);
 		public Gsf.Output new_child_full (string name, bool is_dir, ...);
-		public Gsf.Output new_child_varg (string name, bool is_dir, string first_property_name, va_list args);
+		[CCode (vfunc_name = "new_child")]
+		public virtual Gsf.Output new_child_varg (string name, bool is_dir, string first_property_name, va_list args);
 		public Gsf.Output open_pkg_add_rel (string name, string content_type, Gsf.Outfile parent, string type);
 	}
 	[CCode (cheader_filename = "gsf/gsf.h", lower_case_csuffix = "outfile_msole", type_id = "gsf_outfile_msole_get_type ()")]
diff --git a/vapi/metadata/Gsf-1-custom.vala b/vapi/metadata/Gsf-1-custom.vala
new file mode 100644
index 000000000..52bde0555
--- /dev/null
+++ b/vapi/metadata/Gsf-1-custom.vala
@@ -0,0 +1,5 @@
+namespace Gsf {
+	public abstract class Outfile : Gsf.Output {
+		public Gsf.Output new_child (string name, bool is_dir);
+	}
+}
diff --git a/vapi/metadata/Gsf-1.metadata b/vapi/metadata/Gsf-1.metadata
index 99caeaaae..640b6c75e 100644
--- a/vapi/metadata/Gsf-1.metadata
+++ b/vapi/metadata/Gsf-1.metadata
@@ -46,8 +46,8 @@ InputTextline
 
 Outfile
   .* skip=false
-//  .new_child#virtual name="new_child_varg"
-//  .new_child_varg vfunc_name="new_child"
+  .new_child skip
+  .new_child_varg vfunc_name="new_child"
 
 Output
   .* skip=false
@@ -79,14 +79,14 @@ XMLInNode struct=false
 
 XMLInUnknownFunc
   .elem type="string"
-  .attrs array type="string[]"
+  .attrs type="string[]"
 
 XMLProbeFunc
   .name type="string"
   .prefix type="string"
   .URI type="string"
-  .namespaces array array_length_idx=3 type="string[]"
-  .attributes array array_length_idx=5 type="string[]"
+  .namespaces array_length_idx=3 type="string[]"
+  .attributes array_length_idx=5 type="string[]"
 
 base64_*code_*.data array
 base64_*code_*.in array
-- 
2.47.3