pango 3.4.9 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89faabce8408c681178fe11b65625f7728b33b893ff19efc24aa2f988fe61cd7
-  data.tar.gz: c92189d2f671c9a7145afdf16cab822868cf852c306d85018301a5be719fef34
+  metadata.gz: 937e08dda62e2b0014da3bff2f3c31f75a7e787c2c45af0b3b35e72d5d1d45c5
+  data.tar.gz: efb473920b5036c52a73c540b70ab57d4045e31439761255752e8296cf35e0af
 SHA512:
-  metadata.gz: 55b361f9693af92870ba64cb513bd3eee314b2ae4c0c84adb105f94a7102de00c0e6a5d1c259819047f17b15ff16a8e3bcdc86d8e7d9df7d9b03e2f62db94fb0
-  data.tar.gz: 28e29fcf99a41f70c186d1d9931a17e25e5431ef59f7123d5b219d97a5e27b70006a2fe2c2dfc4da1e365be7330c9622eec506b291a3731bdcc4a8042e176e2f
+  metadata.gz: 2c5b6a71891497b254426a8409a7064778b764e2095204d7386a1c1c56860d8060ead68e81dcc4180e6e409435bc4765a58c01f367fcb34581a06e72acfd46fa
+  data.tar.gz: d199e895488c5cb6ce554842651d7d8c62dd261936d8eb298114642f1655f8b854dc54da40c5e7bd884d0c8b614db2e6492eb5da80293a36f58b9825017c8f32

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2017-2022  Ruby-GNOME 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,10 +23,12 @@
 #define RG_TARGET_NAMESPACE cAttrIterator
 #define _SELF(self) (RVAL2PANGOATTRITERATOR(self))
 
-G_DEFINE_BOXED_TYPE(PangoAttrIterator,
-                    pango_attr_iterator,
-                    pango_attr_iterator_copy,
-                    pango_attr_iterator_destroy);
+#if !PANGO_CHECK_VERSION(1, 44, 0)
+  G_DEFINE_BOXED_TYPE(PangoAttrIterator,
+                      pango_attr_iterator,
+                      pango_attr_iterator_copy,
+                      pango_attr_iterator_destroy);
+#endif
 
 static VALUE
 rg_attrs(VALUE self)

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017-2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2017-2022  Ruby-GNOME 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,14 +20,6 @@
 
 #include "rb-pango-private.h"
 
-#ifndef PANGO_CHECK_VERSION
-#  define PANGO_CHECK_VERSION(major, minor, micro)                      \
-    (PANGO_VERSION_MAJOR > (major) ||                                   \
-     (PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR > (minor)) || \
-     (PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR == (minor) && \
-      PANGO_VERSION_MICRO >= (micro)))
-#endif
-
 #if !PANGO_CHECK_VERSION(1, 44, 0)
 static GType
 pango_attribute_get_type(void)

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2017-2022  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,14 @@
 
 #include "rb-pango.h"
 
+#ifndef PANGO_CHECK_VERSION
+#  define PANGO_CHECK_VERSION(major, minor, micro)                      \
+    (PANGO_VERSION_MAJOR > (major) ||                                   \
+     (PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR > (minor)) || \
+     (PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR == (minor) && \
+      PANGO_VERSION_MICRO >= (micro)))
+#endif
+
 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);

data/lib/pango/cairo-loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2017-2021  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,15 +14,18 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-module Pango
-  class CairoLoader < GObjectIntrospection::Loader
+module PangoCairo
+  class Loader < GObjectIntrospection::Loader
     private
     def pre_load(repository, namespace)
-      @context_class = @base_module.const_get(:Context)
+      @context_cairo_methods_module =
+        define_methods_module(:ContextCairoMethods)
+      @cairo_context_methods_module =
+        define_methods_module(:CairoContextMethods)
     end
 
     def post_load(repository, namespace)
