glib2 3.2.5 → 3.2.6

data/ext/glib2/rbgobj_type.c

@@ -99,20 +99,15 @@ rbgobj_class_info_fill_name(RGObjClassInfo *cinfo)
     cinfo->data_type->wrap_struct_name = cinfo->name;
 }
 
-static RGObjClassInfo *
-rbgobj_class_info_register_without_lock(GType gtype, VALUE klass)
+static rb_data_type_t *
+rbgobj_class_info_create_data_type(VALUE klass)
 {
     rb_data_type_t *data_type;
-    RGObjClassInfo *cinfo;
-    GType fundamental_type;
-    RGObjClassInfoDynamic *cinfod;
-    void *gclass = NULL;
-    VALUE c;
 
     data_type = RB_ZALLOC(rb_data_type_t);
     data_type->function.dmark = cinfo_mark;
     data_type->function.dfree = cinfo_free;
-    if (RB_TYPE_P(klass, RUBY_T_CLASS)) {
+    if (RB_TYPE_P(klass, RUBY_T_CLASS) && klass != rb_cObject) {
         VALUE p = RCLASS_SUPER(klass);
         while (p != rb_cObject) {
             if (RTYPEDDATA_P(p)) {
@@ -124,6 +119,20 @@ rbgobj_class_info_register_without_lock(GType gtype, VALUE klass)
     }
     data_type->flags = RUBY_TYPED_FREE_IMMEDIATELY;
 
+    return data_type;
+}
+
+static RGObjClassInfo *
+rbgobj_class_info_register_without_lock(GType gtype, VALUE klass)
+{
+    rb_data_type_t *data_type;
+    RGObjClassInfo *cinfo;
+    GType fundamental_type;
+    RGObjClassInfoDynamic *cinfod;
+    void *gclass = NULL;
+    VALUE c;
+
+    data_type = rbgobj_class_info_create_data_type(klass);
     c = TypedData_Make_Struct(rb_cData, RGObjClassInfo, data_type, cinfo);
     cinfo->klass = klass;
     cinfo->gtype = gtype;
@@ -493,11 +502,13 @@ rbgobj_register_class(VALUE klass,
                       gboolean klass2gtype,
                       gboolean gtype2klass)
 {
-    RGObjClassInfo* cinfo = NULL;
+    rb_data_type_t *data_type = NULL;
+    RGObjClassInfo *cinfo = NULL;
     VALUE c = Qnil;
 
     if (klass2gtype) {
-        c = Data_Make_Struct(rb_cData, RGObjClassInfo, cinfo_mark, NULL, cinfo);
+        data_type = rbgobj_class_info_create_data_type(klass);
+        c = TypedData_Make_Struct(rb_cData, RGObjClassInfo, data_type, cinfo);
     }
     if (gtype2klass && !cinfo)
         cinfo = g_new(RGObjClassInfo, 1);
@@ -508,6 +519,7 @@ rbgobj_register_class(VALUE klass,
         cinfo->mark  = NULL;
         cinfo->free  = NULL;
         cinfo->flags = 0;
+        cinfo->data_type = data_type;
     }
 
     if (klass2gtype)

data/ext/glib2/rbgobject.h

@@ -214,6 +214,8 @@ extern GType rbgobj_gtype_get(VALUE obj);
 typedef VALUE (*GValToRValSignalFunc)(guint num,const GValue* values);
 extern void rbgobj_set_signal_func(VALUE klass, const gchar *sig_name, GValToRValSignalFunc func);
 extern GValToRValSignalFunc rbgobj_get_signal_func(guint signal_id);
+extern VALUE rbgobj_signal_new(guint id);
+/* Deprecated. Use rbgobj_signal_new() instead. */
 extern VALUE rbgobj_signal_wrap(guint sig_id);
 
 typedef struct {

data/ext/glib2/rbgprivate.h

@@ -21,6 +21,15 @@
 #ifndef __RBGPRIVATE_H__
 #define __RBGPRIVATE_H__
 
+/*
+ * CentOS 6: GLib 2.28
+ * CentOS 7: GLib 2.50
+ * Ubuntu 14.04: GLib 2.40
+ * Ubuntu 16.04: GLib 2.48
+ * Ubuntu 18.04: GLib 2.54
+ */
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_28
+
 #include "rbgobject.h"
 
 #ifndef HAVE_RB_ERRINFO
@@ -114,6 +123,8 @@ G_GNUC_INTERNAL void rg_enum_add_constants(VALUE mod, GType enum_type, const gch
 G_GNUC_INTERNAL void rg_flags_add_constants(VALUE mod, GType flags_type, const gchar *strip_prefix);
 G_GNUC_INTERNAL char *rg_obj_constant_lookup(const char *name);
 
+G_GNUC_INTERNAL void Init_glib_gc(void);
+
 G_GNUC_INTERNAL void Init_gutil(void);
 G_GNUC_INTERNAL void Init_gutil_callback(void);
 G_GNUC_INTERNAL void Init_glib_gettext(void);

data/glib2.gemspec

@@ -0,0 +1,48 @@
+# -*- 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 "version"
+
+Gem::Specification.new do |s|
+  s.name          = "glib2"
+  s.summary       = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
+  s.description   =
+    "Ruby/GLib2 provides " +
+    "base features for GLib2 based bindings and " +
+    "many useful utility features."
+  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",
+    "version.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("sample/**/*")
+  s.files += Dir.glob("test/**/*")
+end

data/lib/gnome2/rake/package-task.rb

@@ -20,15 +20,27 @@ require "gnome2/rake/windows-binary-build-task"
 module GNOME2
   module Rake
     class PackageTask
+      class << self
+        def define(spec, root_dir, &block)
+          new(spec, root_dir, &block).define
+        end
+      end
+
       include ::Rake::DSL
 
       attr_accessor :name, :summary, :description, :author, :email, :homepage, :required_ruby_version, :post_install_message
       attr_reader :root_dir
-      def initialize
+      def initialize(spec=nil, root_dir=nil)
+        @spec = spec
         initialize_variables
         initialize_configurations
-        file, line, method = caller[1].scan(/^(.*):(\d+)(?::.*`(.*)')?\Z/).first
-        @package = Package.new(File.dirname(file))
+        if @spec
+          @package = Package.new(@spec.name, root_dir)
+        else
+          file, line, method = caller[1].scan(/^(.*):(\d+)(?::.*`(.*)')?\Z/).first
+          root_dir = File.dirname(file)
+          @package = Package.new(File.basename(root_dir), root_dir)
+        end
         @packages = FileList["#{@package.root_dir.parent}/*"].map{|f| File.directory?(f) ? File.basename(f) : nil}.compact
         @name = @package.name
         @cross_compiling_hooks = []
@@ -107,7 +119,7 @@ module GNOME2
         @description = ""
         @author = "The Ruby-GNOME2 Project Team"
         @email = "ruby-gnome2-devel-en@lists.sourceforge.net"
-        @homepage = "http://ruby-gnome2.sourceforge.jp/"
+        @homepage = "https://ruby-gnome2.osdn.jp/"
         @external_packages = []
       end
 
@@ -120,7 +132,7 @@ module GNOME2
       end
 
       def define_spec
-        @spec = Gem::Specification.new do |s|
+        @spec ||= Gem::Specification.new do |s|
           s.name                  = @name
           s.summary               = @summary
           s.description           = @description

data/lib/gnome2/rake/package.rb

@@ -26,9 +26,9 @@ module GNOME2
       attr_reader :windows
       attr_reader :native
       attr_writer :external_packages
-      def initialize(root_dir)
+      def initialize(name, root_dir)
+        @name = name
         @root_dir = Pathname.new(root_dir).expand_path
-        @name = @root_dir.basename.to_s
         @windows = WindowsConfiguration.new
         @native = NativeConfiguration.new
         @external_packages = []

data/lib/gnome2/rake/windows-binary-build-task.rb

@@ -165,16 +165,18 @@ module GNOME2
           "MSYSTEM" => "MINGW64",
           "GREP_OPTIONS" => "--text",
           "PATH" => path,
+          "PKG_CONFIG" => pkg_config,
         }
         depended_packages = @package.windows.build_dependencies
         use_packages = [@package.name] + depended_packages
-        pkg_config_path = use_packages.collect do |package|
-          "../#{package}/#{@package.windows.relative_binary_dir}/lib/pkgconfig"
+        pkg_config_path = [rcairo_pkgconfig_path]
+        use_packages.each do |package|
+          path = "../#{package}/#{@package.windows.relative_binary_dir}/lib/pkgconfig"
+          pkg_config_path << path
         end
         env["PKG_CONFIG_PATH"] = pkg_config_path.collect do |path|
           File.expand_path(path)
         end.join(":")
-        env["PKG_CONFIG_LIBDIR"] = rcairo_pkgconfig_path
         env
       end
 
@@ -209,8 +211,8 @@ module GNOME2
         cross_file.puts(<<-CROSS_FILE)
 [host_machine]
 system = 'windows'
-cpu_family = 'x86_64'
-cpu = 'x86_64'
+cpu_family = '#{meson_cpu_family}'
+cpu = '#{meson_cpu}'
 endian = 'littel'
 
 [binaries]
@@ -219,7 +221,12 @@ cpp = '/usr/bin/#{cxx(package)}'
 ar = '/usr/bin/#{ar}'
 strip = '/usr/bin/#{strip}'
 dlltool = '/usr/bin/#{dlltool}'
-pkgconfig = '/usr/bin/pkg-config'
+pkgconfig = '/usr/bin/#{pkg_config}'
+windres = '/usr/bin/#{windres}'
+exe_wrapper = 'wine'
+
+[properties]
+root = '/usr/#{@package.windows.build_host}'
         CROSS_FILE
         cross_file.close
         sh(env.merge({
@@ -235,6 +242,24 @@ pkgconfig = '/usr/bin/pkg-config'
            *package.windows.meson_args) or exit(false)
       end
 
+      def meson_cpu_family
+        case @package.windows.build_architecture
+        when "x86"
+          "x86"
+        when "x86_64"
+          "x86_64"
+        end
+      end
+
+      def meson_cpu
+        case @package.windows.build_architecture
+        when "x86"
+          "i686"
+        when "x86_64"
+          "x86_64"
+        end
+      end
+
       def cmake(env, package)
         sh(env,
            "cmake",
@@ -322,6 +347,14 @@ pkgconfig = '/usr/bin/pkg-config'
         "#{@package.windows.build_host}-dlltool"
       end
 
+      def pkg_config
+        "#{@package.windows.build_host}-pkg-config"
+      end
+
+      def windres
+        "#{@package.windows.build_host}-windres"
+      end
+
       def g_ir_scanner_bin_dir
         "#{@package.project_root_dir}/gobject-introspection/" +
           "#{@package.native.relative_binary_dir}/bin"

data/lib/mkmf-gnome2.rb

@@ -23,7 +23,7 @@ end
 
 def disable_optimization_build_flag(flags)
   if gcc?
-    flags.gsub(/(^|\s)?-O\d(\s|$)?/, '\\1-O0\\2')
+    RbConfig.expand(flags.dup).gsub(/(^|\s)?-O\d(\s|$)?/, '\\1-O0\\2')
   else
     flags
   end
@@ -31,9 +31,10 @@ end
 
 def enable_debug_build_flag(flags)
   if gcc?
+    expanded_flags = RbConfig.expand(flags.dup)
     debug_option_pattern = /(^|\s)-g\d?(\s|$)/
-    if debug_option_pattern =~ flags
-      flags.gsub(debug_option_pattern, '\\1-g3\\2')
+    if debug_option_pattern =~ expanded_flags
+      expanded_flags.gsub(debug_option_pattern, '\\1-g3\\2')
     else
       flags + " -g3"
     end

data/sample/bookmarkfile.rb

@@ -14,13 +14,13 @@ $KCODE = "U"
 #
 # Create bookmarkfile data.
 #
-URI = "http://ruby-gnome2.sourceforge.jp/"
+URI = "https://ruby-gnome2.osdn.jp/"
 bf = GLib::BookmarkFile.new
 bf.set_title(URI, "Ruby-GNOME2 sample")
 bf.set_description(URI, "Ruby-GNOME2 Sampe for GLib::BookmarkFile")
 bf.set_mime_type(URI, "text/html")
 bf.set_private(URI, false)
-bf.set_icon(URI, "http://ruby-gnome2.sourceforge.jp/logo-gy.png", "image/png")
+bf.set_icon(URI, "https://ruby-gnome2.osdn.jp/logo-gy.png", "image/png")
 bf.set_added(URI, Time.now)
 bf.set_modified(URI, Time.now)
 bf.set_visited(URI, Time.now)

data/sample/type-register.rb

@@ -32,12 +32,12 @@ class MyButton < Gtk::Button
   end
 
   # define new signal "hoge"
-  signal_new("hoge",                  # name
-             GLib::Signal::RUN_FIRST, # flags
-             nil,                     # accumulator (XXX: not supported yet)
-             nil,                     # return type (void == nil)
-	     Integer, Integer         # parameter types
-             )
+  define_signal("hoge",                  # name
+                GLib::Signal::RUN_FIRST, # flags
+                nil,                     # accumulator (XXX: not supported yet)
+                nil,                     # return type (void == nil)
+                Integer, Integer         # parameter types
+                )
   # define default handler of "hoge" signal
   def signal_do_hoge(a, b)
     puts "MyButton#signal_do_hoge enter"

data/sample/type-register2.rb

@@ -32,12 +32,12 @@ class MyButton < Gtk::Button
   end
 
   # define new signal "hoge"
-  signal_new("hoge",                  # name
-             GLib::Signal::RUN_FIRST, # flags
-             nil,                     # accumulator (XXX: not supported yet)
-             GLib::Type["void"],      # return type
-             GLib::Type["gint"], GLib::Type["gint"] # parameter types
-             )
+  define_signal("hoge",                  # name
+                GLib::Signal::RUN_FIRST, # flags
+                nil,                     # accumulator (XXX: not supported yet)
+                GLib::Type["void"],      # return type
+                GLib::Type["gint"], GLib::Type["gint"] # parameter types
+                )
   # define default handler of "hoge" signal
   def signal_do_hoge(a, b)
     puts "MyButton#signal_do_hoge enter"

data/test/{test_signal.rb → test-signal.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-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
@@ -13,7 +13,7 @@
 # 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
- 
+
 class TestSignal < Test::Unit::TestCase
   def test_signal_flags
     assert_const_defined(GLib, :SignalFlags)
@@ -31,4 +31,36 @@ class TestSignal < Test::Unit::TestCase
     assert_kind_of(GLib::SignalMatchType, GLib::Signal::MATCH_ID)
     assert_equal(GLib::SignalMatchType::MASK, GLib::Signal::MATCH_MASK)
   end
+
+  class CustomSignalObject < GLib::Object
+    type_register
+
+    define_signal(:changed, :run_first, nil, nil)
+
+    attr_reader :n_changed
+    def initialize
+      super
+      @n_changed = 0
+    end
+
+    def signal_do_changed
+      @n_changed += 1
+    end
+  end
+
+  def test_gc
+    n = 10
+    custom_signal_object = CustomSignalObject.new
+    n.times do
+      custom_signal_object.signal_emit(:changed)
+      GC.start
+    end
+    assert_equal(n, custom_signal_object.n_changed)
+  end
+
+  def test_inspect
+    signal = CustomSignalObject.signal(:changed)
+    assert_equal("\#<GLib::Signal TestSignal::CustomSignalObject\#changed>",
+                 signal.inspect)
+  end
 end