librsvg-2.0: Update to 2.26.0, remove librsvg-2.0-custom.vala

diff --git a/vapi/librsvg-2.0.vapi b/vapi/librsvg-2.0.vapi
index 0b0e22f7fad797ecce053944929c583496cfd38f..52c61b9420b4fbdb69b66471db1e9193dec1b40a 100644 (file)
--- a/vapi/librsvg-2.0.vapi
+++ b/vapi/librsvg-2.0.vapi
@@ -4,6 +4,8 @@
 namespace Rsvg {
        [CCode (cheader_filename = "librsvg/rsvg.h")]
        public class Handle : GLib.Object {
+               [CCode (has_construct_function = false)]
+               public Handle ();
                public bool close () throws GLib.Error;
                public void free ();
                [CCode (has_construct_function = false)]
@@ -20,8 +22,6 @@ namespace Rsvg {
                public bool get_position_sub (ref Rsvg.PositionData position_data, string id);
                public unowned string get_title ();
                public bool has_sub (string id);
-               [CCode (has_construct_function = false)]
-               public Handle ();
                public bool render_cairo (Cairo.Context cr);
                public bool render_cairo_sub (Cairo.Context cr, string id);
                public void set_base_uri (string base_uri);
@@ -46,14 +46,14 @@ namespace Rsvg {
                [NoAccessorMethod]
                public int width { get; }
        }
-       [CCode (cheader_filename = "librsvg/rsvg.h")]
+       [CCode (has_type_id = false, cheader_filename = "librsvg/rsvg.h")]
        public struct DimensionData {
                public int width;
                public int height;
                public double em;
                public double ex;
        }
-       [CCode (cheader_filename = "librsvg/rsvg.h")]
+       [CCode (has_type_id = false, cheader_filename = "librsvg/rsvg.h")]
        public struct PositionData {
                public int x;
                public int y;

diff --git a/vapi/packages/librsvg-2.0/librsvg-2.0-custom.vala b/vapi/packages/librsvg-2.0/librsvg-2.0-custom.vala
deleted file mode 100644 (file)
index d1ff0f5..0000000
--- a/vapi/packages/librsvg-2.0/librsvg-2.0-custom.vala
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Rsvg {
-       public class Handle {
-               [CCode (cheader_filename = "librsvg/rsvg-cairo.h")]
-               public bool render_cairo (Cairo.Context cr);
-               [CCode (cheader_filename = "librsvg/rsvg-cairo.h")]
-               public bool render_cairo_sub (Cairo.Context cr, string id);
-       }
-}
\ No newline at end of file

diff --git a/vapi/packages/librsvg-2.0/librsvg-2.0.gi b/vapi/packages/librsvg-2.0/librsvg-2.0.gi
index 272a6043518f5a176e8acc0f238c373aaffdedd9..65d22a758c7470864777f3d4e7a421ef40785be7 100644 (file)
--- a/vapi/packages/librsvg-2.0/librsvg-2.0.gi
+++ b/vapi/packages/librsvg-2.0/librsvg-2.0.gi
@@ -202,6 +202,21 @@
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </constructor>
+                       <method name="render_cairo" symbol="rsvg_handle_render_cairo">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="handle" type="RsvgHandle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                               </parameters>
+                       </method>
+                       <method name="render_cairo_sub" symbol="rsvg_handle_render_cairo_sub">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="handle" type="RsvgHandle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="id" type="char*"/>
+                               </parameters>
+                       </method>
                        <method name="set_base_uri" symbol="rsvg_handle_set_base_uri">
                                <return-type type="void"/>
                                <parameters>