gdk-pixbuf-2.0: Update to 2.22.1

diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index 94863428aca2eb6585b76e8989a6e94e9319af6d..1b84d08620fb50a5965a56d4062c4a50178178ec 100644 (file)
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -3,7 +3,7 @@
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_", gir_namespace = "GdkPixbuf", gir_version = "2.0")]
 namespace Gdk {
        [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-       public class Pixbuf : GLib.Object {
+       public class Pixbuf : GLib.Object, GLib.Icon {
                [CCode (has_construct_function = false)]
                public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
                public unowned Gdk.Pixbuf add_alpha (bool substitute_color, uchar r, uchar g, uchar b);
@@ -89,8 +89,9 @@ namespace Gdk {
                public bool on_currently_loading_frame ();
        }
        [Compact]
-       [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+       [CCode (copy_function = "gdk_pixbuf_format_copy", type_id = "GDK_TYPE_PIXBUF_FORMAT", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
        public class PixbufFormat {
+               public unowned Gdk.PixbufFormat copy ();
                public unowned string get_description ();
                [CCode (array_length = false, array_null_terminated = true)]
                public string[] get_extensions ();

diff --git a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files
index 0bd636af65591a094601981f7a277aa108c13d2d..d9c3a2631628d0895cf3a40f59a7f942fbb6450b 100644 (file)
--- a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files
+++ b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files
@@ -1,3 +1,3 @@
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
-include/gtk-2.0/gdk-pixbuf
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h
+include/gdk-pixbuf-2.0/gdk-pixbuf
 lib/libgdk_pixbuf-2.0.so

diff --git a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi
index d9ad699002981fa552dd94d3e056ca2aeb2bbfe9..7e8557a2801f51b6d5f24d6886ce1f7a3f7e8e99 100644 (file)
--- a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi
+++ b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi
@@ -17,7 +17,62 @@
                                <parameter name="data" type="gpointer"/>
                        </parameters>
                </callback>
-               <struct name="GdkPixbufFormat">
+               <struct name="GdkPixbufSimpleAnimClass">
+               </struct>
+               <struct name="GdkPixdata">
+                       <method name="deserialize" symbol="gdk_pixdata_deserialize">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="pixdata" type="GdkPixdata*"/>
+                                       <parameter name="stream_length" type="guint"/>
+                                       <parameter name="stream" type="guint8*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </method>
+                       <method name="from_pixbuf" symbol="gdk_pixdata_from_pixbuf">
+                               <return-type type="gpointer"/>
+                               <parameters>
+                                       <parameter name="pixdata" type="GdkPixdata*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="use_rle" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="serialize" symbol="gdk_pixdata_serialize">
+                               <return-type type="guint8*"/>
+                               <parameters>
+                                       <parameter name="pixdata" type="GdkPixdata*"/>
+                                       <parameter name="stream_length_p" type="guint*"/>
+                               </parameters>
+                       </method>
+                       <method name="to_csource" symbol="gdk_pixdata_to_csource">
+                               <return-type type="GString*"/>
+                               <parameters>
+                                       <parameter name="pixdata" type="GdkPixdata*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="dump_type" type="GdkPixdataDumpType"/>
+                               </parameters>
+                       </method>
+                       <field name="magic" type="guint32"/>
+                       <field name="length" type="gint32"/>
+                       <field name="pixdata_type" type="guint32"/>
+                       <field name="rowstride" type="guint32"/>
+                       <field name="width" type="guint32"/>
+                       <field name="height" type="guint32"/>
+                       <field name="pixel_data" type="guint8*"/>
+               </struct>
+               <boxed name="GdkPixbufFormat" type-name="GdkPixbufFormat" get-type="gdk_pixbuf_format_get_type">
+                       <method name="copy" symbol="gdk_pixbuf_format_copy">
+                               <return-type type="GdkPixbufFormat*"/>
+                               <parameters>
+                                       <parameter name="format" type="GdkPixbufFormat*"/>
+                               </parameters>
+                       </method>
+                       <method name="free" symbol="gdk_pixbuf_format_free">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="format" type="GdkPixbufFormat*"/>
+                               </parameters>
+                       </method>
                        <method name="get_description" symbol="gdk_pixbuf_format_get_description">
                                <return-type type="gchar*"/>
                                <parameters>
@@ -73,50 +128,7 @@
                                        <parameter name="disabled" type="gboolean"/>
                                </parameters>
                        </method>
-               </struct>
-               <struct name="GdkPixbufSimpleAnimClass">
-               </struct>
-               <struct name="GdkPixdata">
-                       <method name="deserialize" symbol="gdk_pixdata_deserialize">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="pixdata" type="GdkPixdata*"/>
-                                       <parameter name="stream_length" type="guint"/>
-                                       <parameter name="stream" type="guint8*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <method name="from_pixbuf" symbol="gdk_pixdata_from_pixbuf">
-                               <return-type type="gpointer"/>
-                               <parameters>
-                                       <parameter name="pixdata" type="GdkPixdata*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
-                                       <parameter name="use_rle" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="serialize" symbol="gdk_pixdata_serialize">
-                               <return-type type="guint8*"/>
-                               <parameters>
-                                       <parameter name="pixdata" type="GdkPixdata*"/>
-                                       <parameter name="stream_length_p" type="guint*"/>
-                               </parameters>
-                       </method>
-                       <method name="to_csource" symbol="gdk_pixdata_to_csource">
-                               <return-type type="GString*"/>
-                               <parameters>
-                                       <parameter name="pixdata" type="GdkPixdata*"/>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="dump_type" type="GdkPixdataDumpType"/>
-                               </parameters>
-                       </method>
-                       <field name="magic" type="guint32"/>
-                       <field name="length" type="gint32"/>
-                       <field name="pixdata_type" type="guint32"/>
-                       <field name="rowstride" type="guint32"/>
-                       <field name="width" type="guint32"/>
-                       <field name="height" type="guint32"/>
-                       <field name="pixel_data" type="guint8*"/>
-               </struct>
+               </boxed>
                <enum name="GdkColorspace" type-name="GdkColorspace" get-type="gdk_colorspace_get_type">
                        <member name="GDK_COLORSPACE_RGB" value="0"/>
                </enum>
@@ -165,6 +177,9 @@
                        <member name="GDK_PIXDATA_ENCODING_MASK" value="251658240"/>
                </enum>
                <object name="GdkPixbuf" parent="GObject" type-name="GdkPixbuf" get-type="gdk_pixbuf_get_type">
+                       <implements>
+                               <interface name="GIcon"/>
+                       </implements>
                        <method name="add_alpha" symbol="gdk_pixbuf_add_alpha">
                                <return-type type="GdkPixbuf*"/>
                                <parameters>
@@ -755,9 +770,9 @@
                <constant name="GDK_PIXBUF_FEATURES_H" type="int" value="1"/>
                <constant name="GDK_PIXBUF_MAGIC_NUMBER" type="int" value="1197763408"/>
                <constant name="GDK_PIXBUF_MAJOR" type="int" value="2"/>
-               <constant name="GDK_PIXBUF_MICRO" type="int" value="0"/>
-               <constant name="GDK_PIXBUF_MINOR" type="int" value="20"/>
-               <constant name="GDK_PIXBUF_VERSION" type="char*" value="2.20.0"/>
+               <constant name="GDK_PIXBUF_MICRO" type="int" value="1"/>
+               <constant name="GDK_PIXBUF_MINOR" type="int" value="22"/>
+               <constant name="GDK_PIXBUF_VERSION" type="char*" value="2.22.1"/>
                <constant name="GDK_PIXDATA_HEADER_LENGTH" type="int" value="24"/>
        </namespace>
 </api>