From: Rico Tzschichholz Date: Mon, 19 Mar 2018 07:01:58 +0000 (+0100) Subject: vapi: Remove rest-0.6 bindings X-Git-Tag: 0.41.90~233 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=018528d1412b62d4a1e7dbcb12a4b5876e7190c0;p=thirdparty%2Fvala.git vapi: Remove rest-0.6 bindings https://bugzilla.gnome.org/show_bug.cgi?id=794477 --- diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 097c38149..60b124093 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -233,10 +233,6 @@ dist_vapi_DATA = \ rasqal.vapi \ rasqal.deps \ readline.vapi \ - rest-0.6.deps \ - rest-0.6.vapi \ - rest-extras-0.6.deps \ - rest-extras-0.6.vapi \ rest-0.7.deps \ rest-0.7.vapi \ rest-extras-0.7.deps \ @@ -321,8 +317,6 @@ GIDL_BINDINGS = \ libwnck-1.0 \ loudmouth-1.0 \ purple \ - rest-0.6 \ - rest-extras-0.6 \ tracker-indexer-module-1.0 \ twitter-glib-1.0 \ unique-1.0 \ @@ -697,12 +691,6 @@ poppler-glib: purple: $(GENVAPI) --library $(srcdir)/purple $(PACKAGESDIR)/purple/purple-custom.vala $(PACKAGESDIR)/purple/purple.gi -rest-0.6: - $(GENVAPI) --library $(srcdir)/rest-0.6 $(PACKAGESDIR)/rest-0.6/rest-0.6-custom.vala $(PACKAGESDIR)/rest-0.6/rest-0.6.gi - -rest-extras-0.6: - $(GENVAPI) --library $(srcdir)/rest-extras-0.6 $(PACKAGESDIR)/rest-extras-0.6/rest-extras-0.6-custom.vala $(PACKAGESDIR)/rest-extras-0.6/rest-extras-0.6.gi - rest-0.7: $(GENVAPI) --library $(srcdir)/rest-0.7 --metadatadir $(METADATADIR) --pkg gio-2.0 $(GIRDIR)/Rest-0.7.gir diff --git a/vapi/packages/rest-0.6/rest-0.6-custom.vala b/vapi/packages/rest-0.6/rest-0.6-custom.vala deleted file mode 100644 index d47d0cb85..000000000 --- a/vapi/packages/rest-0.6/rest-0.6-custom.vala +++ /dev/null @@ -1,11 +0,0 @@ -namespace Rest { - [CCode (cheader_filename = "rest/rest-proxy.h")] - public class Proxy { - public virtual Rest.ProxyCall new_call (); - } - - [CCode (cname = "OAuthProxy", cheader_filename = "rest/oauth-proxy.h")] - public class OAuthProxy { - } -} - diff --git a/vapi/packages/rest-0.6/rest-0.6.files b/vapi/packages/rest-0.6/rest-0.6.files deleted file mode 100644 index 5d82be854..000000000 --- a/vapi/packages/rest-0.6/rest-0.6.files +++ /dev/null @@ -1,2 +0,0 @@ -include/rest-0.6/rest/*.h -lib/librest-0.6.so diff --git a/vapi/packages/rest-0.6/rest-0.6.gi b/vapi/packages/rest-0.6/rest-0.6.gi deleted file mode 100644 index 169c4dab1..000000000 --- a/vapi/packages/rest-0.6/rest-0.6.gi +++ /dev/null @@ -1,510 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vapi/packages/rest-0.6/rest-0.6.metadata b/vapi/packages/rest-0.6/rest-0.6.metadata deleted file mode 100644 index a3bfe63d4..000000000 --- a/vapi/packages/rest-0.6/rest-0.6.metadata +++ /dev/null @@ -1,35 +0,0 @@ -OAuthProxy cheader_filename="rest/oauth-proxy.h" -OAuthProxyCall cheader_filename="rest/oauth-proxy-call.h" -RestProxy cheader_filename="rest/rest-proxy.h" -RestProxyCall cheader_filename="rest/rest-proxy-call.h" -RestXml* cheader_filename="rest/rest-xml-parser.h" -OAuthSignatureMethod cheader_filename="rest/oauth-proxy.h" -RestProxyCallError RestProxyCall cheader_filename="rest/rest-proxy-call.h" errordomain="1" -RestProxyError cheader_filename="rest/rest-proxy.h" errordomain="1" -OAuthProxyAuthCallback cheader_filename="rest/oauth-proxy.h" has_target="1" -RestProxyCallAsyncCallback cheader_filename="rest/rest-proxy-call.h" has_target="1" -*.priv hidden="1" -*Class hidden="1" -*.parent hidden="1" - -rest_proxy_call_get_params type_arguments="string,string" transfer_ownership="1" -rest_proxy_bind ellipsis="1" -rest_proxy_new_call hidden="1" -rest_proxy_call_add_headers ellipsis="1" -rest_proxy_call_add_params ellipsis="1" -rest_proxy_call_async name="run_async" -rest_proxy_call_async.weak_object nullable="1" -rest_proxy_call_async.callback delegate_target_pos="2.9" -rest_proxy_call_async.userdata hidden="1" -oauth_proxy_auth_step* deprecated="1" -oauth_proxy*.weak_object nullable="1" -oauth_proxy_auth_step_async.callback delegate_target_pos="3.9" -oauth_proxy_request_token_async.callback delegate_target_pos="4.9" -oauth_proxy_access_token_async.callback delegate_target_pos="4.9" -RestProxyCallAsyncCallback.userdata hidden="1" -RestProxyCallAsyncCallback.error nullable="1" -RestProxyCallAsyncCallback.weak_object nullable="1" -OAuthProxyAuthCallback.userdata hidden="1" -OAuthProxyAuthCallback.error nullable="1" -OAuthProxyAuthCallback.weak_object nullable="1" - diff --git a/vapi/packages/rest-0.6/rest-0.6.namespace b/vapi/packages/rest-0.6/rest-0.6.namespace deleted file mode 100644 index 1506a7263..000000000 --- a/vapi/packages/rest-0.6/rest-0.6.namespace +++ /dev/null @@ -1 +0,0 @@ -Rest diff --git a/vapi/packages/rest-extras-0.6/rest-extras-0.6-custom.vala b/vapi/packages/rest-extras-0.6/rest-extras-0.6-custom.vala deleted file mode 100644 index a53a3444a..000000000 --- a/vapi/packages/rest-extras-0.6/rest-extras-0.6-custom.vala +++ /dev/null @@ -1,14 +0,0 @@ -namespace Rest { - [CCode (cname="FacebookProxy", cheader_filename = "rest-extras/facebook-proxy.h")] - public class FacebookProxy : Rest.Proxy { - } - [CCode (cname="FacebookProxyCall", cheader_filename = "rest-extras/facebook-proxy-call.h")] - public class FacebookProxyCall : Rest.ProxyCall { - } - [CCode (cname="FlickrProxy", cheader_filename = "rest-extras/flickr-proxy.h")] - public class FlickrProxy : Rest.Proxy { - } - [CCode (cname="FlickrProxyCall", cheader_filename = "rest-extras/flickr-proxy-call.h")] - public class FlickrProxyCall : Rest.ProxyCall { - } -} diff --git a/vapi/packages/rest-extras-0.6/rest-extras-0.6.files b/vapi/packages/rest-extras-0.6/rest-extras-0.6.files deleted file mode 100644 index 39c0eedcd..000000000 --- a/vapi/packages/rest-extras-0.6/rest-extras-0.6.files +++ /dev/null @@ -1 +0,0 @@ -include/rest-0.6/rest-extras/*.h diff --git a/vapi/packages/rest-extras-0.6/rest-extras-0.6.gi b/vapi/packages/rest-extras-0.6/rest-extras-0.6.gi deleted file mode 100644 index f06c22ebb..000000000 --- a/vapi/packages/rest-extras-0.6/rest-extras-0.6.gi +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vapi/packages/rest-extras-0.6/rest-extras-0.6.metadata b/vapi/packages/rest-extras-0.6/rest-extras-0.6.metadata deleted file mode 100644 index 11e217823..000000000 --- a/vapi/packages/rest-extras-0.6/rest-extras-0.6.metadata +++ /dev/null @@ -1,7 +0,0 @@ -FacebookProxy cheader_filename="rest-extras/facebook-proxy.h" -FacebookProxyCall cheader_filename="rest-extras/facebook-proxy-call.h" -FlickrProxy cheader_filename="rest-extras/flickr-proxy.h" -FlickrProxyCall cheader_filename="rest-extras/flickr-proxy-call.h" -*.parent hidden="1" -*.priv hidden="1" -*Class hidden="1" diff --git a/vapi/packages/rest-extras-0.6/rest-extras-0.6.namespace b/vapi/packages/rest-extras-0.6/rest-extras-0.6.namespace deleted file mode 100644 index 1506a7263..000000000 --- a/vapi/packages/rest-extras-0.6/rest-extras-0.6.namespace +++ /dev/null @@ -1 +0,0 @@ -Rest diff --git a/vapi/rest-0.6.deps b/vapi/rest-0.6.deps deleted file mode 100644 index 3f9f152ac..000000000 --- a/vapi/rest-0.6.deps +++ /dev/null @@ -1,3 +0,0 @@ -libsoup-2.4 -libxml-2.0 -glib-2.0 diff --git a/vapi/rest-0.6.vapi b/vapi/rest-0.6.vapi deleted file mode 100644 index 073b2d5f1..000000000 --- a/vapi/rest-0.6.vapi +++ /dev/null @@ -1,171 +0,0 @@ -/* rest-0.6.vapi generated by vapigen, do not modify. */ - -namespace Rest { - [CCode (cheader_filename = "rest/oauth-proxy.h", cname = "OAuthProxy")] - public class OAuthProxy : Rest.Proxy { - [CCode (cname = "oauth_proxy_new", has_construct_function = false, type = "RestProxy*")] - public OAuthProxy (string consumer_key, string consumer_secret, string url_format, bool binding_required); - [CCode (cname = "oauth_proxy_access_token")] - public bool access_token (string function, string verifier) throws GLib.Error; - [CCode (cname = "oauth_proxy_access_token_async")] - public bool access_token_async (string function, string verifier, [CCode (delegate_target_pos = 4.9)] Rest.OAuthProxyAuthCallback callback, GLib.Object? weak_object) throws GLib.Error; - [CCode (cname = "oauth_proxy_auth_step")] - [Version (deprecated = true)] - public bool auth_step (string function) throws GLib.Error; - [CCode (cname = "oauth_proxy_auth_step_async")] - [Version (deprecated = true)] - public bool auth_step_async (string function, [CCode (delegate_target_pos = 3.9)] Rest.OAuthProxyAuthCallback callback, GLib.Object? weak_object) throws GLib.Error; - [CCode (cname = "oauth_proxy_get_token")] - public unowned string get_token (); - [CCode (cname = "oauth_proxy_get_token_secret")] - public unowned string get_token_secret (); - [CCode (cname = "oauth_proxy_is_oauth10a")] - public bool is_oauth10a (); - [CCode (cname = "oauth_proxy_request_token")] - public bool request_token (string function, string callback_uri) throws GLib.Error; - [CCode (cname = "oauth_proxy_request_token_async")] - public bool request_token_async (string function, string callback_uri, [CCode (delegate_target_pos = 4.9)] Rest.OAuthProxyAuthCallback callback, GLib.Object? weak_object) throws GLib.Error; - [CCode (cname = "oauth_proxy_set_token")] - public void set_token (string token); - [CCode (cname = "oauth_proxy_set_token_secret")] - public void set_token_secret (string token_secret); - [CCode (cname = "oauth_proxy_new_with_token", has_construct_function = false, type = "RestProxy*")] - public OAuthProxy.with_token (string consumer_key, string consumer_secret, string token, string token_secret, string url_format, bool binding_required); - [NoAccessorMethod] - public string consumer_key { owned get; construct; } - [NoAccessorMethod] - public string consumer_secret { owned get; construct; } - public string token { get; set; } - public string token_secret { get; set; } - } - [CCode (cheader_filename = "rest/oauth-proxy-call.h")] - public class OAuthProxyCall : Rest.ProxyCall { - [CCode (has_construct_function = false)] - protected OAuthProxyCall (); - } - [CCode (cheader_filename = "rest/rest-proxy.h")] - public class Proxy : GLib.Object { - [CCode (has_construct_function = false)] - public Proxy (string url_format, bool binding_required); - public bool bind (...); - public virtual bool bind_valist (void* @params); - public static GLib.Quark error_quark (); - public unowned string get_user_agent (); - public virtual Rest.ProxyCall new_call (); - public void set_user_agent (string user_agent); - public bool simple_run (string payload, int64 len) throws GLib.Error; - public virtual bool simple_run_valist (string payload, int64 len, void* @params) throws GLib.Error; - [NoAccessorMethod] - public bool binding_required { get; set; } - [NoAccessorMethod] - public string url_format { owned get; set; } - public string user_agent { get; set; } - } - [CCode (cheader_filename = "rest/rest-proxy-call.h")] - public class ProxyCall : GLib.Object { - [CCode (has_construct_function = false)] - protected ProxyCall (); - public void add_header (string header, string value); - public void add_headers (...); - public void add_headers_from_valist (void* headers); - public void add_param (string param, string value); - public void add_params (...); - public void add_params_from_valist (void* @params); - public bool cancel (); - public static GLib.Quark error_quark (); - public unowned string get_method (); - public GLib.HashTable get_params (); - public unowned string get_payload (); - public int64 get_payload_length (); - public unowned GLib.HashTable get_response_headers (); - public uint get_status_code (); - public unowned string get_status_message (); - public unowned string lookup_header (string header); - public unowned string lookup_param (string param); - public unowned string lookup_response_header (string header); - [NoWrapper] - public virtual bool prepare () throws GLib.Error; - public void remove_header (string header); - public void remove_param (string param); - public bool run (out unowned GLib.MainLoop loop) throws GLib.Error; - [CCode (cname = "rest_proxy_call_async")] - public bool run_async ([CCode (delegate_target_pos = 2.9)] Rest.ProxyCallAsyncCallback callback, GLib.Object? weak_object) throws GLib.Error; - public void set_function (string function); - public void set_method (string method); - public bool sync () throws GLib.Error; - [NoAccessorMethod] - public Rest.Proxy proxy { owned get; construct; } - } - [CCode (cheader_filename = "rest/rest-xml-parser.h", ref_function = "rest_xml_node_ref", type_id = "rest_xml_node_get_type ()", unref_function = "rest_xml_node_unref")] - [Compact] - public class XmlNode { - public weak GLib.HashTable attrs; - public weak GLib.HashTable children; - public weak string content; - public weak string name; - public weak Rest.XmlNode next; - public int ref_count; - public unowned Rest.XmlNode find (string tag); - public unowned string get_attr (string attr_name); - } - [CCode (cheader_filename = "rest/rest-xml-parser.h")] - public class XmlParser : GLib.Object { - [CCode (has_construct_function = false)] - public XmlParser (); - public unowned Rest.XmlNode parse_from_data (string data, int64 len); - } - [CCode (cheader_filename = "rest/oauth-proxy.h", cprefix = "", has_type_id = false)] - public enum OAuthSignatureMethod { - PLAINTEXT, - HMAC_SHA1 - } - [CCode (cheader_filename = "rest/rest-proxy-call.h", cprefix = "REST_PROXY_CALL_")] - public errordomain ProxyCallError { - FAILED - } - [CCode (cheader_filename = "rest/rest-proxy.h", cprefix = "REST_PROXY_ERROR_")] - public errordomain ProxyError { - CANCELLED, - RESOLUTION, - CONNECTION, - SSL, - IO, - FAILED, - HTTP_MULTIPLE_CHOICES, - HTTP_MOVED_PERMANENTLY, - HTTP_FOUND, - HTTP_SEE_OTHER, - HTTP_NOT_MODIFIED, - HTTP_USE_PROXY, - HTTP_THREEOHSIX, - HTTP_TEMPORARY_REDIRECT, - HTTP_BAD_REQUEST, - HTTP_UNAUTHORIZED, - HTTP_FOUROHTWO, - HTTP_FORBIDDEN, - HTTP_NOT_FOUND, - HTTP_METHOD_NOT_ALLOWED, - HTTP_NOT_ACCEPTABLE, - HTTP_PROXY_AUTHENTICATION_REQUIRED, - HTTP_REQUEST_TIMEOUT, - HTTP_CONFLICT, - HTTP_GONE, - HTTP_LENGTH_REQUIRED, - HTTP_PRECONDITION_FAILED, - HTTP_REQUEST_ENTITY_TOO_LARGE, - HTTP_REQUEST_URI_TOO_LONG, - HTTP_UNSUPPORTED_MEDIA_TYPE, - HTTP_REQUESTED_RANGE_NOT_SATISFIABLE, - HTTP_EXPECTATION_FAILED, - HTTP_INTERNAL_SERVER_ERROR, - HTTP_NOT_IMPLEMENTED, - HTTP_BAD_GATEWAY, - HTTP_SERVICE_UNAVAILABLE, - HTTP_GATEWAY_TIMEOUT, - HTTP_HTTP_VERSION_NOT_SUPPORTED - } - [CCode (cheader_filename = "rest/oauth-proxy.h")] - public delegate void OAuthProxyAuthCallback (Rest.OAuthProxy proxy, GLib.Error? error, GLib.Object? weak_object); - [CCode (cheader_filename = "rest/rest-proxy-call.h")] - public delegate void ProxyCallAsyncCallback (Rest.ProxyCall call, GLib.Error? error, GLib.Object? weak_object); -} diff --git a/vapi/rest-extras-0.6.deps b/vapi/rest-extras-0.6.deps deleted file mode 100644 index 983560318..000000000 --- a/vapi/rest-extras-0.6.deps +++ /dev/null @@ -1 +0,0 @@ -rest-0.6 diff --git a/vapi/rest-extras-0.6.vapi b/vapi/rest-extras-0.6.vapi deleted file mode 100644 index 307bd14b2..000000000 --- a/vapi/rest-extras-0.6.vapi +++ /dev/null @@ -1,54 +0,0 @@ -/* rest-extras-0.6.vapi generated by vapigen, do not modify. */ - -namespace Rest { - [CCode (cheader_filename = "rest-extras/facebook-proxy.h", cname = "FacebookProxy")] - public class FacebookProxy : Rest.Proxy { - [CCode (cname = "facebook_proxy_new", has_construct_function = false, type = "RestProxy*")] - public FacebookProxy (string api_key, string app_secret); - [CCode (cname = "facebook_proxy_build_login_url")] - public unowned string build_login_url (string frob); - [CCode (cname = "facebook_proxy_build_permission_url")] - public unowned string build_permission_url (string perms); - [CCode (cname = "facebook_proxy_get_api_key")] - public unowned string get_api_key (); - [CCode (cname = "facebook_proxy_get_app_secret")] - public unowned string get_app_secret (); - [CCode (cname = "facebook_proxy_get_session_key")] - public unowned string get_session_key (); - [CCode (cname = "facebook_proxy_set_app_secret")] - public void set_app_secret (string secret); - [CCode (cname = "facebook_proxy_set_session_key")] - public void set_session_key (string session_key); - [CCode (cname = "facebook_proxy_sign")] - public unowned string sign (GLib.HashTable @params); - [CCode (cname = "facebook_proxy_new_with_session", has_construct_function = false, type = "RestProxy*")] - public FacebookProxy.with_session (string api_key, string app_secret, string session_key); - } - [CCode (cheader_filename = "rest-extras/facebook-proxy-call.h", cname = "FacebookProxyCall")] - public class FacebookProxyCall : Rest.ProxyCall { - } - [CCode (cheader_filename = "rest-extras/flickr-proxy.h", cname = "FlickrProxy")] - public class FlickrProxy : Rest.Proxy { - [CCode (cname = "flickr_proxy_new", has_construct_function = false, type = "RestProxy*")] - public FlickrProxy (string api_key, string shared_secret); - [CCode (cname = "flickr_proxy_build_login_url")] - public unowned string build_login_url (string frob); - [CCode (cname = "flickr_proxy_get_api_key")] - public unowned string get_api_key (); - [CCode (cname = "flickr_proxy_get_shared_secret")] - public unowned string get_shared_secret (); - [CCode (cname = "flickr_proxy_get_token")] - public unowned string get_token (); - [CCode (cname = "flickr_proxy_is_successful")] - public static bool is_successful (Rest.XmlNode root) throws GLib.Error; - [CCode (cname = "flickr_proxy_set_token")] - public void set_token (string token); - [CCode (cname = "flickr_proxy_sign")] - public unowned string sign (GLib.HashTable @params); - [CCode (cname = "flickr_proxy_new_with_token", has_construct_function = false, type = "RestProxy*")] - public FlickrProxy.with_token (string api_key, string shared_secret, string token); - } - [CCode (cheader_filename = "rest-extras/flickr-proxy-call.h", cname = "FlickrProxyCall")] - public class FlickrProxyCall : Rest.ProxyCall { - } -}