pango 2.2.5-x64-mingw32 → 3.0.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8477a5af45b5a29aeea54109d1af91328348c89
-  data.tar.gz: 529d4bb8370a99eb2302099eb20ee2954a5f4fcb
+  metadata.gz: 5c752af543f1467e8f00f064fe35f860461391b2
+  data.tar.gz: bdd89abe8bbe560697b0f47aa1387246c0f87d6a
 SHA512:
-  metadata.gz: 60e7a39a238c64378411b5dd9b538cba5c634baf4288d6ea02df3396c37a38a9355d4340fb44242899590f3755104b41bf2532e7b7d8b0d896866a3375760d74
-  data.tar.gz: f6ee754b18fb97c2abe4a411b8c946c69c6e41afa91bcf23de57cbdc43860ee57ad4f93754e4a07f1b66b812ccffccd9e8e7ed47cdb892f68aaa1479550dc0c9
+  metadata.gz: 8653641d20f3db485217524621c33f7c5794f429e5d5925db6f63a95461b9faa73e9d3188a3716487f27368d1f9eea1c2586efaf9a3d89aa7c4645c71d3ebac6
+  data.tar.gz: cd8ea4a2901f941286095fe514de2f25c51e0aa6714b1769616a4f2be6c9fe986b0b56b4770fd66d711ac494e25f22487c19a57df04b4de2edc1f3b2778e4d3b

data/Rakefile

@@ -1,4 +1,20 @@
 # -*- ruby -*-
+#
+# Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 $LOAD_PATH.unshift("./../glib2/lib")
 require "gnome2/rake/package-task"
@@ -13,10 +29,10 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
   package.external_packages = [
     {
       :name => "icu",
-      :download_base_url => "http://download.icu-project.org/files/icu4c/54.1",
+      :download_base_url => "http://download.icu-project.org/files/icu4c/55.1",
       :label => "gobject-introspection",
       :base_name => "icu",
-      :archive_base_name => "icu4c-54_1-src.tgz",
+      :archive_base_name => "icu4c-55_1-src.tgz",
       :compression_method => "gz",
       :base_dir_in_package => "source",
       :windows => {
@@ -34,7 +50,7 @@ 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.35",
+      :version => "1.0.3",
       :compression_method => "bz2",
       :windows => {
         :configure_args => [

data/ext/pango/depend

@@ -2,7 +2,6 @@ install-so: install-headers
 install-headers:
 	$(INSTALL_DATA) $(srcdir)/rbpango.h $(RUBYARCHDIR)
 	$(INSTALL_DATA) $(srcdir)/rbpangoconversions.h $(RUBYARCHDIR)
-	$(INSTALL_DATA) rbpangoversion.h $(RUBYARCHDIR)
 
 install: install-pc
 install-pc:

data/ext/pango/extconf.rb

@@ -75,8 +75,6 @@ have_func("pango_attr_iterator_get_attrs", pango_header)
 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)

data/ext/pango/rbpango.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2005 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -31,6 +31,40 @@ extern void Init_pango(void);
  * Rendering
  */
 
+static VALUE
+rg_s_version(G_GNUC_UNUSED VALUE self)
+{
+    return INT2NUM(pango_version());
+}
+
+static VALUE
+rg_s_version_string(G_GNUC_UNUSED VALUE self)
+{
+    return CSTR2RVAL(pango_version_string());
+}
+
+static VALUE
+rg_s_check_version(G_GNUC_UNUSED VALUE self,
+                   VALUE major, VALUE minor, VALUE micro)
+{
+    const gchar *error_message;
+    error_message = pango_version_check(NUM2INT(major),
+                                        NUM2INT(minor),
+                                        NUM2INT(micro));
+    return CSTR2RVAL(error_message);
+}
+
+static VALUE
+rg_s_check_version_p(G_GNUC_UNUSED VALUE self,
+                     VALUE major, VALUE minor, VALUE micro)
+{
+    const gchar *error_message;
+    error_message = pango_version_check(NUM2INT(major),
+                                        NUM2INT(minor),
+                                        NUM2INT(micro));
+    return CBOOL2RVAL(!error_message);
+}
+
 struct rpango_reorder_items_args {
     PangoItem *item;
     VALUE ary;
@@ -261,12 +295,16 @@ Init_pango(void)
 {
     RG_TARGET_NAMESPACE = rb_define_module("Pango");
 
-    rb_define_const(RG_TARGET_NAMESPACE, "BUILD_VERSION", 
-                    rb_ary_new3(3, 
-                                INT2FIX(PANGO_MAJOR_VERSION), 
-                                INT2FIX(PANGO_MINOR_VERSION), 
-                                INT2FIX(PANGO_MICRO_VERSION)));
+    rb_define_const(RG_TARGET_NAMESPACE, "BUILD_VERSION",
+                    rb_ary_new3(3,
+                                INT2FIX(PANGO_VERSION_MAJOR),
+                                INT2FIX(PANGO_VERSION_MINOR),
+                                INT2FIX(PANGO_VERSION_MICRO)));
 
+    RG_DEF_SMETHOD(version, 0);
+    RG_DEF_SMETHOD(version_string, 0);
+    RG_DEF_SMETHOD(check_version, 3);
+    RG_DEF_SMETHOD_P(check_version, 3);
     RG_DEF_SMETHOD(reorder_items, 1);
     RG_DEF_SMETHOD(unichar_direction, 1);
     RG_DEF_SMETHOD(find_base_dir, 1);

data/ext/pango/rbpango.h

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

data/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

data/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
 

data/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);

data/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

data/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);

data/ext/pango/rbpangolanguage.c

@@ -69,6 +69,12 @@ rg_includes_script(VALUE self, VALUE script)
                                                      RVAL2PANGOSCRIPT(script)));
 }
 
+static VALUE
+rg_sample_string(VALUE self)
+{
+    return CSTR2RVAL(pango_language_get_sample_string(_SELF(self)));
+}
+
 void
 Init_pango_language(VALUE mPango)
 {
@@ -83,4 +89,6 @@ Init_pango_language(VALUE mPango)
     RG_DEF_ALIAS("to_s", "to_str");
 
     RG_DEF_METHOD(includes_script, 1);
+
+    RG_DEF_METHOD(sample_string, 0);
 }

data/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,7 +525,7 @@ 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
@@ -525,7 +533,7 @@ Init_pango_layout(VALUE mPango)
     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);

data/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);

data/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
 }

data/test/test-language.rb

@@ -4,4 +4,9 @@ class TestLanguage < Test::Unit::TestCase
   def test_default
     assert_match(/\A[a-z]{2}-[a-z]{2}\z/, Pango::Language.default.to_s)
   end
+
+  def test_sample_string
+    assert_equal("The quick brown fox jumps over the lazy dog.",
+                 Pango::Language.new("en").sample_string)
+  end
 end

data/test/test-layout.rb

@@ -2,7 +2,8 @@ class TestLayout < Test::Unit::TestCase
   include PangoTestUtils
 
   def setup
-    @context = Pango::Context.new
+    @font_map = Pango::CairoFontMap.default
+    @context = @font_map.create_context
     @layout = Pango::Layout.new(@context)
   end
 
@@ -31,4 +32,9 @@ class TestLayout < Test::Unit::TestCase
   def test_ellipsized?
     assert_false(@layout.ellipsized?)
   end
+
+  def test_baseline
+    only_pango_version(1, 22, 0)
+    assert_kind_of(Integer, @layout.baseline)
+  end
 end