pango 3.2.5 → 3.2.6

data/ext/pango/rb-pango-conversions.h

@@ -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
@@ -75,7 +75,7 @@ extern PangoAttribute *rbpango_attribute_from_ruby(VALUE rb_attribute);
 #define PANGOLOGATTR2RVAL(o)               (BOXED2RVAL(o, PANGO_TYPE_LOG_ATTR))
 #define RVAL2PANGOMATRIX(o)                ((PangoMatrix*)RVAL2BOXED(o, PANGO_TYPE_MATRIX))
 #define PANGOMATRIX2RVAL(o)                (BOXED2RVAL(o, PANGO_TYPE_MATRIX))
-#define RVAL2PANGORECTANGLE(o)             ((PangoRectangle *)DATA_PTR(o))
+#define RVAL2PANGORECTANGLE(o)             ((PangoRectangle *)rb_gi_struct_get_raw(o, G_TYPE_NONE))
 #define RVAL2PANGOSCRIPTITER(o)            ((PangoScriptIter*)RVAL2BOXED(o, PANGO_TYPE_SCRIPT_ITER))
 #define PANGOSCRIPTITER2RVAL(o)            (BOXED2RVAL(o, PANGO_TYPE_SCRIPT_ITER))
 #define RVAL2PANGOTABARRAY(o)              ((PangoTabArray*)RVAL2BOXED(o, PANGO_TYPE_TAB_ARRAY))
@@ -115,4 +115,4 @@ extern PangoAttribute *rbpango_attribute_from_ruby(VALUE rb_attribute);
 #define RVAL2PANGOFONTMASK(o)              (RVAL2GFLAGS(o, PANGO_TYPE_FONT_MASK))
 #define PANGOFONTMASK2RVAL(o)              (GFLAGS2RVAL(o, PANGO_TYPE_FONT_MASK))
 
-#define RVAL2PANGOATTR(o)                  (DATA_PTR(o))
+#define RVAL2PANGOATTR(o)                  (rbpango_attribute_from_ruby(o))

data/ext/pango/rb-pango-private.h

@@ -25,5 +25,4 @@
 G_GNUC_INTERNAL void rbpango_attribute_init(VALUE mPango);
 G_GNUC_INTERNAL void rbpango_attr_iterator_init(VALUE mPango);
 G_GNUC_INTERNAL void rbpango_attr_list_init(VALUE mPango);
-G_GNUC_INTERNAL void rbpango_context_init(VALUE mPango);
 G_GNUC_INTERNAL void rbpango_scale_init(VALUE mPango);

data/ext/pango/rb-pango.c

@@ -40,6 +40,5 @@ Init_pango(void)
     rbpango_attribute_init(RG_TARGET_NAMESPACE);
     rbpango_attr_iterator_init(RG_TARGET_NAMESPACE);
     rbpango_attr_list_init(RG_TARGET_NAMESPACE);
