pango 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 786851f050fc3fb306d8d80dcd242ed00e9635b4
+  data.tar.gz: bac0269f3a51230f584eaa3b290fbd4364c30976
+SHA512:
+  metadata.gz: 6d55f2227171ce2552be8649370d23b0ec2bd180f35ed1b97fd78e2aacfa4253c7340635e42131e1200bb6b9152e0ecc4231dcc2ee045dcf622061dbf5af3cb9
+  data.tar.gz: ccc426bacaafec319ae8781fa262e534b0c5238ac85503870eb240fbf7e94e068c45f003faa5ec3d47d1b0aa0306bae222c1241c145e68eaa0bdd9865d88b520

data/README

@@ -1,6 +1,6 @@
 Ruby/Pango
 ==========
-Ruby/Pango is a Ruby binding of pango-1.x.
+Ruby/Pango is a Ruby binding of pango-1.14.x.
 
 Requirements
 ------------
@@ -12,7 +12,7 @@ Requirements
 
 Install
 -------
-   0. install ruby-1.6.x or later, GLib, Pango, Ruby/GLib2, Ruby/GTK2
+   0. install ruby-1.9.x or later, GLib, Pango-1.14.x or later, Ruby/GLib2, Ruby/GTK2
       (and cairo/rcairo).
    1. ruby extconf.rb
       (To use rcairo on Win32, set CAIRO_PATH as a environment variable first)

data/Rakefile

@@ -15,20 +15,21 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "harfbuzz",
       :download_base_url => "http://www.freedesktop.org/software/harfbuzz/release",
       :label => "HarfBuzz",
-      :version => "0.9.17",
+      :version => "0.9.25",
       :compression_method => "bz2",
       :windows => {
+        :configure_args => [
+        ],
         :patches => [
-          "harfbuzz-0.9.17-disable-uniscribe.diff",
         ],
-        :need_autoreconf => true,
+        :built_file => "bin/libharfbuzz-0.dll",
       },
     },
     {
       :name => "pango",
       :download_site => :gnome,
       :label => "pango",
-      :version => "1.34.1",
+      :version => "1.36.1",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -37,6 +38,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
         :patches => [
           "pango-1.34.0-enable-fc-font.diff",
         ],
+        :built_file => "bin/libpango-1.0-0.dll",
       },
     },
   ]
@@ -47,7 +49,7 @@ namespace :gcc do
   namespace :dll do
     desc "Bundle GCC related DLLs"
     task(:bundle) do
-      dlls = ["libgcc_s_sjlj-1.dll", "libstdc++-6.dll"]
+      dlls = ["libstdc++-6.dll"]
       dlls.each do |dll|
         host = package_task.windows.build_host
         binary_dir = package_task.windows.absolute_binary_dir

data/ext/pango/extconf.rb

@@ -54,11 +54,13 @@ rcairo_source_dir_names.each do |rcairo_source_dir_name|
     break
   end
 end
-check_cairo(rcairo_options)
+unless check_cairo(rcairo_options)
+  exit(false)
+end
 
 setup_win32(module_name, base_dir)
 
-unless required_pkg_config_package(package_id,
+unless required_pkg_config_package([package_id, 1, 14, 0],
                                    :debian => "libpango1.0-dev",
                                    :redhat => "pango-devel",
                                    :homebrew => "pango",
@@ -76,8 +78,6 @@ end
 
 pango_header = "pango/pango.h"
 have_func("pango_layout_iter_get_type", pango_header)
-have_func("pango_layout_set_ellipsize", pango_header)
-have_func("pango_layout_get_font_description", pango_header)
 have_func("pango_render_part_get_type", pango_header)
 have_func("pango_attr_strikethrough_color_new", pango_header)
 have_func("pango_attr_underline_color_new", pango_header)

data/ext/pango/rbpango.c

@@ -75,7 +75,6 @@ rg_s_reorder_items(G_GNUC_UNUSED VALUE self, VALUE attrs)
                      rpango_reorder_items_ensure, (VALUE)&args);
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
 rg_s_unichar_direction(G_GNUC_UNUSED VALUE self, VALUE ch)
 {
@@ -88,7 +87,6 @@ rg_s_find_base_dir(G_GNUC_UNUSED VALUE self, VALUE text)
     StringValue(text);
     return PANGODIRECTION2RVAL(pango_find_base_dir(RSTRING_PTR(text), RSTRING_LEN(text)));
 }
-#endif
 
 struct rbg_pangologattrs2rval_free_args {
     PangoLogAttr *attrs;
@@ -255,11 +253,7 @@ rg_s_pixels(G_GNUC_UNUSED VALUE self, VALUE pixels)
 static VALUE
 rg_s_cairo_available_p(G_GNUC_UNUSED VALUE self)
 {
-#ifdef CAIRO_AVAILABLE
     return Qtrue;
-#else
-    return Qfalse;
-#endif
 }
 
 void
@@ -274,11 +268,8 @@ Init_pango(void)
                                 INT2FIX(PANGO_MICRO_VERSION)));
 
     RG_DEF_SMETHOD(reorder_items, 1);
