pangocairo: Switch to GIR

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index b7e503c94239ad4eb463fa5a300493317994db12..ba21ee3171ac2221e996dd61c23a2961c70f5c04 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -461,7 +461,7 @@ pango:
        $(GENVAPI) --library $(srcdir)/pango $(PACKAGESDIR)/pango/pango-custom.vala $(PACKAGESDIR)/pango/pango.gi
 
 pangocairo:
-       $(GENVAPI) --library $(srcdir)/pangocairo $(PACKAGESDIR)/pangocairo/pangocairo.gi
+       $(GENVAPI) --library $(srcdir)/pangocairo --metadatadir $(METADATADIR) $(GIRDIR)/PangoCairo-1.0.gir
 
 poppler-glib:
        $(GENVAPI) --library $(srcdir)/poppler-glib $(PACKAGESDIR)/poppler-glib/poppler-glib.gi

diff --git a/vapi/metadata/PangoCairo-1.0.metadata b/vapi/metadata/PangoCairo-1.0.metadata
new file mode 100644 (file)
index 0000000..1c486ea
--- /dev/null
+++ b/vapi/metadata/PangoCairo-1.0.metadata
@@ -0,0 +1,12 @@
+* name="(.+)/Cairo\\1"
+*#function name="(.+)/cairo_\\1" skip=false
+PangoCairo name="Pango" cprefix="Pango"
+
+// 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
+FcFontMap skip

diff --git a/vapi/packages/pangocairo/pangocairo.deps b/vapi/packages/pangocairo/pangocairo.deps
deleted file mode 100644 (file)
index 909838c..0000000
--- a/vapi/packages/pangocairo/pangocairo.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-cairo
-pango

diff --git a/vapi/packages/pangocairo/pangocairo.files b/vapi/packages/pangocairo/pangocairo.files
deleted file mode 100644 (file)
index 2f887fa..0000000
--- a/vapi/packages/pangocairo/pangocairo.files
+++ /dev/null
@@ -1,2 +0,0 @@
-include/pango-1.0/pango/pangocairo.h
-lib/libpangocairo-1.0.so

diff --git a/vapi/packages/pangocairo/pangocairo.gi b/vapi/packages/pangocairo/pangocairo.gi
deleted file mode 100644 (file)
index 4081980..0000000
--- a/vapi/packages/pangocairo/pangocairo.gi
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-       <namespace name="Pango">
-               <function name="cairo_context_get_font_options" symbol="pango_cairo_context_get_font_options">
-                       <return-type type="cairo_font_options_t*"/>
-                       <parameters>
-                               <parameter name="context" type="PangoContext*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_context_get_resolution" symbol="pango_cairo_context_get_resolution">
-                       <return-type type="double"/>
-                       <parameters>
-                               <parameter name="context" type="PangoContext*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_context_get_shape_renderer" symbol="pango_cairo_context_get_shape_renderer">
-                       <return-type type="PangoCairoShapeRendererFunc"/>
-                       <parameters>
-                               <parameter name="context" type="PangoContext*"/>
-                               <parameter name="data" type="gpointer*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_context_set_font_options" symbol="pango_cairo_context_set_font_options">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="context" type="PangoContext*"/>
-                               <parameter name="options" type="cairo_font_options_t*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_context_set_resolution" symbol="pango_cairo_context_set_resolution">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="context" type="PangoContext*"/>
-                               <parameter name="dpi" type="double"/>
-                       </parameters>
-               </function>
-               <function name="cairo_context_set_shape_renderer" symbol="pango_cairo_context_set_shape_renderer">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="context" type="PangoContext*"/>
-                               <parameter name="func" type="PangoCairoShapeRendererFunc"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="dnotify" type="GDestroyNotify"/>
-                       </parameters>
-               </function>
-               <function name="cairo_create_context" symbol="pango_cairo_create_context">
-                       <return-type type="PangoContext*"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_create_layout" symbol="pango_cairo_create_layout">
-                       <return-type type="PangoLayout*"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_error_underline_path" symbol="pango_cairo_error_underline_path">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="x" type="double"/>
-                               <parameter name="y" type="double"/>
-                               <parameter name="width" type="double"/>
-                               <parameter name="height" type="double"/>
-                       </parameters>
-               </function>
-               <function name="cairo_glyph_string_path" symbol="pango_cairo_glyph_string_path">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="font" type="PangoFont*"/>
-                               <parameter name="glyphs" type="PangoGlyphString*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_layout_line_path" symbol="pango_cairo_layout_line_path">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="line" type="PangoLayoutLine*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_layout_path" symbol="pango_cairo_layout_path">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="layout" type="PangoLayout*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_show_error_underline" symbol="pango_cairo_show_error_underline">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="x" type="double"/>
-                               <parameter name="y" type="double"/>
-                               <parameter name="width" type="double"/>
-                               <parameter name="height" type="double"/>
-                       </parameters>
-               </function>
-               <function name="cairo_show_glyph_item" symbol="pango_cairo_show_glyph_item">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="text" type="char*"/>
-                               <parameter name="glyph_item" type="PangoGlyphItem*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_show_glyph_string" symbol="pango_cairo_show_glyph_string">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="font" type="PangoFont*"/>
-                               <parameter name="glyphs" type="PangoGlyphString*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_show_layout" symbol="pango_cairo_show_layout">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="layout" type="PangoLayout*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_show_layout_line" symbol="pango_cairo_show_layout_line">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="line" type="PangoLayoutLine*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_update_context" symbol="pango_cairo_update_context">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="context" type="PangoContext*"/>
-                       </parameters>
-               </function>
-               <function name="cairo_update_layout" symbol="pango_cairo_update_layout">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="layout" type="PangoLayout*"/>
-                       </parameters>
-               </function>
-               <callback name="PangoCairoShapeRendererFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="attr" type="PangoAttrShape*"/>
-                               <parameter name="do_path" type="gboolean"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <interface name="PangoCairoFont" type-name="PangoCairoFont" get-type="pango_cairo_font_get_type">
-                       <requires>
-                               <interface name="PangoFont"/>
-                       </requires>
-                       <method name="get_scaled_font" symbol="pango_cairo_font_get_scaled_font">
-                               <return-type type="cairo_scaled_font_t*"/>
-                               <parameters>
-                                       <parameter name="font" type="PangoCairoFont*"/>
-                               </parameters>
-                       </method>
-               </interface>
-               <interface name="PangoCairoFontMap" type-name="PangoCairoFontMap" get-type="pango_cairo_font_map_get_type">
-                       <requires>
-                               <interface name="PangoFontMap"/>
-                       </requires>
-                       <method name="create_context" symbol="pango_cairo_font_map_create_context">
-                               <return-type type="PangoContext*"/>
-                               <parameters>
-                                       <parameter name="fontmap" type="PangoCairoFontMap*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_default" symbol="pango_cairo_font_map_get_default">
-                               <return-type type="PangoFontMap*"/>
-                       </method>
-                       <method name="get_font_type" symbol="pango_cairo_font_map_get_font_type">
-                               <return-type type="cairo_font_type_t"/>
-                               <parameters>
-                                       <parameter name="fontmap" type="PangoCairoFontMap*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_resolution" symbol="pango_cairo_font_map_get_resolution">
-                               <return-type type="double"/>
-                               <parameters>
-                                       <parameter name="fontmap" type="PangoCairoFontMap*"/>
-                               </parameters>
-                       </method>
-                       <method name="new" symbol="pango_cairo_font_map_new">
-                               <return-type type="PangoFontMap*"/>
-                       </method>
-                       <method name="new_for_font_type" symbol="pango_cairo_font_map_new_for_font_type">
-                               <return-type type="PangoFontMap*"/>
-                               <parameters>
-                                       <parameter name="fonttype" type="cairo_font_type_t"/>
-                               </parameters>
-                       </method>
-                       <method name="set_default" symbol="pango_cairo_font_map_set_default">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fontmap" type="PangoCairoFontMap*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_resolution" symbol="pango_cairo_font_map_set_resolution">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fontmap" type="PangoCairoFontMap*"/>
-                                       <parameter name="dpi" type="double"/>
-                               </parameters>
-                       </method>
-               </interface>
-       </namespace>
-</api>

