pango: use version macros provided by Pango

.gitignore

@@ -14,7 +14,6 @@ Makefile.lib
 /glib2/ext/glib2/glib-enum-types.h
 /gtk2/ext/gtk2/rbgdkkeysyms.h
 /gdk3/ext/gdk3/rbgdkkeysyms.h
-/pango/ext/pango/rbpangoversion.h
 /gtksourceview2/ext/gtksourceview2/rbgtksourceview2version.h
 /gtksourceview3/ext/gtksourceview3/rbgtksourceview3version.h
 /goocanvas/ext/goocanvas/rbgoo_canvasversion.h

pango/ext/pango/extconf.rb

@@ -75,8 +75,6 @@
 have_func("pango_itemize_with_base_dir", pango_header)
 have_func("pango_font_family_is_monospace", pango_header)
 
-make_version_header("PANGO", "pango", ".")
-
 create_pkg_config_file("Ruby/Pango", package_id)
 $defs << " -DRUBY_PANGO_COMPILATION"
 create_makefile(module_name)

pango/ext/pango/rbpango.c

@@ -263,9 +263,9 @@ Init_pango(void)
 
     rb_define_const(RG_TARGET_NAMESPACE, "BUILD_VERSION", 
                     rb_ary_new3(3, 
-                                INT2FIX(PANGO_MAJOR_VERSION), 
-                                INT2FIX(PANGO_MINOR_VERSION), 
-                                INT2FIX(PANGO_MICRO_VERSION)));
+                                INT2FIX(PANGO_VERSION_MAJOR), 
+                                INT2FIX(PANGO_VERSION_MINOR), 
+                                INT2FIX(PANGO_VERSION_MICRO)));
 
     RG_DEF_SMETHOD(reorder_items, 1);
     RG_DEF_SMETHOD(unichar_direction, 1);

pango/ext/pango/rbpango.h

@@ -29,7 +29,6 @@
 #endif
 
 #include "rbgobject.h"
-#include "rbpangoversion.h"
 #include "rbpangoconversions.h"
 #include <pango/pangocairo.h>
 

pango/ext/pango/rbpangoattribute.c