-
-#if PANGO_CHECK_VERSION(1,4,0)
     RG_DEF_SMETHOD(unichar_direction, 1);
     RG_DEF_SMETHOD(find_base_dir, 1);
-#endif
     RG_DEF_SMETHOD(break, 2);
     RG_DEF_SMETHOD(get_log_attrs, 3);
     RG_DEF_SMETHOD(find_paragraph_boundary, 1);

data/ext/pango/rbpango.h

@@ -31,12 +31,10 @@
 #include "rbgobject.h"
 #include "rbpangoversion.h"
 #include "rbpangoconversions.h"
-
-#if PANGO_CHECK_VERSION(1,10,0)
 #include <pango/pangocairo.h>
-#  ifdef HAVE_RB_CAIRO_H
+
+#ifdef HAVE_RB_CAIRO_H
 #include <rb_cairo.h>
-#  endif
 #endif
 
 #if defined(G_PLATFORM_WIN32) && !defined(RUBY_PANGO_STATIC_COMPILATION)
@@ -70,10 +68,7 @@ RUBY_PANGO_VAR VALUE mPango;
 #ifndef PANGO_TYPE_GLYPH_ITEM
 #  define PANGO_TYPE_GLYPH_ITEM (pango_glyph_item_get_type())
 #endif
-
-#if PANGO_CHECK_VERSION(1,4,0)
 #define PANGO_TYPE_SCRIPT_ITER (pango_script_iter_get_type())
-#endif
 
 #define ATTR2RVAL(attr) (pango_make_attribute(attr))
 #define RVAL2ATTR(attr) (pango_get_attribute(attr))
@@ -95,10 +90,7 @@ extern GType pango_glyph_info_get_type(void);
 #ifndef HAVE_PANGO_GLYPH_ITEM_GET_TYPE
 extern GType pango_glyph_item_get_type(void);
 #endif
-
-#if PANGO_CHECK_VERSION(1,4,0)
 extern GType pango_script_iter_get_type(void);
-#endif
 
 extern VALUE pango_get_attribute_klass(VALUE attr_type);
 extern void pango_add_attribute(int attr_type, VALUE klass);

data/ext/pango/rbpangoanalysis.c

@@ -56,7 +56,6 @@ rg_initialize(VALUE self)
     return Qnil;
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
 rg_set_shape_engine(VALUE self, VALUE engine)
 {
@@ -100,7 +99,6 @@ rg_lang_engine(VALUE self)
     }
     return ret;
 }
-#endif
 
 static VALUE
 rg_set_font(VALUE self, VALUE font)
@@ -204,12 +202,10 @@ Init_pango_analysis(VALUE mPango)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_ANALYSIS, "Analysis", mPango);
 
     RG_DEF_METHOD(initialize, 0);
-#if PANGO_CHECK_VERSION(1,4,0)
     RG_DEF_METHOD(set_shape_engine, 1);
     RG_DEF_METHOD(shape_engine, 0);
     RG_DEF_METHOD(set_lang_engine, 1);
     RG_DEF_METHOD(lang_engine, 0);
-#endif
     RG_DEF_METHOD(set_font, 1);
     RG_DEF_METHOD(font, 0);
     RG_DEF_METHOD(set_level, 1);

data/ext/pango/rbpangoattribute.c