-    rbpango_context_init(RG_TARGET_NAMESPACE);
     rbpango_scale_init(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rb-pango.h

@@ -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
@@ -23,6 +23,7 @@
 #include <pango/pango.h>
 
 #include <rbgobject.h>
+#include <rb-gobject-introspection.h>
 
 #include "rb-pango-conversions.h"
 

data/lib/pango/loader.rb

@@ -1,4 +1,4 @@
-# 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,10 +30,22 @@ module Pango
         load_methods(info, klass)
       end
       require_libraries
+      convert_attribute_classes
+    end
+
+    def convert_attribute_classes
+      self.class.register_boxed_class_converter(Attribute.gtype) do |attribute|
+        attribute.klass.type.to_class
+      end
     end
 
     def load_struct_info(info)
       case info.name
+      when "AttrClass"
+        klass = self.class.define_struct(info.size,
+                                         info.name,
+                                         @base_module)
+        load_fields(info, klass)
       when /Class\z/
         super
       when "Attribute", /\AAttr[A-Z]/

data/lib/pango/rectangle.rb

@@ -1,4 +1,4 @@
-# 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
@@ -28,5 +28,11 @@ module Pango
     def to_a
       [x, y, width, height]
     end
+
+    def dup
+      duplicated = self.class.new(x, y, width, height)
+      duplicated.taint if tainted?
+      duplicated
+    end
   end
 end

data/pango.gemspec

@@ -0,0 +1,43 @@
+# -*- ruby -*-
+#
+# Copyright (C) 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
+# 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
+
+require_relative "../glib2/version"
+
+Gem::Specification.new do |s|
+  s.name          = "pango"
+  s.summary       = "Ruby/Pango is a Ruby binding of pango-1.x."
+  s.description   = "Ruby/Pango is a Ruby binding of pango-1.x."
+  s.author        = "The Ruby-GNOME2 Project Team"
+  s.email         = "ruby-gnome2-devel-en@lists.sourceforge.net"
+  s.homepage      = "https://ruby-gnome2.osdn.jp/"
+  s.licenses      = ["LGPL-2.1+"]
+  s.version       = ruby_glib2_version
+  s.extensions    = ["ext/#{s.name}/extconf.rb"]
+  s.require_paths = ["lib"]
+  s.files = [
+    "COPYING.LIB",
+    "README.md",
+    "Rakefile",
+    "#{s.name}.gemspec",
+    "extconf.rb",
+    "ext/#{s.name}/depend",
+  ]
+  s.files += Dir.glob("lib/**/*.rb")
+  s.files += Dir.glob("ext/#{s.name}/*.{c,h,def,rb}")
+  s.files += Dir.glob("test/**/*")
+end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pango
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: cairo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.14.0
-- !ruby/object:Gem::Dependency
-  name: cairo-gobject
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.5
-- !ruby/object:Gem::Dependency
-  name: gobject-introspection
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.5
+date: 2018-06-06 00:00:00.000000000 Z
+dependencies: []
 description: Ruby/Pango is a Ruby binding of pango-1.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -59,6 +17,8 @@ extensions:
 - ext/pango/extconf.rb
 extra_rdoc_files: []
 files:
+- COPYING.LIB
+- README.md
 - Rakefile
 - ext/pango/depend
 - ext/pango/extconf.rb
@@ -66,7 +26,6 @@ files:
 - ext/pango/rb-pango-attr-iterator.c
 - ext/pango/rb-pango-attr-list.c
 - ext/pango/rb-pango-attribute.c
-- ext/pango/rb-pango-context.c
 - ext/pango/rb-pango-conversions.h
 - ext/pango/rb-pango-private.h
 - ext/pango/rb-pango-scale.c
@@ -86,6 +45,7 @@ files:
 - lib/pango/matrix.rb
 - lib/pango/rectangle.rb
 - lib/pango/version.rb
+- pango.gemspec
 - test/pango-test-utils.rb
 - test/run-test.rb
 - test/test-analysis.rb
@@ -104,7 +64,7 @@ files:
 - test/test-pango.rb
 - test/test-rectangle.rb
 - test/test-version.rb
-homepage: http://ruby-gnome2.sourceforge.jp/
+homepage: https://ruby-gnome2.osdn.jp/
 licenses:
 - LGPL-2.1+
 metadata: {}
@@ -116,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -124,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: Ruby/Pango is a Ruby binding of pango-1.x.

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

@@ -1,79 +0,0 @@
-/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/*
- *  Copyright (C) 2017  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
- */
-
-#include "rb-pango-private.h"
-
-#if PANGO_VERSION_CHECK(1, 18, 0)
-#  include <pango/pangocairo.h>
-#  include <rb_cairo.h>
-#endif
-
-#define RG_TARGET_NAMESPACE cContext
-
-#if PANGO_VERSION_CHECK(1, 18, 0)
-static void
-shape_renderer_callback(cairo_t *cr,
-                        PangoAttrShape *attr,
-                        gboolean do_path,
-                        gpointer data)
-{
-    VALUE rb_cr;
-    VALUE rb_mPango;
-    VALUE rb_cPangoAttrShape;
-    VALUE rb_attr;
-    VALUE rb_do_path;
-    VALUE rb_callback;
-    ID id_call;
-
-    rb_cr = CRCONTEXT2RVAL(cr);
-    rb_mPango = rb_const_get(rb_cObject, rb_intern("Pango"));
-    rb_cPangoAttrShape = rb_const_get(rb_mPango, rb_intern("AttrShape"));
-    rb_attr = Data_Wrap_Struct(rb_cPangoAttrShape,
-                               NULL,
-                               pango_attribute_destroy,
-                               pango_attribute_copy((PangoAttribute *)attr));
-    rb_do_path = CBOOL2RVAL(do_path);
-    rb_callback = (VALUE)data;
-    CONST_ID(id_call, "call");
-    rb_funcall(rb_callback, id_call, 3, rb_cr, rb_attr, rb_do_path);
-}
-
-static VALUE
-rg_set_shape_renderer(VALUE self)
-{
-    VALUE func = rb_block_proc();
-    rb_iv_set(self, "@shape_renderer", func);
-    pango_cairo_context_set_shape_renderer(RVAL2PANGOCONTEXT(self),
-                                           shape_renderer_callback,
-                                           (gpointer)func,
-                                           NULL);
-    return self;
-}
-#endif
-
-void
-rbpango_context_init(VALUE mPango)
-{
-    VALUE RG_TARGET_NAMESPACE;
-
-    RG_TARGET_NAMESPACE = rb_const_get(mPango, rb_intern("Context"));
-
-    RG_DEF_METHOD(set_shape_renderer, 0);
-}