cairo-gobject 3.5.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe625f3bfdcaecaf261b540c1cae43eaadb6762e65c411928166b44a6d39d61
-  data.tar.gz: 05cabd0e385a6319efdf3ba310d067556d131e9b43ee18d45b97b332ca25e751
+  metadata.gz: 18b53b504c8adeb01a0ea35d8bd8f00f8a9ecc96760d10d9383f0deb681fd906
+  data.tar.gz: f36ecf441b1fb7caa3e3fa91c95ee07f1170d87ff8ef6320e1f406598273efd6
 SHA512:
-  metadata.gz: f33a25dbf8a9314e83c666fc30b979978c0ff1e75a7a9635a25388b94a6c81dfece317f4682d8d2fd64a7fad5e642413668f25cd75711ff6b7273ceb23118664
-  data.tar.gz: 340a2400d70fea349626d6379b88b4ac8d7b752909f2c5b16fcbc3700823c380438db661ffd178e24d5db6857baf135249e48d12b3e5bd605a1f1ba74e2223f2
+  metadata.gz: ee409e410713259b75c1717ce9589156a88570f6515e6b2857096343cddd5ec25c2c600222f942d5c037631d6e9dcc80f4daae2c20db9adda1784c6fb039bb7e
+  data.tar.gz: 7fd27ef7e4498fd362a275e907b561109850ef52602c73891e4874967e9ccff887fb3c629a03fbb9ff7f21a8e5914b337979099f127b042e3e7003f55fd1e52d

data/ext/cairo-gobject/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2013-2019  Ruby-GNOME Project Team
+# Copyright (C) 2013-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
@@ -24,15 +24,8 @@ top_dir = base_dir.parent.expand_path
 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+)(?:\.\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 = "cairo_gobject"
 package_id = "cairo-gobject"
@@ -40,12 +33,10 @@ package_id = "cairo-gobject"
 require "mkmf-gnome"
 
 ["glib2"].each do |package|
-  directory = "#{package}#{version_suffix}"
-  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
-  add_depend_package(package, "#{directory}/ext/#{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,
@@ -68,6 +59,42 @@ create_pkg_config_file("Ruby/CairoGObject",
 ensure_objs
 
 $defs << "-DRUBY_CAIRO_GOBJECT_COMPILATION"
+case RUBY_PLATFORM
+when /darwin/
+  symbols_in_external_bundles = [
+    "_rb_cCairo_Context",
+    "_rb_cCairo_Device",
+    "_rb_cCairo_FontFace",
+    "_rb_cCairo_FontOptions",
+    "_rb_cCairo_Pattern",
+    "_rb_cCairo_Region",
+    "_rb_cCairo_ScaledFont",
+    "_rb_cCairo_Surface",
+    "_rb_cairo_context_from_ruby_object",
+    "_rb_cairo_context_to_ruby_object",
+    "_rb_cairo_device_from_ruby_object",
+    "_rb_cairo_device_to_ruby_object",
+    "_rb_cairo_font_face_from_ruby_object",
+    "_rb_cairo_font_face_to_ruby_object",
+    "_rb_cairo_font_options_from_ruby_object",
+    "_rb_cairo_font_options_to_ruby_object",
+    "_rb_cairo_pattern_from_ruby_object",
+    "_rb_cairo_pattern_to_ruby_object",
+    "_rb_cairo_region_from_ruby_object",
+    "_rb_cairo_region_to_ruby_object",
+    "_rb_cairo_scaled_font_from_ruby_object",
+    "_rb_cairo_scaled_font_to_ruby_object",
+    "_rb_cairo_surface_from_ruby_object",
+    "_rb_cairo_surface_to_ruby_object",
+    "_rbgobj_convert_define",
+    "_rbgobj_define_class",
+    "_rbgobj_gtype_new",
+    "_rbgobj_make_boxed",
+  ]
+  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/cairo-gobject/rb-cairo-gobject.c

@@ -136,21 +136,6 @@ DEFINE_CONVERSION(region,
                   RVAL2CRREGION,
                   CRREGION2RVAL)
 
-#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_cairo_gobject(void)
 {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo-gobject
 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: cairo
@@ -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/CairoGObject is a Ruby binding of cairo-gobject.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -86,7 +86,7 @@ homepage: https://ruby-gnome2.osdn.jp/
 licenses:
 - LGPL-2.1+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,8 +101,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/CairoGObject is a Ruby binding of cairo-gobject.
 test_files: []