gio2 3.5.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 736a1c5275a435a8ba65b375c1e08124841c12d460f4457af0e5908bd6e011db
-  data.tar.gz: dbc3c5a4442ca2ec6414a542dc57809bfbceefd4c735176f5690d209b56a278c
+  metadata.gz: b7c97ae956b7df9431bfca1b7927eda6a52cf5f16941d9eff97baf5e48317203
+  data.tar.gz: bf1e3577f9851f859fa205b07e69b11965e2739ab08937ef349ff442d8bd04b1
 SHA512:
-  metadata.gz: 1a5be761ccfd5e11e98bc21834c4c689932c97202233ce756bb14e1dbff756aa387b3a7e2e90c95f8634bba210b2b68376d38be43deaa0f51cc42b4a395490ec
-  data.tar.gz: 5236c7bcd2db1d1a14f746d27533985cc718e301ff232126fec8cbb4bdc5802bb7ea8dfa79547518e905dc2ec21ac466c6a110c9282ea2d1eb3bfdc8c0ad8f3c
+  metadata.gz: 5305fb1abd26851276a980d096bffde554c8f43a21c9df50f9e8aa59b78f88255299e9afa42e5052492bfeafc8b5867243aa0de671a59e09e6c3a4c231caec20
+  data.tar.gz: 9f6a6c7c54dbb0368b533c0d8ef65ba66ff22e07b2dc5c9cf4d9961ce8bcb00223bbfa6e02f950e2b2cf8ed18036c12b3adb56fbdb49abf095f7c44034d06b73

data/ext/gio2/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2014-2019  Ruby-GNOME Project Team
+# Copyright (C) 2014-2023  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,30 +23,19 @@ top_dir = base_dir.parent
 top_build_dir = Pathname(".").parent.parent.parent.expand_path
 
 mkmf_gnome2_dir = top_dir + "glib2" + "lib"
-version_suffix = ""
-unless mkmf_gnome2_dir.exist?
-  if /(-\d+\.\d+\.\d+)\z/ =~ base_dir.basename.to_s
-    version_suffix = $1
-    mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + "lib"
-  end
-end
+$LOAD_PATH.unshift(mkmf_gnome2_dir.to_s) if mkmf_gnome2_dir.exist?
 
-$LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
 
 module_name = "gio2"
 package_id = "gio-2.0"
 
 require "mkmf-gnome"
 
-["glib2", "gobject-introspection"].each do |package|
-  directory = "#{package}#{version_suffix}"
-  build_base_path = "#{directory}/tmp/#{RUBY_PLATFORM}"
-  package_library_name = package.gsub(/-/, "_")
-  build_dir = "#{build_base_path}/#{package_library_name}/#{RUBY_VERSION}"
-  add_depend_package(package, "#{directory}/ext/#{package}",
+["glib2"].each do |package|
+  add_depend_package(package,
+                     "#{package}/ext/#{package}",
                      top_dir.to_s,
-                     :top_build_dir => top_build_dir.to_s,
-                     :target_build_dir => build_dir)
+                     top_build_dir: top_build_dir.to_s)
 end
 
 unless required_pkg_config_package(package_id,
@@ -66,6 +55,20 @@ end
 create_pkg_config_file("Ruby/GIO2", package_id)
 
 $defs << "-DRUBY_GIO2_COMPILATION"
+case RUBY_PLATFORM
+when /darwin/
+  symbols_in_external_bundles = [
+    "_rbg_define_method",
+    "_rbgobj_add_relative",
+    "_rbgobj_boxed_get",
+    "_rbgobj_gvalue_to_rvalue",
+    "_rbgobj_ruby_object_from_instance",
+    "_rbgobj_set_signal_func",
+  ]
+  symbols_in_external_bundles.each do |symbol|
+    $DLDFLAGS << " -Wl,-U,#{symbol}"
+  end
+end
 create_makefile(module_name)
 
 pkg_config_dir = with_config("pkg-config-dir")

data/ext/gio2/rb-gio2.c

@@ -22,21 +22,6 @@
 
 #define RG_TARGET_NAMESPACE rb_mGio
 
-#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_gio2 (void)
 {

data/ext/gio2/rb-gio2.h

@@ -20,7 +20,7 @@
 
 #include <gio/gio.h>
 
-#include <rb-gobject-introspection.h>
+#include <rbgobject.h>
 
 extern void Init_gio2 (void);
 G_GNUC_INTERNAL extern void rb_gio2_init_application (VALUE rb_mGio);

data/lib/gio2/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2021  Ruby-GNOME Project Team
+# Copyright (C) 2013-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
@@ -76,6 +76,7 @@ module Gio
       require "gio2/settings"
       require "gio2/settings-schema-source"
       require "gio2/simple-action"
+      require "gio2/volume"
 
       require "gio2/deprecated"
     end
@@ -210,6 +211,20 @@ module Gio
       end
     end
 
+    def rubyish_method_name(function_info, options={})
+      case function_info.name
+      when "get_mount"
+        case function_info.container&.name
+        when "Volume"
+          "get_mount"
+        else
+          super
+        end
+      else
+        super
+      end
+    end
+
     def rubyish_class_name(info)
       case info.name
       when /Enum\z/

data/lib/gio2/volume.rb

@@ -0,0 +1,28 @@
+# Copyright (C) 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
+# 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
+
+module Gio
+  module Volume
+    alias_method :mount_raw, :mount
+    def mount(*args, &block)
+      if args.size.zero?
+        get_mount
+      else
+        mount_raw(*args, &block)
+      end
+    end
+  end
+end

data/test/test-action-map.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2022  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
@@ -48,4 +48,19 @@ class TestActionMap < Test::Unit::TestCase
       assert_equal([action, "X"], args)
     end
   end
+
+  def test_gc
+    GC.start
+    n_alive_actions_before = ObjectSpace.each_object(Gio::SimpleAction) {}
+    n_tries = 100
+    n_tries.times do |i|
+      action_name = "test#{i}"
+      action = Gio::SimpleAction.new(action_name)
+      @map.add_action(action)
+    end
+    GC.start
+    n_alive_actions_after = ObjectSpace.each_object(Gio::SimpleAction) {}
+    n_alive_actions = n_alive_actions_after - n_alive_actions_before
+    assert_equal(n_tries, n_alive_actions)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gio2
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 4.1.2
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2023-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.1.2
 description: Ruby/GIO2 provide Ruby binding to a VFS API and useful APIs for desktop
   applications (such as networking and D-Bus support).
 email: ruby-gnome2-devel-en@lists.sourceforge.net
@@ -79,6 +79,7 @@ files:
 - lib/gio2/settings-schema-source.rb
 - lib/gio2/settings.rb
 - lib/gio2/simple-action.rb
+- lib/gio2/volume.rb
 - test/fixture/Rakefile
 - test/fixture/content-type/x-content/unix-software/autorun.sh
 - test/fixture/resource/Rakefile
@@ -124,7 +125,7 @@ licenses:
 - LGPL-2.1+
 metadata:
   msys2_mingw_dependencies: glib-networking
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,8 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key: 
+rubygems_version: 3.5.0.dev
+signing_key:
 specification_version: 4
 summary: Ruby/GIO2 is a Ruby binding of gio-2.x.
 test_files: []