gdk-pixbuf-2.0: Update to 2.37.0~5ec6746e

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index acc3e85d95b5305e02d6093528018202363d98b7..a8d669dda763f98db7f64463ad3c1373ea8447f9 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -443,7 +443,7 @@ gdk-3.0:
        $(GENVAPI) --library $(srcdir)/gdk-3.0 --pkg gio-2.0 --metadatadir $(METADATADIR) $(METADATADIR)/Gdk-3.0-custom.vala $(GIRDIR)/Gdk-3.0.gir
 
 gdk-pixbuf-2.0:
-       $(GENVAPI) --library $(srcdir)/gdk-pixbuf-2.0 --pkg gio-2.0 --metadatadir $(METADATADIR) $(METADATADIR)/GdkPixbuf-2.0-custom.vala $(GIRDIR)/GdkPixbuf-2.0.gir
+       $(GENVAPI) --library $(srcdir)/gdk-pixbuf-2.0 --pkg gio-2.0 --metadatadir $(METADATADIR) $(METADATADIR)/GdkPixbuf-2.0-custom.vala $(GIRDIR)/GdkPixdata-2.0.gir $(GIRDIR)/GdkPixbuf-2.0.gir
 
 gdk-x11-2.0:
        $(GENVAPI) --library $(srcdir)/gdk-x11-2.0 $(PACKAGESDIR)/gdk-x11-2.0/gdk-x11-2.0-custom.vala $(PACKAGESDIR)/gdk-x11-2.0/gdk-x11-2.0.gi

diff --git a/vapi/metadata/GdkPixbuf-2.0-custom.vala b/vapi/metadata/GdkPixbuf-2.0-custom.vala
index 439d2705c233150c40f5ff96e7c006ff606d5a2b..df3c079022087d1db3ee6f153f4a21cd7c210d60 100644 (file)
--- a/vapi/metadata/GdkPixbuf-2.0-custom.vala
+++ b/vapi/metadata/GdkPixbuf-2.0-custom.vala
@@ -2,6 +2,12 @@ namespace Gdk {
        public class Pixbuf : GLib.Object {
                [CCode (has_construct_function = false, cname = "gdk_pixbuf_new_from_data")]
                public Pixbuf.with_unowned_data ([CCode (array_length = false)] uint8[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, [CCode (type = "GdkPixbufDestroyNotify")] Gdk.PixbufDestroyNotify? destroy_fn = null);
+               [CCode (has_construct_function = false)]
+               [Version (deprecated = true, deprecated_since = "2.32")]
+               public Pixbuf.from_inline ([CCode (array_length_cname = "data_length", array_length_pos = 0.5)] uint8[] data, bool copy_pixels = true) throws GLib.Error;
+               [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+               [Version (deprecated = true, deprecated_since = "2.32")]
+               public static Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels = true) throws GLib.Error;
        }
 
        [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", instance_pos = -0.9)]

diff --git a/vapi/metadata/GdkPixbuf-2.0.metadata b/vapi/metadata/GdkPixbuf-2.0.metadata
index 633f6a22a7b865743bab9f2838aac7f6069d42a1..d8eb9217448f7f6cfd393a619ba44705584d0ad3 100644 (file)
--- a/vapi/metadata/GdkPixbuf-2.0.metadata
+++ b/vapi/metadata/GdkPixbuf-2.0.metadata
@@ -6,6 +6,7 @@ Pixbuf
         .new_from_stream_at_scale_async symbol_type="constructor" finish_name="gdk_pixbuf_new_from_stream_finish" throws="GLib.Error"
         .new_from_stream_finish skip
         .new_from_data.data owned
+        .new_from_inline skip
         .new_subpixbuf symbol_type="constructor"
         .get_file_info_async.cancellable default=()
         .save* skip=false
@@ -20,19 +21,9 @@ Pixbuf
         .save_to_stream_async finish_name="gdk_pixbuf_save_to_stream_finish" finish_instance=false sentinel="NULL" throws="GLib.Error"
         .save_to_stream_finish skip
 
-// gdk-pixdata.h isn't included by gdk-pixbuf.h
-Pixdata* cheader_filename="gdk-pixbuf/gdk-pixdata.h"
-Pixbuf
-        .from_pixdata cheader_filename="gdk-pixbuf/gdk-pixdata.h"
-
 // default values other than null
 Pixbuf
         .new_from_data.destroy_fn default=GLib.free
 
-// Bug #558620: default values
-Pixbuf
-        .from_pixdata.copy_pixels default=true
-        .new_from_inline.copy_pixels default=true
-
 // Bug #666798: delegates which throw exceptions
 PixbufSaveFunc skip

diff --git a/vapi/metadata/GdkPixdata-2.0.metadata b/vapi/metadata/GdkPixdata-2.0.metadata
new file mode 100644 (file)
index 0000000..8b9614a
--- /dev/null
+++ b/vapi/metadata/GdkPixdata-2.0.metadata
@@ -0,0 +1,3 @@
+Pixdata* cheader_filename="gdk-pixbuf/gdk-pixdata.h"
+
+pixbuf_from_pixdata skip