-      font_map_class = @base_module.const_get("CairoFontMap")
+      font_map_class = @base_module::FontMap
       font_types = []
       font_types << :quartz if Cairo::FontFace.quartz_supported?
       font_types << :win32 if Cairo::Surface.quartz_supported?
@@ -30,45 +33,52 @@ module Pango
       font_types.each do |font_type|
         font_map = font_map_class.new_for_font_type(font_type)
         next if font_map.nil?
-        @base_module.const_set(font_map.class.gtype.name.gsub(/\APango/, ""),
-                               font_map.class)
+        name = font_map.class.gtype.name.gsub(/\APangoCairo/, "")
+        next if @base_module.const_defined?(name)
+        @base_module.const_set(name, font_map.class)
       end
-    end
+      apply_methods_module(@context_cairo_methods_module, Pango::Context)
+      apply_methods_module(@cairo_context_methods_module, Cairo::Context)
 
-    def rubyish_class_name(info)
-      "Cairo#{super}"
+      @base_module.constants.each do |constant|
+        case constant
+        when :INVOKERS,
+             :Loader
+          next
+        else
+          value = @base_module.const_get(constant)
+          next if value == @context_cairo_methods_module
+          next if value == @cairo_context_methods_module
+          Pango.const_set("Cairo#{constant}", value)
+        end
+      end
     end
 
     def load_function_info(info)
       case info.name
       when /\Acontext_get_(.+)\z/
         method_name = $1
-        define_method(info, @context_class, method_name)
+        define_method(info, @context_cairo_methods_module, method_name)
       when /\Acontext_set_(.+)\z/
         method_base_name = $1
         setter_method_name = "set_#{method_base_name}"
-        if @context_class.method_defined?(setter_method_name)
-          # ignore
-          return
-        end
-        define_method(info, @context_class, setter_method_name)
+        define_method(info, @context_cairo_methods_module, setter_method_name)
         if info.n_args == 2
           equal_method_name = "#{method_base_name}="
-          remove_existing_method(@context_class, equal_method_name)
-          @context_class.__send__(:alias_method,
-                                  equal_method_name,
-                                  setter_method_name)
+          @context_cairo_methods_module.__send__(:alias_method,
+                                                 equal_method_name,
+                                                 setter_method_name)
         end
       when /\Afont_map_/
         # ignore
       when /\Acreate_(.+)\z/
-        define_method(info, Cairo::Context, "create_pango_#{$1}")
+        define_method(info, @cairo_context_methods_module, "create_pango_#{$1}")
       when /\A(.+_path)\z/
-        define_method(info, Cairo::Context, "pango_#{$1}")
+        define_method(info, @cairo_context_methods_module, "pango_#{$1}")
       when /\Ashow_(.+)\z/
-        define_method(info, Cairo::Context, "show_pango_#{$1}")
+        define_method(info, @cairo_context_methods_module, "show_pango_#{$1}")
       when /\Aupdate_(.+)\z/
-        define_method(info, Cairo::Context, "update_pango_#{$1}")
+        define_method(info, @cairo_context_methods_module, "update_pango_#{$1}")
       else
         warn("Unsupported PangoCairo function: #{info.name}")
       end

data/lib/pango/fc-loader.rb

@@ -14,11 +14,24 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-module Pango
-  class FcLoader < GObjectIntrospection::Loader
-    private
-    def rubyish_class_name(info)
-      "Fc#{super}"
+module PangoFc
+  class Loader < GObjectIntrospection::Loader
+    def post_load(repository, namespace)
+      @base_module.constants.each do |constant|
+        case constant
+        when :INVOKERS,
+             :Loader
+          next
+        else
+          if constant.to_s.upcase == constant.to_s
+            name = "FC_#{constant}"
+          else
+            name = "Fc#{constant}"
+          end
+          value = @base_module.const_get(constant)
+          Pango.const_set(name, value)
+        end
+      end
     end
   end
 end

data/lib/pango/ft2-loader.rb

