glib2 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad74862235952e6e6ca9c8b3ad4a9277bb66cd7963844395974be279a0c814b
-  data.tar.gz: c565405f128475f84e8f9eef012ce39717d4cbfe818a422145c411b8c51f26e7
+  metadata.gz: 91d58ebbc67faae560e463b38b00e84116cfd264a108d42df4224facb91fecb6
+  data.tar.gz: 131c0aae3faa569924120d50d727ea39fcff6c2c960e3a6a70ef0873f4c9747d
 SHA512:
-  metadata.gz: 9067d95d8709acd8c6b5d78029269df842ffaeae6686ac00ca09ab0c6c433b1eed4f7faa55f1e3a782f4738bca19ba5076228615b6c4ba6a9731d8ff008318ff
-  data.tar.gz: 15de112c4301fbf3a28e8567b0c476a681ee0dd148721a42a8578b3cbd09df4ba97c7f7b23f34c07f574009ca1b25ace2fc5d5bf7e32a89c8bee494365c8d422
+  metadata.gz: 41a8a8582efd75c41738c782af415bc51ff895ef955a6f5e0fc94df15f7c0238679b8b072b9dcd48a759b5c60670937a75550a3578621ab1a59d2c297e8720d7
+  data.tar.gz: cd18a1b1b4496de1211a39dcf8a50ebec9ee1aaf2bcd63b301ff0af8f742fbdaf45dfc26cce9239b9cc817a0599546fe184629290cab3fd1d25ea31ae01cc03e

data/ext/glib2/rbglib.h

@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 #define RBGLIB_MAJOR_VERSION 4
 #define RBGLIB_MINOR_VERSION 0
-#define RBGLIB_MICRO_VERSION 5
+#define RBGLIB_MICRO_VERSION 6
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/lib/mkmf-gnome.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2019 Ruby-GNOME Project Team
+# Copyright (C) 2003-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
@@ -155,21 +155,15 @@ setup_homebrew
 
 #add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
 def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
-  gem_spec = find_gem_spec(target_name)
-  if gem_spec
-    target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
-    target_build_dir = target_source_dir
-    add_depend_package_path(target_name,
-                            target_source_dir,
-                            target_build_dir)
-  end
-
-  [top_srcdir,
-   File.join(top_srcdir, target_name),
-   $configure_args['--topdir'],
-   File.join($configure_args['--topdir'], target_name)].each do |topdir|
+  [
+    top_srcdir,
+    File.join(top_srcdir, target_name),
+    $configure_args['--topdir'],
+    File.join($configure_args['--topdir'], target_name),
+  ].each do |topdir|
     topdir = File.expand_path(topdir)
     target_source_dir_full_path = File.join(topdir, target_srcdir)
+    next unless File.exist?(target_source_dir_full_path)
 
     top_build_dir = options[:top_build_dir] || topdir
     target_build_dir = options[:target_build_dir] || target_srcdir
@@ -185,11 +179,34 @@ def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
     end
     add_depend_package_path(target_name,
                             target_source_dir_full_path,
-                            target_build_dir_full_path)
+                            target_build_dir_full_path,
+                            false)
+    return
   end
+
+  gem_spec = find_gem_spec(target_name)
+  raise "depended gem isn't found: #{target_name}" unless gem_spec
+  target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
+  target_build_dir = target_source_dir
+  add_depend_package_path(target_name, target_source_dir, target_build_dir)
 end
 
-def add_depend_package_path(target_name, target_source_dir, target_build_dir)
+def add_depend_package_path(target_name,
+                            target_source_dir,
+                            target_build_dir,
+                            is_gem=true)
+  pp [__method__,
+      target_name,
+      target_source_dir,
+      target_build_dir,
+      is_gem,
+      File.exist?(target_source_dir),
+      File.exist?(target_build_dir),
+      File.join(target_source_dir, "..", "..", "lib", target_name.gsub(/-/, "_") + ".so"),
+      File.exist?(File.join(target_source_dir, "..", "..", "lib", target_name.gsub(/-/, "_") + ".so")),
+      File.join(target_build_dir, target_name.gsub(/-/, "_") + ".so"),
+      File.exist?(File.join(target_build_dir, target_name.gsub(/-/, "_") + ".so")),
+     ]
   if File.exist?(target_source_dir)
     $INCFLAGS = "-I#{target_source_dir}".quote + " #{$INCFLAGS}"
   end
@@ -199,12 +216,20 @@ def add_depend_package_path(target_name, target_source_dir, target_build_dir)
     $INCFLAGS = "-I#{target_build_dir}".quote + " #{$INCFLAGS}"
   end
 
-  library_base_name = File.basename(target_source_dir).gsub(/-/, "_")
+  library_base_name = target_name.gsub(/-/, "_")
+  if is_gem
+    # .../glib2/ext/glib2/ -> .../glib2/ext/glib2/../../lib/
+    #                        (.../glib2/lib/)
+    library_dir = File.join(target_source_dir, "..", "..", "lib")
+  else
+    library_dir = target_build_dir
+  end
   case RUBY_PLATFORM
   when /cygwin|mingw/
-    $libs << " " << File.join(target_build_dir, "#{library_base_name}.so")
+    library_path = File.join(library_dir, "#{library_base_name}.so")
+    $libs << " #{library_path}"
   when /mswin/
-    $DLDFLAGS << " /libpath:#{target_build_dir}"
+    $DLDFLAGS << " /libpath:#{library_dir}"
     $libs << " #{library_base_name}-$(arch).lib"
   end
 end
@@ -431,10 +456,14 @@ def check_cairo(options={})
   end
   if rcairo_source_dir.nil?
     cairo_gem_spec = find_gem_spec("cairo")
-    rcairo_source_dir = cairo_gem_spec.full_gem_path if cairo_gem_spec
-  end
-
-  unless rcairo_source_dir.nil?
+    if cairo_gem_spec
+      rcairo_source_dir = cairo_gem_spec.full_gem_path
+      rcairo_ext_source_dir = File.join(rcairo_source_dir, "ext", "cairo")
+      add_depend_package_path("cairo",
+                              rcairo_ext_source_dir,
+                              rcairo_ext_source_dir)
+    end
+  else
     options = {}
     build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}"
     if File.exist?(File.join(rcairo_source_dir, build_dir))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config