@@ -274,14 +274,13 @@ attr_AttrSize_initialize(VALUE self, VALUE size)
     DATA_PTR(self) = pango_attr_size_new(NUM2INT(size));
     return Qnil;
 }
-#if PANGO_CHECK_VERSION(1,8,1)
+
 static VALUE
 attr_AttrAbsoluteSize_initialize(VALUE self, VALUE size)
 {
     DATA_PTR(self) = pango_attr_size_new_absolute(NUM2INT(size));
     return Qnil;
 }
-#endif
 
 #if PANGO_CHECK_VERSION(1,16,0)
 static VALUE
@@ -357,18 +356,11 @@ attr_AttrShape_initialize(int argc, VALUE *argv, VALUE self)
             RVAL2PANGORECTANGLE(ink_rect),
             RVAL2PANGORECTANGLE(logical_rect));
     } else {
-#if PANGO_CHECK_VERSION(1,8,0)
         G_RELATIVE(self, data);
         DATA_PTR(self) = pango_attr_shape_new_with_data(
             RVAL2PANGORECTANGLE(ink_rect),
             RVAL2PANGORECTANGLE(logical_rect),
             (gpointer)data, NULL, NULL);
-#else
-        rb_warning("not supported in Pango-1.6.x. the 3rd parameter was ignored.");
-        DATA_PTR(self) = pango_attr_shape_new(
-            RVAL2PANGORECTANGLE(ink_rect),
-            RVAL2PANGORECTANGLE(logical_rect));     
-#endif
     }
 
     return Qnil;
@@ -381,20 +373,15 @@ attr_AttrScale_initialize(VALUE self, VALUE scale)
     return Qnil;
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
 attr_AttrFallback_initialize(VALUE self, VALUE enable_fallback)
 {
     DATA_PTR(self) = pango_attr_fallback_new(RVAL2CBOOL(enable_fallback));
     return Qnil;
 }
-#endif
 
 MAKE_ATTRINT_INIT(AttrRise, rise);
-
-#if PANGO_CHECK_VERSION(1,6,0)
 MAKE_ATTRINT_INIT(AttrLetterSpacing, letter_spacing);
