[vala] pangocairo: Switch to GIR

[Luca Bruno <lucabru src gnome org>]

commit 43ab84f92d187ac8f12a3812a718329858b8d953
Author: Luca Bruno <lucabru src gnome org>
Date:   Sun Aug 21 11:22:09 2011 +0200

    pangocairo: Switch to GIR

 vapi/Makefile.am                              |    2 +-
 vapi/metadata/PangoCairo-1.0.metadata         |   12 ++
 vapi/packages/pangocairo/pangocairo.deps      |    2 -
 vapi/packages/pangocairo/pangocairo.files     |    2 -
 vapi/packages/pangocairo/pangocairo.gi        |  213 -------------------------
 vapi/packages/pangocairo/pangocairo.metadata  |    8 -
 vapi/packages/pangocairo/pangocairo.namespace |    1 -
 vapi/pangocairo.vapi                          |   11 +-
 8 files changed, 20 insertions(+), 231 deletions(-)
---
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index b7e503c..ba21ee3 100644
--- 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
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/pangocairo.vapi b/vapi/pangocairo.vapi
index 7e20ea1..3f23329 100644
--- 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);