From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 5 Apr 2021 17:06:40 +0000 (+0200)
Subject: javascriptcoregtk-4.0,webkit2gtk-web-extension-4.0: Fix some binding errors
X-Git-Tag: 0.52.1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43e98d93b36d0e3febfdaafe2014eff9b451120c;p=thirdparty%2Fvala.git

javascriptcoregtk-4.0,webkit2gtk-web-extension-4.0: Fix some binding errors
---

diff --git a/vapi/javascriptcoregtk-4.0.vapi b/vapi/javascriptcoregtk-4.0.vapi
index ec34b2b84..0e79debcb 100644
--- a/vapi/javascriptcoregtk-4.0.vapi
+++ b/vapi/javascriptcoregtk-4.0.vapi
@@ -43,7 +43,7 @@ namespace JS {
 		[CCode (cname = "JSObjectHasProperty", instance_pos = 1.1)]
 		public bool has_property (JS.Context ctx, JS.String property_name);
 		[CCode (cname = "JSObjectMakeFunction")]
-		public Object.make_function (JS.String? name, [CCode (array_length_pos = 1.5)] JS.String[]? parameter_names, JS.String body, JS.String? source_url, int starting_line_number, out JS.Value? exception);
+		public Object.make_function (JS.Context ctx, JS.String? name, [CCode (array_length_pos = 2.5)] JS.String[]? parameter_names, JS.String body, JS.String? source_url, int starting_line_number, out JS.Value? exception);
 	}
 	[CCode (cheader_filename = "JavaScriptCore/JavaScript.h", cname = "struct OpaqueJSString", free_function = "JSStringRelease", has_type_id = false)]
 	[Compact]
@@ -72,7 +72,7 @@ namespace JS {
 		[CCode (cname = "JSValueGetType", instance_pos = 1.1)]
 		public JS.Type get_type (JS.Context ctx);
 		[CCode (cname = "JSValueGetTypedArrayType", instance_pos = 1.1)]
-		public JS.TypedArrayType get_typed_array_type (JS.Context ctx);
+		public JS.TypedArrayType get_typed_array_type (JS.Context ctx, out JS.Value? exception = null);
 		[CCode (cname = "JSValueIsArray", instance_pos = 1.1)]
 		public bool is_array (JS.Context ctx);
 		[CCode (cname = "JSValueIsBoolean", instance_pos = 1.1)]
diff --git a/vapi/metadata/JavaScriptCore-4.0-custom.vala b/vapi/metadata/JavaScriptCore-4.0-custom.vala
index 0ba392d63..be2114816 100644
--- a/vapi/metadata/JavaScriptCore-4.0-custom.vala
+++ b/vapi/metadata/JavaScriptCore-4.0-custom.vala
@@ -46,7 +46,7 @@ namespace JS {
 		[CCode (cname = "JSObjectHasProperty", instance_pos = 1.1)]
 		public bool has_property (JS.Context ctx, JS.String property_name);
 		[CCode (cname = "JSObjectMakeFunction")]
-		public Object.make_function (JS.String? name, [CCode (array_length_pos = 1.5)] JS.String[]? parameter_names, JS.String body, JS.String? source_url, int starting_line_number, out JS.Value? exception);
+		public Object.make_function (JS.Context ctx, JS.String? name, [CCode (array_length_pos = 2.5)] JS.String[]? parameter_names, JS.String body, JS.String? source_url, int starting_line_number, out JS.Value? exception);
 	}
 	[CCode (cheader_filename = "JavaScriptCore/JavaScript.h", cname = "struct OpaqueJSString", free_function = "JSStringRelease", has_type_id = false)]
 	[Compact]
@@ -76,7 +76,7 @@ namespace JS {
 		public JS.Type get_type (JS.Context ctx);
 
 		[CCode (cname = "JSValueGetTypedArrayType", instance_pos = 1.1)]
-		public JS.TypedArrayType get_typed_array_type (JS.Context ctx);
+		public JS.TypedArrayType get_typed_array_type (JS.Context ctx, out JS.Value? exception = null);
 
 		[CCode (cname = "JSValueIsArray", instance_pos = 1.1)]
 		public bool is_array (JS.Context ctx);
diff --git a/vapi/metadata/WebKit2WebExtension-4.0-custom.vala b/vapi/metadata/WebKit2WebExtension-4.0-custom.vala
index a994a774e..11875102e 100644
--- a/vapi/metadata/WebKit2WebExtension-4.0-custom.vala
+++ b/vapi/metadata/WebKit2WebExtension-4.0-custom.vala
@@ -1,5 +1,6 @@
 namespace WebKit {
 	namespace DOM {
+		[CCode (has_typedef = false)]
 		public delegate void EventTargetFunc (WebKit.DOM.EventTarget target, WebKit.DOM.Event event);
 	}
 }
diff --git a/vapi/webkit2gtk-web-extension-4.0.vapi b/vapi/webkit2gtk-web-extension-4.0.vapi
index 893236c56..f28f6f81a 100644
--- a/vapi/webkit2gtk-web-extension-4.0.vapi
+++ b/vapi/webkit2gtk-web-extension-4.0.vapi
@@ -3676,7 +3676,7 @@ namespace WebKit {
 			[Version (deprecated = true, deprecated_since = "2.22")]
 			public abstract string lookup_namespace_uri (string prefix);
 		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h")]
+		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", has_typedef = false)]
 		public delegate void EventTargetFunc (WebKit.DOM.EventTarget target, WebKit.DOM.Event event);
 		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", cname = "WEBKIT_DOM_CSS_RULE_CHARSET_RULE")]
 		[Version (deprecated = true, deprecated_since = "2.22")]