pango, pangocairo: update to git master

This adds a lot of nullability fixes from bug #731022

diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index e75a9c1dd1fb523a23147a7aa7665de9f3fb62d5..b6604bc79eb37549929be7d9f951416a7352e14a 100644 (file)
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -72,7 +72,7 @@ namespace Pango {
                [CCode (has_construct_function = false)]
                public AttrList ();
                public void change (owned Pango.Attribute attr);
-               public Pango.AttrList copy ();
+               public Pango.AttrList? copy ();
                public Pango.AttrList? filter (Pango.AttrFilterFunc func);
                public Pango.AttrIterator get_iterator ();
                public void insert (owned Pango.Attribute attr);
@@ -134,8 +134,8 @@ namespace Pango {
                public Pango.FontMetrics get_metrics (Pango.FontDescription? desc, Pango.Language? language);
                public uint get_serial ();
                public void list_families ([CCode (array_length_cname = "n_families", array_length_pos = 1.1)] out Pango.FontFamily[] families);
-               public Pango.Font load_font (Pango.FontDescription desc);
-               public Pango.Fontset load_fontset (Pango.FontDescription desc, Pango.Language language);
+               public Pango.Font? load_font (Pango.FontDescription desc);
+               public Pango.Fontset? load_fontset (Pango.FontDescription desc, Pango.Language language);
                public void set_base_dir (Pango.Direction direction);
                public void set_base_gravity (Pango.Gravity gravity);
                public void set_font_description (Pango.FontDescription desc);
@@ -199,12 +199,12 @@ namespace Pango {
                [CCode (has_construct_function = false)]
                public FontDescription ();
                public bool better_match (Pango.FontDescription? old_match, Pango.FontDescription new_match);
-               public Pango.FontDescription copy ();
-               public Pango.FontDescription copy_static ();
+               public Pango.FontDescription? copy ();
+               public Pango.FontDescription? copy_static ();
                public bool equal (Pango.FontDescription desc2);
                public void free ();
                public static Pango.FontDescription from_string (string str);
-               public unowned string get_family ();
+               public unowned string? get_family ();
                public Pango.Gravity get_gravity ();
                public Pango.FontMask get_set_fields ();
                public int get_size ();
@@ -236,7 +236,7 @@ namespace Pango {
                public virtual Pango.FontDescription describe ();
                public virtual unowned string get_face_name ();
                public virtual bool is_synthesized ();
-               public virtual void list_sizes ([CCode (array_length_cname = "n_sizes", array_length_pos = 1.1)] out int[] sizes);
+               public virtual void list_sizes ([CCode (array_length_cname = "n_sizes", array_length_pos = 1.1)] out int[]? sizes);
        }
        [CCode (cheader_filename = "pango/pango.h", type_id = "pango_font_family_get_type ()")]
        public abstract class FontFamily : GLib.Object {
@@ -255,8 +255,8 @@ namespace Pango {
                public virtual uint get_serial ();
                public unowned string get_shape_engine_type ();
                public virtual void list_families ([CCode (array_length_cname = "n_families", array_length_pos = 1.1)] out Pango.FontFamily[] families);
-               public virtual Pango.Font load_font (Pango.Context context, Pango.FontDescription desc);
-               public virtual Pango.Fontset load_fontset (Pango.Context context, Pango.FontDescription desc, Pango.Language language);
+               public virtual Pango.Font? load_font (Pango.Context context, Pango.FontDescription desc);
+               public virtual Pango.Fontset? load_fontset (Pango.Context context, Pango.FontDescription desc, Pango.Language language);
        }
        [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_font_metrics_ref", type_id = "pango_font_metrics_get_type ()", unref_function = "pango_font_metrics_unref")]
        [Compact]
@@ -280,7 +280,7 @@ namespace Pango {
                public int get_strikethrough_thickness ();
                public int get_underline_position ();
                public int get_underline_thickness ();
-               public Pango.FontMetrics @ref ();
+               public Pango.FontMetrics? @ref ();
                public void unref ();
        }
        [CCode (cheader_filename = "pango/pango.h", type_id = "pango_fontset_get_type ()")]
@@ -306,7 +306,7 @@ namespace Pango {
                public weak Pango.GlyphString glyphs;
                public weak Pango.Item item;
                public GLib.SList<Pango.GlyphItem> apply_attrs (string text, Pango.AttrList list);
-               public Pango.GlyphItem copy ();
+               public Pango.GlyphItem? copy ();
                public void free ();
                public void get_logical_widths (string text, [CCode (array_length = false)] int[] logical_widths);
                public void letter_space (string text, [CCode (array_length = false)] Pango.LogAttr[] log_attrs, int letter_spacing);
@@ -322,7 +322,7 @@ namespace Pango {
                public int num_glyphs;
                [CCode (has_construct_function = false)]
                public GlyphString ();
-               public Pango.GlyphString copy ();
+               public Pango.GlyphString? copy ();
                public void extents (Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
                public void extents_range (int start, int end, Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
                public void free ();
@@ -341,18 +341,18 @@ namespace Pango {
                public int offset;
                [CCode (has_construct_function = false)]
                public Item ();
-               public Pango.Item copy ();
+               public Pango.Item? copy ();
                public void free ();
                public Pango.Item split (int split_index, int split_offset);
        }
        [CCode (cheader_filename = "pango/pango.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "pango_language_get_type ()")]
        [Compact]
        public class Language {
-               public static unowned Pango.Language from_string (string? language);
+               public static unowned Pango.Language? from_string (string? language);
                public static unowned Pango.Language get_default ();
                public unowned string get_sample_string ();
                [CCode (array_length_pos = 0.1)]
-               public unowned Pango.Script[] get_scripts ();
+               public unowned Pango.Script[]? get_scripts ();
                public bool includes_script (Pango.Script script);
                public bool matches (string range_list);
                public unowned string to_string ();
@@ -377,9 +377,9 @@ namespace Pango {
                public int get_indent ();
                public Pango.LayoutIter get_iter ();
                public bool get_justify ();
-               public unowned Pango.LayoutLine get_line (int line);
+               public unowned Pango.LayoutLine? get_line (int line);
                public int get_line_count ();
-               public unowned Pango.LayoutLine get_line_readonly (int line);
+               public unowned Pango.LayoutLine? get_line_readonly (int line);
                public unowned GLib.SList<Pango.LayoutLine> get_lines ();
                public unowned GLib.SList<Pango.LayoutLine> get_lines_readonly ();
                public void get_log_attrs ([CCode (array_length_cname = "n_attrs", array_length_pos = 1.1)] out Pango.LogAttr[] attrs);
@@ -391,7 +391,7 @@ namespace Pango {
                public bool get_single_paragraph_mode ();
                public void get_size (out int width, out int height);
                public int get_spacing ();
-               public Pango.TabArray get_tabs ();
+               public Pango.TabArray? get_tabs ();
                public unowned string get_text ();
                public int get_unknown_glyphs_count ();
                public int get_width ();
@@ -423,7 +423,7 @@ namespace Pango {
        [Compact]
        public class LayoutIter {
                public bool at_last_line ();
-               public Pango.LayoutIter copy ();
+               public Pango.LayoutIter? copy ();
                public void free ();
                public int get_baseline ();
                public Pango.Rectangle get_char_extents ();
@@ -435,9 +435,9 @@ namespace Pango {
                public void get_line_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
                public unowned Pango.LayoutLine get_line_readonly ();
                public void get_line_yrange (out int y0_, out int y1_);
-               public unowned Pango.LayoutRun get_run ();
+               public unowned Pango.LayoutRun? get_run ();
                public void get_run_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-               public unowned Pango.LayoutRun get_run_readonly ();
+               public unowned Pango.LayoutRun? get_run_readonly ();
                public bool next_char ();
                public bool next_cluster ();
                public bool next_line ();
@@ -495,8 +495,8 @@ namespace Pango {
                [NoWrapper]
                public virtual void end ();
                public unowned Pango.Color? get_color (Pango.RenderPart part);
-               public unowned Pango.Layout get_layout ();
-               public unowned Pango.LayoutLine get_layout_line ();
+               public unowned Pango.Layout? get_layout ();
+               public unowned Pango.LayoutLine? get_layout_line ();
                public unowned Pango.Matrix? get_matrix ();
                public virtual void part_changed (Pango.RenderPart part);
                [NoWrapper]
@@ -686,7 +686,7 @@ namespace Pango {
                ABSOLUTE_SIZE,
                GRAVITY,
                GRAVITY_HINT;
-               public static unowned string get_name (Pango.AttrType type);
+               public static unowned string? get_name (Pango.AttrType type);
                public static Pango.AttrType register (string name);
        }
        [CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_BIDI_TYPE_", type_id = "pango_bidi_type_get_type ()")]
@@ -754,7 +754,7 @@ namespace Pango {
                NORTH,
                WEST,
                AUTO;
-               public static Pango.Gravity get_for_matrix (Pango.Matrix matrix);
+               public static Pango.Gravity get_for_matrix (Pango.Matrix? matrix);
                public static Pango.Gravity get_for_script (Pango.Script script, Pango.Gravity base_gravity, Pango.GravityHint hint);
                public static Pango.Gravity get_for_script_and_width (Pango.Script script, bool wide, Pango.Gravity base_gravity, Pango.GravityHint hint);
                public static double to_rotation (Pango.Gravity gravity);
@@ -864,7 +864,7 @@ namespace Pango {
                SORA_SOMPENG,
                TAKRI;
                public static Pango.Script for_unichar (unichar ch);
-               public static Pango.Language get_sample_language (Pango.Script script);
+               public static Pango.Language? get_sample_language (Pango.Script script);
        }
        [CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_STRETCH_", type_id = "pango_stretch_get_type ()")]
        public enum Stretch {
@@ -1006,11 +1006,11 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pango.h")]
        public static void @break (string text, int length, Pango.Analysis analysis, [CCode (array_length_cname = "attrs_len", array_length_pos = 4.1)] Pango.LogAttr[] attrs);
        [CCode (cheader_filename = "pango/pango.h")]
-       public static string config_key_get (string key);
+       public static string? config_key_get (string key);
        [CCode (cheader_filename = "pango/pango.h")]
-       public static string config_key_get_system (string key);
+       public static string? config_key_get_system (string key);
        [CCode (cheader_filename = "pango/pango.h")]
-       public static void default_break (string text, int length, Pango.Analysis analysis, Pango.LogAttr attrs, int attrs_len);
+       public static void default_break (string text, int length, Pango.Analysis? analysis, Pango.LogAttr attrs, int attrs_len);
        [CCode (cheader_filename = "pango/pango.h")]
        public static void extents_to_pixels (Pango.Rectangle? inclusive, Pango.Rectangle? nearest);
        [CCode (cheader_filename = "pango/pango.h")]
@@ -1101,7 +1101,7 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pango.h")]
        public static int version ();
        [CCode (cheader_filename = "pango/pango.h")]
-       public static unowned string version_check (int required_major, int required_minor, int required_micro);
+       public static unowned string? version_check (int required_major, int required_minor, int required_micro);
        [CCode (cheader_filename = "pango/pango.h")]
        public static unowned string version_string ();
 }

diff --git a/vapi/pangocairo.vapi b/vapi/pangocairo.vapi
index ce282babb51f3d86175fb869f516ade1fa31990b..11230463aa44ef56168faf48f0a4cd4702fd36e3 100644 (file)
--- a/vapi/pangocairo.vapi
+++ b/vapi/pangocairo.vapi
@@ -5,7 +5,7 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pangocairo.h", type_id = "pango_cairo_font_get_type ()")]
        [GIR (name = "Font")]
        public interface CairoFont : Pango.Font {
-               public unowned Cairo.ScaledFont get_scaled_font ();
+               public unowned Cairo.ScaledFont? get_scaled_font ();
        }
        [CCode (cheader_filename = "pango/pangocairo.h", type_id = "pango_cairo_font_map_get_type ()")]
        [GIR (name = "FontMap")]
@@ -16,24 +16,24 @@ namespace Pango {
                public Cairo.FontType get_font_type ();
                public double get_resolution ();
                public static Pango.FontMap @new ();
-               public static Pango.FontMap new_for_font_type (Cairo.FontType fonttype);
+               public static Pango.FontMap? new_for_font_type (Cairo.FontType fonttype);
                public void set_default ();
                public void set_resolution (double dpi);
        }
        [CCode (cheader_filename = "pango/pangocairo.h", instance_pos = 3.9)]
        public delegate void CairoShapeRendererFunc (Cairo.Context cr, Pango.AttrShape attr, bool do_path);
        [CCode (cheader_filename = "pango/pangocairo.h")]
-       public static unowned Cairo.FontOptions cairo_context_get_font_options (Pango.Context context);
+       public static unowned Cairo.FontOptions? cairo_context_get_font_options (Pango.Context context);
        [CCode (cheader_filename = "pango/pangocairo.h")]
        public static double cairo_context_get_resolution (Pango.Context context);
        [CCode (cheader_filename = "pango/pangocairo.h")]
-       public static unowned Pango.CairoShapeRendererFunc cairo_context_get_shape_renderer (Pango.Context context);
+       public static unowned Pango.CairoShapeRendererFunc? cairo_context_get_shape_renderer (Pango.Context context);
        [CCode (cheader_filename = "pango/pangocairo.h")]
-       public static void cairo_context_set_font_options (Pango.Context context, Cairo.FontOptions options);
+       public static void cairo_context_set_font_options (Pango.Context context, Cairo.FontOptions? options);
        [CCode (cheader_filename = "pango/pangocairo.h")]
        public static void cairo_context_set_resolution (Pango.Context context, double dpi);
        [CCode (cheader_filename = "pango/pangocairo.h")]
-       public static void cairo_context_set_shape_renderer (Pango.Context context, owned Pango.CairoShapeRendererFunc func);
+       public static void cairo_context_set_shape_renderer (Pango.Context context, owned Pango.CairoShapeRendererFunc? func);
        [CCode (cheader_filename = "pango/pangocairo.h")]
        public static Pango.Context cairo_create_context (Cairo.Context cr);
        [CCode (cheader_filename = "pango/pangocairo.h")]
@@ -45,7 +45,7 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pangocairo.h")]
        public static Pango.FontMap cairo_font_map_new ();
        [CCode (cheader_filename = "pango/pangocairo.h")]
-       public static Pango.FontMap cairo_font_map_new_for_font_type (Cairo.FontType fonttype);
+       public static Pango.FontMap? cairo_font_map_new_for_font_type (Cairo.FontType fonttype);
        [CCode (cheader_filename = "pango/pangocairo.h")]
        public static void cairo_glyph_string_path (Cairo.Context cr, Pango.Font font, Pango.GlyphString glyphs);
        [CCode (cheader_filename = "pango/pangocairo.h")]