@@ -282,7 +282,7 @@ attr_AttrAbsoluteSize_initialize(VALUE self, VALUE size)
     return Qnil;
 }
 
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
 static VALUE
 attr_AttrGravity_initialize(VALUE self, VALUE gravity)
 {
@@ -438,7 +438,7 @@ Init_pango_attribute(VALUE mPango)
     MAKE_ATTR(PANGO_ATTR_STRETCH, AttrStretch, pattrint, 1);
     MAKE_ATTR(PANGO_ATTR_SIZE, AttrSize, pattrint, 1);
     MAKE_ATTR(PANGO_ATTR_ABSOLUTE_SIZE, AttrAbsoluteSize, pattrint, 1);
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
     MAKE_ATTR(PANGO_ATTR_GRAVITY, AttrGravity, pattrint, 1);
     MAKE_ATTR(PANGO_ATTR_GRAVITY_HINT, AttrGravityHint, pattrint, 1);
 #endif

pango/ext/pango/rbpangocairo.c

@@ -34,7 +34,7 @@ rg_s_create(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
     if (NIL_P(rb_font_type)) {
         font_map = pango_cairo_font_map_new();
     } else {
-#if PANGO_CHECK_VERSION(1, 18, 0)
+#if PANGO_VERSION_CHECK(1, 18, 0)
         cairo_font_type_t font_type = CAIRO_FONT_TYPE_USER;
         if (rbgutil_key_equal(rb_font_type, "ft") ||
             rbgutil_key_equal(rb_font_type, "freetype")) {
@@ -66,7 +66,7 @@ rg_s_default(G_GNUC_UNUSED VALUE klass)
     return GOBJ2RVAL(pango_cairo_font_map_get_default());
 }
 
-#if PANGO_CHECK_VERSION(1, 22, 0)
+#if PANGO_VERSION_CHECK(1, 22, 0)
 static VALUE
 rg_s_set_default(VALUE klass, VALUE font_map)
 {
@@ -93,7 +93,7 @@ rg_create_context(VALUE self)
 {
     PangoContext *pango_context;
 
-#if PANGO_CHECK_VERSION(1, 22, 0)
+#if PANGO_VERSION_CHECK(1, 22, 0)
     pango_context = pango_font_map_create_context(PANGO_FONT_MAP(_SELF(self)));
 #else
     pango_context = pango_cairo_font_map_create_context(_SELF(self));
@@ -112,7 +112,7 @@ Init_pango_cairo(VALUE mPango)
 
     RG_DEF_SMETHOD(create, -1);
     RG_DEF_SMETHOD(default, 0);
-#if PANGO_CHECK_VERSION(1, 22, 0)
+#if PANGO_VERSION_CHECK(1, 22, 0)
     RG_DEF_SMETHOD(set_default, 1);
 #endif
 

pango/ext/pango/rbpangocontext.c

@@ -129,7 +129,7 @@ rg_set_base_dir(VALUE self, VALUE direction)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
 static VALUE
 rg_base_gravity(VALUE self)
 {
@@ -280,7 +280,7 @@ Init_pango_context(VALUE mPango)
     RG_DEF_METHOD(set_language, 1);
     RG_DEF_METHOD(base_dir, 0);
     RG_DEF_METHOD(set_base_dir, 1);
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
     RG_DEF_METHOD(base_gravity, 0);
     RG_DEF_METHOD(set_base_gravity, 1);
     RG_DEF_METHOD(gravity_hint, 0);

pango/ext/pango/rbpangofontdescription.c

@@ -163,7 +163,7 @@ rg_size_is_absolute_p(VALUE self)
     return CBOOL2RVAL(pango_font_description_get_size_is_absolute(_SELF(self)));
 }
 
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
 static VALUE
 rg_gravity(VALUE self)
 {
@@ -248,7 +248,7 @@ Init_pango_font_description(VALUE mPango)
     RG_DEF_METHOD(size, 0);
     RG_DEF_METHOD(set_absolute_size, 1);
     RG_DEF_METHOD_P(size_is_absolute, 0);
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
     RG_DEF_METHOD(set_gravity, 1);
     RG_DEF_METHOD(gravity, 0);
 #endif

pango/ext/pango/rbpangogravity.c

@@ -20,7 +20,7 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
 
 #define RG_TARGET_NAMESPACE mGravity
 
@@ -40,7 +40,7 @@ rg_s_vertical_p(G_GNUC_UNUSED VALUE self, VALUE gravity)
 void
 Init_pango_gravity(VALUE mPango)
 {
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
     VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mPango, "Gravity");
 
     RG_DEF_SMETHOD(to_rotation, 1);

pango/ext/pango/rbpangolayout.c

@@ -154,7 +154,7 @@ rg_width(VALUE self)
     return INT2NUM(pango_layout_get_width(_SELF(self)));
 }
 
-#if PANGO_CHECK_VERSION(1, 20, 0)
+#if PANGO_VERSION_CHECK(1, 20, 0)
 static VALUE
 rg_set_height(VALUE self, VALUE width)
 {
@@ -195,7 +195,7 @@ rg_ellipsize(VALUE self)
     return PANGOELLIPSIZEMODE2RVAL(pango_layout_get_ellipsize(_SELF(self)));
 }
 
-#if PANGO_CHECK_VERSION(1, 16, 0)
+#if PANGO_VERSION_CHECK(1, 16, 0)
 static VALUE
 rg_ellipsized_p(VALUE self)
 {
@@ -498,6 +498,14 @@ rg_iter(VALUE self)
     return PANGOLAYOUTITER2RVAL(pango_layout_get_iter(_SELF(self)));
 }
 
+#if PANGO_VERSION_CHECK(1, 22, 0)
+static VALUE
+rg_baseline(VALUE self)
+{
+    return INT2NUM(pango_layout_get_baseline(_SELF(self)));
+}
+#endif
+
 void
 Init_pango_layout(VALUE mPango)
 {
@@ -517,15 +525,15 @@ Init_pango_layout(VALUE mPango)
     RG_DEF_METHOD(font_description, 0);
     RG_DEF_METHOD(set_width, 1);
     RG_DEF_METHOD(width, 0);
-#if PANGO_CHECK_VERSION(1, 20, 0)
+#if PANGO_VERSION_CHECK(1, 20, 0)
     RG_DEF_METHOD(set_height, 1);
     RG_DEF_METHOD(height, 0);
 #endif
     RG_DEF_METHOD(set_wrap, 1);
     RG_DEF_METHOD(wrap, 0);
     RG_DEF_METHOD(set_ellipsize, 1);
     RG_DEF_METHOD(ellipsize, 0);
-#if PANGO_CHECK_VERSION(1, 16, 0)
+#if PANGO_VERSION_CHECK(1, 16, 0)
     RG_DEF_METHOD_P(ellipsized, 0);
 #endif
     RG_DEF_METHOD(set_indent, 1);
@@ -557,6 +565,9 @@ Init_pango_layout(VALUE mPango)
     RG_DEF_METHOD(get_line, 1);
     RG_DEF_METHOD(lines, 0);
     RG_DEF_METHOD(iter, 0);
+#if PANGO_VERSION_CHECK(1, 22, 0)
+    RG_DEF_METHOD(baseline, 0);
+#endif
 
     /* PangoWrapMode */
     G_DEF_CLASS(PANGO_TYPE_WRAP_MODE, "WrapMode", RG_TARGET_NAMESPACE);

pango/ext/pango/rbpangomatrix.c

@@ -82,7 +82,7 @@ rg_rotate_bang(VALUE self, VALUE degrees)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
 static VALUE
 rg_gravity(VALUE self)
 {
@@ -129,7 +129,7 @@ Init_pango_matrix(VALUE mPango)
     RG_DEF_METHOD_BANG(rotate, 1);
     RG_DEF_METHOD_BANG(concat, 1);
     RG_DEF_METHOD(font_scale_factor, 0);
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
     RG_DEF_METHOD(gravity, 0);
 #endif
     RG_DEF_METHOD(to_a, 0);

pango/ext/pango/rbpangoscript.c

@@ -37,7 +37,7 @@ rg_sample_language(VALUE self)
     return PANGOLANGUAGE2RVAL(lang);
 }
 
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
 static VALUE
 rg_get_gravity(int argc, VALUE *argv, VALUE self)
 {
@@ -52,7 +52,7 @@ rg_get_gravity(int argc, VALUE *argv, VALUE self)
                                          RVAL2PANGOGRAVITY(gravity),
                                          RVAL2PANGOGRAVITYHINT(gravity_hint));
     } else {
-#  if PANGO_CHECK_VERSION(1,26,0)
+#  if PANGO_VERSION_CHECK(1,26,0)
         g = pango_gravity_get_for_script_and_width(_SELF(self),
                                                    RVAL2CBOOL(wide),
                                                    RVAL2PANGOGRAVITY(gravity),
@@ -78,7 +78,7 @@ Init_pango_script(VALUE mPango)
 
     RG_DEF_SMETHOD(for_unichar, 1);
     RG_DEF_METHOD(sample_language, 0);
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
     RG_DEF_METHOD(get_gravity, -1);
 #endif
 }