pango: Update from 1.45.1

diff --git a/vapi/metadata/Pango-1.0.metadata b/vapi/metadata/Pango-1.0.metadata
index 506d55fd8e65f2fcbbcd43dcb44cb7332413f988..e1ebdd2bf385eb880e9314aa801bba96f31adb38 100644 (file)
--- 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 a73e7680ce2a54426078abd463435569cd1d725e..bf0240d3f2282707215cb1c45f469717aa5de9ad 100644 (file)
--- 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 ac769a3b9358a6bb54a5a1bdf15cdac33dc59fb6..e7ae38f8170672c39d5786c5d840c3e43d0fdb08 100644 (file)
--- 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 f81c6ee41973c69b0952b239b77e2d8fc283f426..d0bfc820a79b55cd496f74e3ebf787622a6ab707 100644 (file)
--- 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")]