pango 3.2.5-x64-mingw32 → 3.2.6-x64-mingw32

data/README.md

@@ -0,0 +1,25 @@
+# Ruby/Pango
+
+Ruby/Pango is a Ruby binding of pango based on GObject-Introspection.
+
+## Requirements
+
+* [Ruby/GObject-Introspection](https://github.com/ruby-gnome2/ruby-gnome2)
+* [Ruby/GLib2](https://github.com/ruby-gnome2/ruby-gnome2)
+* [cairo/rcairo](http://cairographics.org/)
+
+## Install
+
+    gem install pango
+
+## License
+
+Copyright (c) 2017 Ruby-GNOME2 Project Team
+
+This program is free software. You can distribute/modify this program
+under the terms of the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1.
+
+## Project Websites
+
+*   https://ruby-gnome2.osdn.jp/
+*   https://github.com/ruby-gnome2/ruby-gnome2

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2011-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2011-2018  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
@@ -19,9 +19,10 @@
 $LOAD_PATH.unshift("./../glib2/lib")
 require "gnome2/rake/package-task"
 
-package_task = GNOME2::Rake::PackageTask.new do |package|
-  package.summary = "Ruby/Pango is a Ruby binding of pango-1.x."
-  package.description = "Ruby/Pango is a Ruby binding of pango-1.x."
+package_name = File.basename(__dir__)
+spec = Gem::Specification.load("#{package_name}.gemspec")
+
+GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
   package.dependency.gem.runtime = [
     ["cairo", ">= 1.14.0"],
     "cairo-gobject",
@@ -66,7 +67,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "harfbuzz",
       :download_site => :freedesktop,
       :label => "HarfBuzz",
-      :version => "1.7.6",
+      :version => "1.8.0",
       :compression_method => "bz2",
       :windows => {
         :configure_args => [
@@ -94,7 +95,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "fribidi/fribidi",
       :download_site => :github,
       :label => "FriBidi",
-      :version => "v1.0.2",
+      :version => "v1.0.3",
       :compression_method => "bz2",
       :windows => {
         :configure_args => [
@@ -107,7 +108,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "pango",
       :download_site => :gnome,
       :label => "Pango",
-      :version => "1.42.0",
+      :version => "1.42.1",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -118,4 +119,3 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
     },
   ]
 end
-package_task.define

data/ext/pango/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2017-2018  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
@@ -40,6 +40,7 @@ require "mkmf-gnome2"
 
 depended_packages = [
   "glib2",
+  "gobject-introspection",
 ]
 depended_packages.each do |package|
   directory = "#{package}#{version_suffix}"
@@ -77,6 +78,8 @@ if PKGConfig.have_package("pangoft2")
   $defs << " -DHAVE_PANGO_FT2"
 end
 
+PKGConfig.have_package("gobject-introspection-1.0")
+
 pango_header = "pango/pango.h"
 have_func("pango_attr_strikethrough_color_new", pango_header)
 have_func("pango_attr_underline_color_new", pango_header)

data/ext/pango/pango.def

@@ -1,3 +1,4 @@
 EXPORTS
     Init_pango
     pango_attr_list_get_type
+    rbpango_attribute_from_ruby

data/ext/pango/rb-pango-attr-list.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2017-2018  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
@@ -30,7 +30,7 @@ rg_insert(VALUE self, VALUE rb_attribute)
     if (NIL_P(rb_attribute))
         return self;
 
-    attribute = DATA_PTR(rb_attribute);
+    attribute = rbpango_attribute_from_ruby(rb_attribute);
     pango_attr_list_insert(RVAL2PANGOATTRLIST(self),
                            pango_attribute_copy(attribute));
 
@@ -45,7 +45,7 @@ rg_insert_before(VALUE self, VALUE rb_attribute)
     if (NIL_P(rb_attribute))
         return self;
 
-    attribute = DATA_PTR(rb_attribute);
+    attribute = rbpango_attribute_from_ruby(rb_attribute);
     pango_attr_list_insert_before(RVAL2PANGOATTRLIST(self),
                                   pango_attribute_copy(attribute));
 

data/ext/pango/rb-pango-attribute.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2017-2018  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
@@ -20,6 +20,17 @@
 
 #include "rb-pango-private.h"
 
+static GType
+pango_attribute_get_type(void)
+{
+    static GType our_type = 0;
+    if (our_type == 0)
+        our_type = g_boxed_type_register_static("PangoAttribute",
+                                                (GBoxedCopyFunc)pango_attribute_copy,
+                                                (GBoxedFreeFunc)pango_attribute_destroy);
+    return our_type;
+}
+
 VALUE
 rbpango_attribute_to_ruby(PangoAttribute *attribute)
 {
@@ -30,26 +41,16 @@ rbpango_attribute_to_ruby(PangoAttribute *attribute)
     rb_attr_type = GENUM2RVAL(attribute->klass->type, PANGO_TYPE_ATTR_TYPE);
     CONST_ID(id_to_class, "to_class");
     klass = rb_funcall(rb_attr_type, id_to_class, 0);
-    return Data_Wrap_Struct(klass,
-                            NULL,
-                            pango_attribute_destroy,
-                            pango_attribute_copy(attribute));
+    return rbgobj_make_boxed_raw(pango_attribute_copy(attribute),
+                                 pango_attribute_get_type(),
+                                 klass,
+                                 0);
 }
 
 PangoAttribute *
 rbpango_attribute_from_ruby(VALUE rb_attribute)
 {
-    PangoAttribute *attribute;
-
-    Data_Get_Struct(rb_attribute, PangoAttribute, attribute);
-
-    return attribute;
-}
-
-static VALUE
-rbpango_attribute_allocate(VALUE klass)
-{
-    return Data_Wrap_Struct(klass, NULL, pango_attribute_destroy, 0);
+    return rbgobj_boxed_get(rb_attribute, pango_attribute_get_type());
 }
 
 static VALUE
@@ -68,7 +69,7 @@ rbpango_attr_language_initialize(VALUE self, VALUE rb_language)
     PangoLanguage *language;
 
     language = RVAL2PANGOLANGUAGE(rb_language);
-    DATA_PTR(self) = pango_attr_language_new(language);
+    G_INITIALIZE(self, pango_attr_language_new(language));
 
     return Qnil;
 }
@@ -76,7 +77,7 @@ rbpango_attr_language_initialize(VALUE self, VALUE rb_language)
 static VALUE
 rbpango_attr_family_initialize(VALUE self, VALUE rb_family)
 {
-    DATA_PTR(self) = pango_attr_family_new(RVAL2CSTR(rb_family));
+    G_INITIALIZE(self, pango_attr_family_new(RVAL2CSTR(rb_family)));
 
     return Qnil;
 }
@@ -84,7 +85,7 @@ rbpango_attr_family_initialize(VALUE self, VALUE rb_family)
 static VALUE
 rbpango_attr_style_initialize(VALUE self, VALUE rb_style)
 {
-    DATA_PTR(self) = pango_attr_style_new(RVAL2PANGOSTYLE(rb_style));
+    G_INITIALIZE(self, pango_attr_style_new(RVAL2PANGOSTYLE(rb_style)));
 
     return Qnil;
 }
@@ -102,7 +103,7 @@ rbpango_attr_style_get_value(VALUE self)
 static VALUE
 rbpango_attr_weight_initialize(VALUE self, VALUE rb_weight)
 {
-    DATA_PTR(self) = pango_attr_weight_new(RVAL2PANGOWEIGHT(rb_weight));
+    G_INITIALIZE(self, pango_attr_weight_new(RVAL2PANGOWEIGHT(rb_weight)));
 
     return Qnil;
 }
@@ -120,7 +121,7 @@ rbpango_attr_weight_get_value(VALUE self)
 static VALUE
 rbpango_attr_variant_initialize(VALUE self, VALUE rb_variant)
 {
-    DATA_PTR(self) = pango_attr_variant_new(RVAL2PANGOVARIANT(rb_variant));
+    G_INITIALIZE(self, pango_attr_variant_new(RVAL2PANGOVARIANT(rb_variant)));
 
     return Qnil;
 }
@@ -138,7 +139,7 @@ rbpango_attr_variant_get_value(VALUE self)
 static VALUE
 rbpango_attr_stretch_initialize(VALUE self, VALUE rb_stretch)
 {
-    DATA_PTR(self) = pango_attr_stretch_new(RVAL2PANGOSTRETCH(rb_stretch));
+    G_INITIALIZE(self, pango_attr_stretch_new(RVAL2PANGOSTRETCH(rb_stretch)));
 
     return Qnil;
 }
@@ -159,7 +160,7 @@ rbpango_attr_size_initialize(VALUE self, VALUE rb_size)
     gint size;
 
     size = NUM2INT(rb_size);
-    DATA_PTR(self) = pango_attr_size_new(size);
+    G_INITIALIZE(self, pango_attr_size_new(size));
 
     return Qnil;
 }
@@ -180,7 +181,7 @@ rbpango_attr_font_desc_initialize(VALUE self, VALUE rb_font_desc)
                                   rb_intern("new"), 1, rb_font_desc);
     }
     font_desc = RVAL2PANGOFONTDESCRIPTION(rb_font_desc);
-    DATA_PTR(self) = pango_attr_font_desc_new(font_desc);
+    G_INITIALIZE(self, pango_attr_font_desc_new(font_desc));
 
     return Qnil;
 }
@@ -191,9 +192,10 @@ rbpango_attr_foregound_initialize(VALUE self,
                                   VALUE rb_green,
                                   VALUE rb_blue)
 {
-    DATA_PTR(self) = pango_attr_foreground_new(NUM2UINT(rb_red),
-                                               NUM2UINT(rb_green),
-                                               NUM2UINT(rb_blue));
+    G_INITIALIZE(self,
+                 pango_attr_foreground_new(NUM2UINT(rb_red),
+                                           NUM2UINT(rb_green),
+                                           NUM2UINT(rb_blue)));
 
     return Qnil;
 }
@@ -204,9 +206,10 @@ rbpango_attr_background_initialize(VALUE self,
                                    VALUE rb_green,
                                    VALUE rb_blue)
 {
-    DATA_PTR(self) = pango_attr_background_new(NUM2UINT(rb_red),
-                                               NUM2UINT(rb_green),
-                                               NUM2UINT(rb_blue));
+    G_INITIALIZE(self,
+                 pango_attr_background_new(NUM2UINT(rb_red),
+                                           NUM2UINT(rb_green),
+                                           NUM2UINT(rb_blue)));
 
     return Qnil;
 }
@@ -214,7 +217,8 @@ rbpango_attr_background_initialize(VALUE self,
 static VALUE
 rbpango_attr_underline_initialize(VALUE self, VALUE rb_underline)
 {
-    DATA_PTR(self) = pango_attr_underline_new(RVAL2PANGOUNDERLINE(rb_underline));
+    G_INITIALIZE(self,
+                 pango_attr_underline_new(RVAL2PANGOUNDERLINE(rb_underline)));
 
     return Qnil;
 }
@@ -232,7 +236,8 @@ rbpango_attr_underline_get_value(VALUE self)
 static VALUE
 rbpango_attr_strikethrough_initialize(VALUE self, VALUE rb_strikethrough)
 {
-    DATA_PTR(self) = pango_attr_strikethrough_new(RVAL2CBOOL(rb_strikethrough));
+    G_INITIALIZE(self,
+                 pango_attr_strikethrough_new(RVAL2CBOOL(rb_strikethrough)));
 
     return Qnil;
 }
@@ -240,7 +245,7 @@ rbpango_attr_strikethrough_initialize(VALUE self, VALUE rb_strikethrough)
 static VALUE
 rbpango_attr_rise_initialize(VALUE self, VALUE rb_rise)
 {
-    DATA_PTR(self) = pango_attr_rise_new(NUM2INT(rb_rise));
+    G_INITIALIZE(self, pango_attr_rise_new(NUM2INT(rb_rise)));
 
     return Qnil;
 }
@@ -260,14 +265,15 @@ rbpango_attr_shape_initialize(int argc, VALUE *argv, VALUE self)
     logical_rect = RVAL2PANGORECTANGLE(rb_logical_rect);
 
     if (NIL_P(rb_data)) {
-        DATA_PTR(self) = pango_attr_shape_new(ink_rect, logical_rect);
+        G_INITIALIZE(self, pango_attr_shape_new(ink_rect, logical_rect));
     } else {
         G_RELATIVE(self, rb_data);
-        DATA_PTR(self) = pango_attr_shape_new_with_data(ink_rect,
-                                                        logical_rect,
-                                                        (gpointer)rb_data,
-                                                        NULL,
-                                                        NULL);
+        G_INITIALIZE(self,
+                     pango_attr_shape_new_with_data(ink_rect,
+                                                    logical_rect,
+                                                    (gpointer)rb_data,
+                                                    NULL,
+                                                    NULL));
     }
 
     return Qnil;
@@ -279,7 +285,7 @@ rbpango_attr_shape_get_data(VALUE self)
     PangoAttrShape *attr_shape;
     VALUE rb_data;
 
-    Data_Get_Struct(self, PangoAttrShape, attr_shape);
+    attr_shape = (PangoAttrShape *)rbpango_attribute_from_ruby(self);
     rb_data = (VALUE)(attr_shape->data);
     return rb_data;
 }
@@ -287,7 +293,7 @@ rbpango_attr_shape_get_data(VALUE self)
 static VALUE
 rbpango_attr_scale_initialize(VALUE self, VALUE rb_scale)
 {
-    DATA_PTR(self) = pango_attr_scale_new(NUM2DBL(rb_scale));
+    G_INITIALIZE(self, pango_attr_scale_new(NUM2DBL(rb_scale)));
 
     return Qnil;
 }
@@ -295,7 +301,7 @@ rbpango_attr_scale_initialize(VALUE self, VALUE rb_scale)
 static VALUE
 rbpango_attr_fallback_initialize(VALUE self, VALUE rb_enable_fallback)
 {
-    DATA_PTR(self) = pango_attr_fallback_new(RVAL2CBOOL(rb_enable_fallback));
+    G_INITIALIZE(self, pango_attr_fallback_new(RVAL2CBOOL(rb_enable_fallback)));
 
     return Qnil;
 }
@@ -303,7 +309,8 @@ rbpango_attr_fallback_initialize(VALUE self, VALUE rb_enable_fallback)
 static VALUE
 rbpango_attr_letter_spacing_initialize(VALUE self, VALUE rb_letter_spacing)
 {
-    DATA_PTR(self) = pango_attr_letter_spacing_new(NUM2INT(rb_letter_spacing));
+    G_INITIALIZE(self,
+                 pango_attr_letter_spacing_new(NUM2INT(rb_letter_spacing)));
 
     return Qnil;
 }
@@ -314,9 +321,10 @@ rbpango_attr_underline_color_initialize(VALUE self,
                                         VALUE rb_green,
                                         VALUE rb_blue)
 {
-    DATA_PTR(self) = pango_attr_underline_color_new(NUM2UINT(rb_red),
-                                                    NUM2UINT(rb_green),
-                                                    NUM2UINT(rb_blue));
+    G_INITIALIZE(self,
+                 pango_attr_underline_color_new(NUM2UINT(rb_red),
+                                                NUM2UINT(rb_green),
+                                                NUM2UINT(rb_blue)));
 
     return Qnil;
 }
@@ -327,9 +335,10 @@ rbpango_attr_strikethrough_color_initialize(VALUE self,
                                             VALUE rb_green,
                                             VALUE rb_blue)
 {
-    DATA_PTR(self) = pango_attr_strikethrough_color_new(NUM2UINT(rb_red),
-                                                        NUM2UINT(rb_green),
-                                                        NUM2UINT(rb_blue));
+    G_INITIALIZE(self,
+                 pango_attr_strikethrough_color_new(NUM2UINT(rb_red),
+                                                    NUM2UINT(rb_green),
+                                                    NUM2UINT(rb_blue)));
 
     return Qnil;
 }
@@ -337,7 +346,8 @@ rbpango_attr_strikethrough_color_initialize(VALUE self,
 static VALUE
 rbpango_attr_absolute_size_initialize(VALUE self, VALUE rb_absolute_size)
 {
-    DATA_PTR(self) = pango_attr_size_new_absolute(NUM2INT(rb_absolute_size));
+    G_INITIALIZE(self,
+                 pango_attr_size_new_absolute(NUM2INT(rb_absolute_size)));
 
     return Qnil;
 }
@@ -345,7 +355,7 @@ rbpango_attr_absolute_size_initialize(VALUE self, VALUE rb_absolute_size)
 static VALUE
 rbpango_attr_gravity_initialize(VALUE self, VALUE rb_gravity)
 {
-    DATA_PTR(self) = pango_attr_gravity_new(RVAL2PANGOGRAVITY(rb_gravity));
+    G_INITIALIZE(self, pango_attr_gravity_new(RVAL2PANGOGRAVITY(rb_gravity)));
 
     return Qnil;
 }
@@ -366,7 +376,7 @@ rbpango_attr_gravity_hint_initialize(VALUE self, VALUE rb_gravity_hint)
     PangoGravityHint hint;
 
     hint = RVAL2PANGOGRAVITYHINT(rb_gravity_hint);
-    DATA_PTR(self) = pango_attr_gravity_hint_new(hint);
+    G_INITIALIZE(self, pango_attr_gravity_hint_new(hint));
 
     return Qnil;
 }
@@ -384,7 +394,8 @@ rbpango_attr_gravity_hint_get_value(VALUE self)
 static VALUE
 rbpango_attr_font_features_initialize(VALUE self, VALUE rb_font_features)
 {
-    DATA_PTR(self) = pango_attr_font_features_new(RVAL2CSTR(rb_font_features));
+    G_INITIALIZE(self,
+                 pango_attr_font_features_new(RVAL2CSTR(rb_font_features)));
 
     return Qnil;
 }
@@ -392,7 +403,7 @@ rbpango_attr_font_features_initialize(VALUE self, VALUE rb_font_features)
 static VALUE
 rbpango_attr_foreground_alpha_initialize(VALUE self, VALUE rb_alpha)
 {
-    DATA_PTR(self) = pango_attr_foreground_alpha_new(NUM2UINT(rb_alpha));
+    G_INITIALIZE(self, pango_attr_foreground_alpha_new(NUM2UINT(rb_alpha)));
 
     return Qnil;
 }
@@ -400,7 +411,7 @@ rbpango_attr_foreground_alpha_initialize(VALUE self, VALUE rb_alpha)
 static VALUE
 rbpango_attr_background_alpha_initialize(VALUE self, VALUE rb_alpha)
 {
-    DATA_PTR(self) = pango_attr_background_alpha_new(NUM2UINT(rb_alpha));
+    G_INITIALIZE(self, pango_attr_background_alpha_new(NUM2UINT(rb_alpha)));
 
     return Qnil;
 }
@@ -440,8 +451,7 @@ rbpango_attribute_init(VALUE mPango)
     VALUE cAttrForegroundAlpha;
     VALUE cAttrBackgroundAlpha;
 
-    cAttribute = rb_define_class_under(mPango, "Attribute", rb_cData);
-    rb_define_alloc_func(cAttribute, rbpango_attribute_allocate);
+    cAttribute = G_DEF_CLASS(pango_attribute_get_type(), "Attribute", mPango);
 
 #define DEFINE_ABSTRACT_ATTRIBUTE_BEGIN(ClassName, parent) do { \
         c ## ClassName = rb_define_class_under(mPango,          \