@@ -14,11 +14,24 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-module Pango
-  class FT2Loader < GObjectIntrospection::Loader
-    private
-    def rubyish_class_name(info)
-      "FT2#{super}"
+module PangoFT2
+  class Loader < GObjectIntrospection::Loader
+    def post_load(repository, namespace)
+      @base_module.constants.each do |constant|
+        case constant
+        when :INVOKERS,
+             :Loader
+          next
+        else
+          if constant.to_s.upcase == constant.to_s
+            name = "FT2_#{constant}"
+          else
+            name = "FT2#{constant}"
+          end
+          value = @base_module.const_get(constant)
+          Pango.const_set(name, value)
+        end
+      end
     end
   end
 end

data/lib/pango/loader.rb

@@ -26,8 +26,10 @@ module Pango
       @pending_attribute_infos.each do |info|
         name = rubyish_class_name(info)
         klass = @base_module.const_get(name)
-        load_fields(info, klass)
-        load_methods(info, klass)
+        prepare_class(klass) do
+          load_fields(info, klass)
+          load_methods(info, klass)
+        end
       end
       require_libraries
       convert_attribute_classes

data/lib/pango/ot-loader.rb

@@ -14,11 +14,24 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-module Pango
-  class OTLoader < GObjectIntrospection::Loader
-    private
-    def rubyish_class_name(info)
-      "OT#{super}"
+module PangoOT
+  class Loader < GObjectIntrospection::Loader
+    def post_load(repository, namespace)
+      @base_module.constants.each do |constant|
+        case constant
+        when :INVOKERS,
+             :Loader
+          next
+        else
+          if constant.to_s.upcase == constant.to_s
+            name = "OT_#{constant}"
+          else
+            name = "OT#{constant}"
+          end
+          value = @base_module.const_get(constant)
+          Pango.const_set(name, value)
+        end
+      end
     end
   end
 end

data/lib/pango/rectangle.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2017-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -47,7 +47,9 @@ module Pango
 
     def dup
       duplicated = self.class.new(x, y, width, height)
-      duplicated.taint if tainted?
+      if respond_to?(:tainted?) and tainted?
+        duplicated.taint
+      end
       duplicated
     end
   end

data/lib/pango.rb

@@ -30,22 +30,30 @@ module Pango
 
   loader = Loader.new(self)
   loader.load("Pango")
+end
 
-  cairo_loader = CairoLoader.new(self)
-  cairo_loader.load("PangoCairo")
+module PangoCairo
+  loader = Loader.new(self)
+  loader.load("PangoCairo")
+end
 
-  fc_loader = FcLoader.new(self)
+module PangoFc
+  loader = Loader.new(self)
   begin
-    fc_loader.load("PangoFc")
+    loader.load("PangoFc")
   rescue GObjectIntrospection::RepositoryError::TypelibNotFound
   end
+end
 
-  ft2_loader = FT2Loader.new(self)
-  ft2_loader.load("PangoFT2")
+module PangoFT2
+  loader = Loader.new(self)
+  loader.load("PangoFT2")
+end
 
-  ot_loader = OTLoader.new(self)
+module PangoOT
+  loader = Loader.new(self)
   begin
-    ot_loader.load("PangoOT")
+    loader.load("PangoOT")
   rescue GObjectIntrospection::RepositoryError::TypelibNotFound
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pango
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 4.0.0
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo-gobject
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 4.0.0
 description: Ruby/Pango is a Ruby binding of pango-1.x based on GObject-Introspection.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -88,7 +88,7 @@ metadata:
   mailing_list_uri: https://sourceforge.net/p/ruby-gnome2/mailman/ruby-gnome2-devel-en
   source_code_uri: https://github.com/ruby-gnome/ruby-gnome/tree/master/pango
   msys2_mingw_dependencies: pango
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,8 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: Ruby/Pango is a Ruby binding of pango-1.x.
 test_files: []