-#endif
 
 #define MAKE_ATTR(gtype, name, parent, num)\
 tmpklass = rb_define_class_under(mPango, #name, parent);\
@@ -450,9 +437,7 @@ Init_pango_attribute(VALUE mPango)
     MAKE_ATTR(PANGO_ATTR_VARIANT, AttrVariant, pattrint, 1);
     MAKE_ATTR(PANGO_ATTR_STRETCH, AttrStretch, pattrint, 1);
     MAKE_ATTR(PANGO_ATTR_SIZE, AttrSize, pattrint, 1);
-#if PANGO_CHECK_VERSION(1,8,1)
     MAKE_ATTR(PANGO_ATTR_ABSOLUTE_SIZE, AttrAbsoluteSize, pattrint, 1);
-#endif
 #if PANGO_CHECK_VERSION(1,16,0)
     MAKE_ATTR(PANGO_ATTR_GRAVITY, AttrGravity, pattrint, 1);
     MAKE_ATTR(PANGO_ATTR_GRAVITY_HINT, AttrGravityHint, pattrint, 1);
@@ -474,9 +459,7 @@ Init_pango_attribute(VALUE mPango)
     MAKE_ATTR(PANGO_ATTR_STRIKETHROUGH_COLOR, AttrStrikethroughColor, pattrcolor, 3);
 #endif
     MAKE_ATTR(PANGO_ATTR_RISE, AttrRise, pattrint, 1);
-#if PANGO_CHECK_VERSION(1,6,0)
     MAKE_ATTR(PANGO_ATTR_LETTER_SPACING, AttrLetterSpacing, pattrint, 1);
-#endif
     MAKE_ATTR(PANGO_ATTR_SHAPE, AttrShape, RG_TARGET_NAMESPACE, -1);
     rbg_define_method(tmpklass, "ink_rect", attr_shape_ink_rect, 0);
     rbg_define_method(tmpklass, "logical_rect", attr_shape_logical_rect, 0);
@@ -490,9 +473,7 @@ Init_pango_attribute(VALUE mPango)
     rb_define_const(tmpklass, "LARGE", rb_float_new(PANGO_SCALE_LARGE));
     rb_define_const(tmpklass, "X_LARGE", rb_float_new(PANGO_SCALE_X_LARGE));
     rb_define_const(tmpklass, "XX_LARGE", rb_float_new(PANGO_SCALE_XX_LARGE));
-#if PANGO_CHECK_VERSION(1,4,0)
     MAKE_ATTR(PANGO_ATTR_FALLBACK, AttrFallback, pattrbool, 1);
-#endif
     /* PangoAttrType */
     G_DEF_CLASS(PANGO_TYPE_ATTR_TYPE, "Type", RG_TARGET_NAMESPACE);
 #define INT2ATTRTYPE(x) rbgobj_make_enum((x), PANGO_TYPE_ATTR_TYPE)
@@ -509,16 +490,10 @@ Init_pango_attribute(VALUE mPango)
     rb_define_const(RG_TARGET_NAMESPACE, "TYPE_BACKGROUND", INT2ATTRTYPE(PANGO_ATTR_BACKGROUND));
     rb_define_const(RG_TARGET_NAMESPACE, "TYPE_UNDERLINE", INT2ATTRTYPE(PANGO_ATTR_UNDERLINE));
     rb_define_const(RG_TARGET_NAMESPACE, "TYPE_STRIKETHROUGH", INT2ATTRTYPE(PANGO_ATTR_STRIKETHROUGH));
-#if PANGO_CHECK_VERSION(1,8,0)
     rb_define_const(RG_TARGET_NAMESPACE, "TYPE_STRIKETHROUGH_COLOR", INT2ATTRTYPE(PANGO_ATTR_STRIKETHROUGH_COLOR));
-#endif
     rb_define_const(RG_TARGET_NAMESPACE, "TYPE_RISE", INT2ATTRTYPE(PANGO_ATTR_RISE));
     rb_define_const(RG_TARGET_NAMESPACE, "TYPE_SHAPE", INT2ATTRTYPE(PANGO_ATTR_SHAPE));
     rb_define_const(RG_TARGET_NAMESPACE, "TYPE_SCALE", INT2ATTRTYPE(PANGO_ATTR_SCALE));
-#if PANGO_CHECK_VERSION(1,8,0)
     rb_define_const(RG_TARGET_NAMESPACE, "TYPE_FALLBACK", INT2ATTRTYPE(PANGO_ATTR_FALLBACK));
-#endif
-#if PANGO_CHECK_VERSION(1,6,0)
     rb_define_const(RG_TARGET_NAMESPACE, "TYPE_LETTER_SPACING", INT2ATTRTYPE(PANGO_ATTR_LETTER_SPACING));
-#endif
 }

data/ext/pango/rbpangoattrlist.c

@@ -61,7 +61,6 @@ rg_splice(VALUE self, VALUE other, VALUE pos, VALUE len)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 static gboolean
 filter_func(PangoAttribute *attr, gpointer data)
 {
@@ -77,7 +76,6 @@ rg_filter(VALUE self)
                                              (PangoAttrFilterFunc)filter_func, 
                                              (gpointer)func));
 }
-#endif
 
 static VALUE
 rg_iterator(VALUE self)
@@ -97,9 +95,7 @@ Init_pango_attrlist(VALUE mPango)
     RG_DEF_METHOD(insert_before, 1);
     RG_DEF_METHOD(change, 1);
     RG_DEF_METHOD(splice, 3);
-#if PANGO_CHECK_VERSION(1,4,0)
     RG_DEF_METHOD(filter, 0);
-#endif
     RG_DEF_METHOD(iterator, 0);
 
 }

data/ext/pango/rbpangocairo.c

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2006  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005  Kouhei Sutou
  *
  *  This library is free software; you can redistribute it and/or
@@ -22,8 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#ifdef CAIRO_AVAILABLE
-
 #define RG_TARGET_NAMESPACE cCairoFontMap
 #define _SELF(self) (RVAL2PANGOCAIROFONTMAP(self))
 
@@ -63,14 +60,14 @@ 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_CHECK_VERSION(1, 22, 0)
 static VALUE
 rg_s_set_default(VALUE klass, VALUE font_map)
 {
     pango_cairo_font_map_set_default(RVAL2GOBJ(font_map));
     return klass;
 }