diff --git a/vapi/packages/pangocairo/pangocairo.metadata b/vapi/packages/pangocairo/pangocairo.metadata
deleted file mode 100644 (file)
index 9616040..0000000
--- a/vapi/packages/pangocairo/pangocairo.metadata
+++ /dev/null
@@ -1,8 +0,0 @@
-Pango cheader_filename="pango/pangocairo.h" gir_namespace="PangoCairo" gir_version="1.0"
-
-pango_cairo_context_get_shape_renderer.data hidden="1"
-pango_cairo_context_set_shape_renderer.func transfer_ownership="1"
-pango_cairo_context_set_shape_renderer.data hidden="1"
-pango_cairo_context_set_shape_renderer.dnotify hidden="1"
-pango_cairo_create_context transfer_ownership="1"
-pango_cairo_create_layout transfer_ownership="1"

diff --git a/vapi/packages/pangocairo/pangocairo.namespace b/vapi/packages/pangocairo/pangocairo.namespace
deleted file mode 100644 (file)
index 1e0fa50..0000000
--- a/vapi/packages/pangocairo/pangocairo.namespace
+++ /dev/null
@@ -1 +0,0 @@
-Pango

diff --git a/vapi/pangocairo.vapi b/vapi/pangocairo.vapi
index 7e20ea12d88a069a9ecea2a88f247e0c35090a63..3f23329fcdd7974559129af5c860d97139f3716b 100644 (file)
--- a/vapi/pangocairo.vapi
+++ b/vapi/pangocairo.vapi
@@ -1,13 +1,16 @@
 /* pangocairo.vapi generated by vapigen, do not modify. */
 
-[CCode (gir_namespace = "PangoCairo", gir_version = "1.0")]
+[CCode (cprefix = "Pango", gir_namespace = "PangoCairo", gir_version = "1.0", lower_case_cprefix = "pango_")]
 namespace Pango {
-       [CCode (cheader_filename = "pango/pangocairo.h")]
+       [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 ();
        }
-       [CCode (cheader_filename = "pango/pangocairo.h")]
+       [CCode (cheader_filename = "pango/pangocairo.h", type_id = "pango_cairo_font_map_get_type ()")]
+       [GIR (name = "FontMap")]
        public interface CairoFontMap : Pango.FontMap {
+               [Deprecated (since = "1.22")]
                public unowned Pango.Context create_context ();
                public static unowned Pango.FontMap get_default ();
                public Cairo.FontType get_font_type ();
@@ -17,7 +20,7 @@ namespace Pango {
                public void set_default ();
                public void set_resolution (double dpi);
        }
-       [CCode (cheader_filename = "pango/pangocairo.h")]
+       [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);