pango 3.4.7 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c719bc9d4ba242899e118ca77e6852342f00f97d9c53270f252cffd7bb24c729
-  data.tar.gz: a730d2ae6c24392d6d1c84a04743f19d21d947188e1cb49f9167337bab837d91
+  metadata.gz: be28139580135340befb1427090197a0310f50f220991fa27221d616017faaa2
+  data.tar.gz: 389b6d52f9849b2595cbdb3035b5c44444d24fcd4fc0e7602b94546ea752ec24
 SHA512:
-  metadata.gz: 69464643ad58f2bd6dd53c53faf3e2ae28a37b9f8916ed2ac56252c76594b0fefdfa23d490ebd8c0be0b5d6890c531166f3e6d8b4033bcc522c63516ac9f891c
-  data.tar.gz: 3fbdcd92c07848bb22b1329f4ce84776925cee8fb332658863c6df6cd66fc2aa4e6610bb8497a46cc9d9dcbd523965e6eff820e9f03a47877382ba7f438616c7
+  metadata.gz: 25e0f41c2c2665b39d34eccfbd6ac276e21379aae031cf08c1a1294dddcb39a4bc1e2355268feb07271d8fd18a389343e563c2d1d3cf474d1d0a29bf4c2729a2
+  data.tar.gz: dd1e6c4860451ded190eaea7798f93c7bf71f7815c74086437d21e300e5b5af22614c21cd6ca5d541a90a73722cddecf596aaca4de6456b9c224702ac168dc97

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/ext/pango/rb-pango.c

@@ -28,6 +28,21 @@ rg_s_pixels(G_GNUC_UNUSED VALUE self, VALUE pixels)
     return rb_float_new(PANGO_PIXELS(NUM2DBL(pixels)));
 }
 
+#ifdef _WIN32
+/* Workaround: See glib2/ext/glib2/rbglib.c for details. */
+BOOL WINAPI
+DllMain(G_GNUC_UNUSED HINSTANCE hinstDLL,
+        G_GNUC_UNUSED DWORD fdwReason,
+        G_GNUC_UNUSED LPVOID lpvReserved);
+BOOL WINAPI
+DllMain(G_GNUC_UNUSED HINSTANCE hinstDLL,
+        G_GNUC_UNUSED DWORD fdwReason,
+        G_GNUC_UNUSED LPVOID lpvReserved)
+{
+  return TRUE;
+}
+#endif
+
 void
 Init_pango(void)
 {

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.7
+  version: 3.5.1
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-30 00:00:00.000000000 Z
+date: 2022-01-17 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.7
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.7
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.7
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.7
+        version: 3.5.1
 description: Ruby/Pango is a Ruby binding of pango-1.x based on GObject-Introspection.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: Ruby/Pango is a Ruby binding of pango-1.x.