-#  endif
+#endif
 
 static VALUE
 rg_set_resolution(VALUE self, VALUE dpi)
@@ -88,15 +85,20 @@ rg_resolution(VALUE self)
 static VALUE
 rg_create_context(VALUE self)
 {
-    return GOBJ2RVAL_UNREF(pango_cairo_font_map_create_context(_SELF(self)));
-}
+    PangoContext *pango_context;
 
+#if PANGO_CHECK_VERSION(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));
 #endif
 
+    return GOBJ2RVAL_UNREF(pango_context);
+}
+
 void
 Init_pango_cairo(VALUE mPango)
 {
-#ifdef CAIRO_AVAILABLE
     VALUE RG_TARGET_NAMESPACE;
 
     /* Pango::CairoFontMap */
@@ -104,12 +106,11 @@ Init_pango_cairo(VALUE mPango)
 
     RG_DEF_SMETHOD(create, -1);
     RG_DEF_SMETHOD(default, 0);
-#  if PANGO_CHECK_VERSION(1, 22, 0)
+#if PANGO_CHECK_VERSION(1, 22, 0)
     RG_DEF_SMETHOD(set_default, 1);
-#  endif
+#endif
 
     RG_DEF_METHOD(set_resolution, 1);
     RG_DEF_METHOD(resolution, 0);
     RG_DEF_METHOD(create_context, 0);
-#endif
 }

data/ext/pango/rbpangocairocontext.c

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2006  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005  Kouhei Sutou
  *
  *  This library is free software; you can redistribute it and/or
@@ -22,12 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,10,0) && defined(HAVE_RB_CAIRO_H)
-#  define CAIRO_AVAILABLE 1
-#endif
-
-#ifdef CAIRO_AVAILABLE
-
 #define RG_TARGET_NAMESPACE rb_cCairo_Context
 
 static VALUE
@@ -75,16 +68,14 @@ rg_show_pango_layout(VALUE self, VALUE layout)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,14,0)
 static VALUE
 rg_show_pango_error_underline(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
-    pango_cairo_show_error_underline(RVAL2CRCONTEXT(self), 
-                                     NUM2DBL(x), NUM2DBL(y), 
+    pango_cairo_show_error_underline(RVAL2CRCONTEXT(self),
+                                     NUM2DBL(x), NUM2DBL(y),
                                      NUM2DBL(width), NUM2DBL(height));
     return self;
 }
-#endif
 
 /* Rendering to a path */
 static VALUE
@@ -110,23 +101,18 @@ rg_pango_layout_path(VALUE self, VALUE layout)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,14,0)
 static VALUE
 rg_pango_error_underline_path(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
-    pango_cairo_error_underline_path(RVAL2CRCONTEXT(self), 
-                                     NUM2DBL(x), NUM2DBL(y), 
+    pango_cairo_error_underline_path(RVAL2CRCONTEXT(self),
+                                     NUM2DBL(x), NUM2DBL(y),
                                      NUM2DBL(width), NUM2DBL(height));
     return self;
 }
-#endif
-
-#endif
 
 void
-Init_pango_cairo_context(VALUE mPango)
+Init_pango_cairo_context(G_GNUC_UNUSED VALUE mPango)
 {
-#ifdef CAIRO_AVAILABLE
     /* Cairo::Context */
     RG_DEF_METHOD(update_pango_context, 1);
     /* Convenience */
@@ -136,16 +122,10 @@ Init_pango_cairo_context(VALUE mPango)
     RG_DEF_METHOD(show_pango_glyph_string, 2);
     RG_DEF_METHOD(show_pango_layout_line, 1);
     RG_DEF_METHOD(show_pango_layout, 1);
-#if PANGO_CHECK_VERSION(1,14,0)
     RG_DEF_METHOD(show_pango_error_underline, 4);
-#endif
     /* Rendering to a path */
     RG_DEF_METHOD(pango_glyph_string_path, 2);
     RG_DEF_METHOD(pango_layout_line_path, 1);
     RG_DEF_METHOD(pango_layout_path, 1);
-
-#if PANGO_CHECK_VERSION(1,14,0)
     RG_DEF_METHOD(pango_error_underline_path, 4);
-#endif
-#endif
 }