From 3c501182f3cd805ed23b9e3e752290b7d3af1a00 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Mon, 17 Feb 2020 09:47:37 +0100 Subject: [PATCH] pango: Update and add harfbuzz-gobject as dependency See https://gitlab.gnome.org/GNOME/pango/issues/458 --- vapi/Makefile.am | 2 +- vapi/pango.deps | 1 + vapi/pango.vapi | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 2a2e12cfe..9f8a82056 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -671,7 +671,7 @@ packagekit-glib2: $(GENVAPI) --library $(srcdir)/packagekit-glib2 --metadatadir $(METADATADIR) --pkg gio-2.0 $(GIRDIR)/PackageKitGlib-1.0.gir pango: - $(GENVAPI) --library $(srcdir)/pango --metadatadir $(METADATADIR) $(METADATADIR)/Pango-1.0-custom.vala $(GIRDIR)/Pango-1.0.gir + $(GENVAPI) --library $(srcdir)/pango --pkg cairo --pkg harfbuzz-gobject --metadatadir $(METADATADIR) $(METADATADIR)/Pango-1.0-custom.vala $(GIRDIR)/Pango-1.0.gir pangocairo: $(GENVAPI) --library $(srcdir)/pangocairo --metadatadir $(METADATADIR) $(GIRDIR)/PangoCairo-1.0.gir diff --git a/vapi/pango.deps b/vapi/pango.deps index 129fe166f..75430e6b4 100644 --- a/vapi/pango.deps +++ b/vapi/pango.deps @@ -1 +1,2 @@ cairo +harfbuzz-gobject diff --git a/vapi/pango.vapi b/vapi/pango.vapi index 6e2625ff9..ac769a3b9 100644 --- a/vapi/pango.vapi +++ b/vapi/pango.vapi @@ -225,6 +225,8 @@ namespace Pango { public abstract class Font : GLib.Object { [CCode (has_construct_function = false)] protected Font (); + [NoWrapper] + public virtual HarfBuzz.Font create_hb_font (); public virtual Pango.FontDescription describe (); [NoWrapper] public virtual Pango.FontDescription describe_absolute (); @@ -236,6 +238,8 @@ namespace Pango { public virtual Pango.Coverage get_coverage (Pango.Language language); [Version (since = "1.46")] public unowned Pango.FontFace get_face (); + [Version (since = "1.44")] + public virtual void get_features ([CCode (array_length_cname = "len", array_length_pos = 1.5, array_length_type = "guint")] out unowned HarfBuzz.Feature[] features, ref uint num_features); [Version (since = "1.10")] public virtual unowned Pango.FontMap? get_font_map (); public virtual void get_glyph_extents (Pango.Glyph glyph, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect); -- 2.47.3