From 8c801baa4ffe3eb8b48a8f68291f30edb02824c7 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Mon, 8 Jun 2020 20:37:43 +0200 Subject: [PATCH] pango: Update from 1.45.1 --- vapi/metadata/Pango-1.0.metadata | 12 ------------ vapi/metadata/PangoCairo-1.0.metadata | 14 ++++---------- vapi/pango.vapi | 6 ++++-- vapi/pangocairo.vapi | 2 -- 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/vapi/metadata/Pango-1.0.metadata b/vapi/metadata/Pango-1.0.metadata index 506d55fd8..e1ebdd2bf 100644 --- a/vapi/metadata/Pango-1.0.metadata +++ b/vapi/metadata/Pango-1.0.metadata @@ -25,8 +25,6 @@ AttrColor GlyphString .glyphs unowned=false array_length_field="num_glyphs" .log_clusters array unowned=false array_length_field="num_glyphs" -LayoutLine - .runs type_arguments="Pango.LayoutRun" // G-I doesn't support non-GObject, non-GBoxed return values AttrIterator @@ -42,16 +40,6 @@ Font .find_shaper skip=false .get_coverage skip=false -// Nullability of return values -AttrIterator - .get nullable -AttrList - .filter nullable -Font - .get_font_map nullable -Layout - .get_font_description nullable - // Variadic TabArray .new_with_positions skip=false diff --git a/vapi/metadata/PangoCairo-1.0.metadata b/vapi/metadata/PangoCairo-1.0.metadata index a73e7680c..bf0240d3f 100644 --- a/vapi/metadata/PangoCairo-1.0.metadata +++ b/vapi/metadata/PangoCairo-1.0.metadata @@ -1,12 +1,6 @@ -* name="(.+)/Cairo\\1" -*#function name="(.+)/cairo_\\1" skip=false -PangoCairo name="Pango" cprefix="Pango" lower_case_cprefix="pango_" +* skip=false +*.* skip=false // Report upstream -PangoCairo cheader_filename="pango/pangocairo.h" -*.* skip=false -ShapeRendererFunc.data closure=3 -context_get_shape_renderer.context closure=1 -create_* unowned=false -Font.get_scaled_font unowned -FontMap.set_default symbol_type="function" +cairo_context_get_shape_renderer.context closure=1 +CairoFontMap.set_default symbol_type="function" diff --git a/vapi/pango.vapi b/vapi/pango.vapi index ac769a3b9..e7ae38f81 100644 --- a/vapi/pango.vapi +++ b/vapi/pango.vapi @@ -84,6 +84,8 @@ namespace Pango { public AttrList (); public void change (owned Pango.Attribute attr); public Pango.AttrList? copy (); + [Version (since = "1.46")] + public bool equal (Pango.AttrList other_list); [Version (since = "1.2")] public Pango.AttrList? filter (Pango.AttrFilterFunc func); [Version (since = "1.44")] @@ -311,7 +313,7 @@ namespace Pango { [CCode (has_construct_function = false)] protected FontFamily (); [Version (since = "1.46")] - public virtual unowned Pango.FontFace? get_face (string name); + public virtual unowned Pango.FontFace? get_face (string? name); public virtual unowned string get_name (); [Version (since = "1.4")] public virtual bool is_monospace (); @@ -450,7 +452,7 @@ namespace Pango { public void context_changed (); public Pango.Layout copy (); public Pango.Alignment get_alignment (); - public unowned Pango.AttrList get_attributes (); + public unowned Pango.AttrList? get_attributes (); [Version (since = "1.4")] public bool get_auto_dir (); [Version (since = "1.22")] diff --git a/vapi/pangocairo.vapi b/vapi/pangocairo.vapi index f81c6ee41..d0bfc820a 100644 --- a/vapi/pangocairo.vapi +++ b/vapi/pangocairo.vapi @@ -3,13 +3,11 @@ [CCode (cprefix = "Pango", gir_namespace = "PangoCairo", gir_version = "1.0", lower_case_cprefix = "pango_")] namespace Pango { [CCode (cheader_filename = "pango/pangocairo.h", type_id = "pango_cairo_font_get_type ()")] - [GIR (name = "Font")] [Version (since = "1.18")] public interface CairoFont : Pango.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")] [Version (since = "1.10")] public interface CairoFontMap : Pango.FontMap { [Version (deprecated = true, deprecated_since = "1.22", since = "1.10")] -- 2.47.2