glib2 3.3.9 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3801c55a0485d01299188fed3c0c31014218b6b7b14d89569eb382cb957e7a55
-  data.tar.gz: a6000f1cbbdfbd5002852cdccc94f1289e26475f03af643f86f34766b2fb9674
+  metadata.gz: d2df97b279c5c861a8774ed873d2fccfaeefaf0009985875206e41e6645affda
+  data.tar.gz: 458e5179e4eef5bdba682b26efb493ff87867b6f4e69bc34d898a84bb6778639
 SHA512:
-  metadata.gz: f6d18cfb2fbb7102f1e7e4353fa77b18f3166486645024f7153a0c1ee8219a284a7b768c6437bb777d4f10dd84e0ac72980b004c004d59c37b8ebb6739e831ff
-  data.tar.gz: 5330b0737f3f5b1363e3c75bc946717080c874bc88b51f3d450c28154481d0efa83031b7d334dc02085a834f151b2bb13fe729bce63b33ca2f7648bda19f751e
+  metadata.gz: 5bed850bc19ba04a9e9197e23dabc6aa286f535afe2021a89b16f3309e3bad200cbbab65abaf63d42aba3a3a1eec0112cadb72de53617fd90e2dabc0f8a6ef35
+  data.tar.gz: dffb95ad1aeeb6160cb906734df2781a07ded40c7d9a43edb675c6545755f9d2325d9bacdaff3b791db5f491fc328f642221b0ad89d75c306f5cd69c3ba88161

data/README.md

@@ -1,12 +1,12 @@
 # Ruby/GLib2
 
-Ruby/GLib2 is a Ruby binding of GLib-2.12.x.
+Ruby/GLib2 is a Ruby binding of GLib 2.48 or later.
 
 ## Requirements
 
-  * Ruby >= 1.9.x: https://www.ruby-lang.org/
-  * pkg-config.rb: https://github.com/rcairo/pkg-config
-  * GLib >= 2.12.x: https://www.gtk.org/
+  * Ruby >= 2.5:   https://www.ruby-lang.org/
+  * pkg-config.rb: https://github.com/ruby-gnome/pkg-config
+  * GLib >= 2.48:  https://www.gtk.org/
 
 ## Install
 
@@ -16,7 +16,7 @@ gem install glib2
 
 ## Copying
 
-Copyright (c) 2002-2019 Ruby-GNOME Project Team
+Copyright (c) 2002-2021 Ruby-GNOME Project Team
 
 This program is free software.
 You can distribute/modify this program under the terms of

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2011-2020  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
@@ -16,11 +16,13 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-$LOAD_PATH.unshift("./lib")
+base_dir = __dir__
+
+$LOAD_PATH.unshift(File.join(base_dir, "lib"))
 require "gnome2/rake/package-task"
 
-package_name = File.basename(__dir__)
-spec = Gem::Specification.load("#{package_name}.gemspec")
+package_name = File.basename(base_dir)
+spec = Gem::Specification.load(File.join(base_dir, "#{package_name}.gemspec"))
 
 GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
 end

data/ext/glib2/extconf.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019  Ruby-GNOME Project Team
+# Copyright (C) 2002-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
@@ -42,10 +42,6 @@ have_header("unistd.h")
 have_header("io.h")
 
 glib_header = "glib.h"
-have_func("g_spawn_close_pid", glib_header)
-have_func("g_thread_init", glib_header)
-have_func("g_main_depth", glib_header)
-have_func("g_listenv", glib_header)
 
 ruby_header = "ruby.h"
 have_func("rb_check_array_type", ruby_header)

data/ext/glib2/rbglib-bytes.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017-2019  Ruby-GNOME 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
@@ -32,7 +32,6 @@ rbg_is_bytes(VALUE object)
     return RVAL2CBOOL(rb_obj_is_kind_of(object, RG_TARGET_NAMESPACE));
 }
 
-#if GLIB_CHECK_VERSION(2, 32, 0)
 static VALUE RG_TARGET_NAMESPACE;
 
 static VALUE
@@ -119,12 +118,10 @@ rg_pointer(VALUE self)
 
     return ULONG2NUM((guintptr)data);
 }
-#endif
 
 void
 Init_glib_bytes(void)
 {
-#if GLIB_CHECK_VERSION(2, 32, 0)
     RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_BYTES, "Bytes", mGLib);
 
     RG_DEF_SMETHOD(try_convert, 1);
@@ -135,5 +132,4 @@ Init_glib_bytes(void)
     RG_DEF_METHOD(size, 0);
     RG_DEF_ALIAS("length", "size");
     RG_DEF_METHOD(pointer, 0);
-#endif
 }

data/ext/glib2/rbglib-gc.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2018-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2018-2020  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,32 +20,45 @@
 
 #include "rbgprivate.h"
 
-static GHashTable *rbg_objects = NULL;
+typedef struct {
+    VALUE object;
+    guint ref_count;
+} RBGGCMarkItem;
+
+typedef struct {
+    GHashTable *items;
+    GMutex mutex;
+} RBGGCMarker;
+
+static RBGGCMarker *rbg_gc_marker_raw = NULL;
 
 static void
 gc_marker_mark_each(G_GNUC_UNUSED gpointer key,
                     gpointer value,
                     G_GNUC_UNUSED gpointer user_data)
 {
-    VALUE rb_object = (VALUE)value;
-    rb_gc_mark(rb_object);
+    RBGGCMarkItem *item = value;
+    rb_gc_mark(item->object);
 }
 
 static void
 gc_marker_mark(void *data)
 {
-    GHashTable *hash_table = data;
-    g_hash_table_foreach(hash_table, gc_marker_mark_each, NULL);
+    RBGGCMarker *marker = data;
+    g_mutex_lock(&(marker->mutex));
+    g_hash_table_foreach(marker->items, gc_marker_mark_each, NULL);
+    g_mutex_unlock(&(marker->mutex));
 }
 
 static void
 gc_marker_free(void *data)
 {
-    GHashTable *hash_table = data;
-    g_hash_table_unref(hash_table);
-    if (hash_table == rbg_objects) {
-        rbg_objects = NULL;
+    RBGGCMarker *marker_raw = data;
+    if (marker_raw == rbg_gc_marker_raw) {
+        rbg_gc_marker_raw = NULL;
     }
+    g_hash_table_unref(marker_raw->items);
+    g_free(marker_raw);
 }
 
 static const rb_data_type_t rbg_gc_marker_type = {
@@ -59,95 +72,128 @@ static const rb_data_type_t rbg_gc_marker_type = {
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-void
-rbg_gc_guard(gpointer key, VALUE rb_object)
+static VALUE
+rbg_gc_marker_new_raw(void)
 {
-    if (!rbg_objects)
-        return;
+    RBGGCMarker *gc_marker_raw = g_new(RBGGCMarker, 1);
+    gc_marker_raw->items = g_hash_table_new_full(g_direct_hash,
+                                                 g_direct_equal,
+                                                 NULL,
+                                                 g_free);
+    g_mutex_init(&(gc_marker_raw->mutex));
+
+    return TypedData_Wrap_Struct(rb_cObject,
+                                 &rbg_gc_marker_type,
+                                 gc_marker_raw);
+}
+
+static void
+rbg_gc_guard_raw(RBGGCMarker *gc_marker, gpointer key, VALUE rb_object)
+{
+    g_mutex_lock(&(gc_marker->mutex));
+    RBGGCMarkItem *item = g_hash_table_lookup(gc_marker->items, key);
+    if (item) {
+        item->ref_count++;
+    } else {
+        item = g_new(RBGGCMarkItem, 1);
+        item->object = rb_object;
+        item->ref_count = 1;
+        g_hash_table_insert(gc_marker->items, key, item);
+    }
+    g_mutex_unlock(&(gc_marker->mutex));
+}
 
-    g_hash_table_insert(rbg_objects,
-                        key,
-                        (gpointer)rb_object);
+static void
+rbg_gc_unguard_raw(RBGGCMarker *gc_marker, gpointer key)
+{
+    g_mutex_lock(&(gc_marker->mutex));
+    RBGGCMarkItem *item = g_hash_table_lookup(gc_marker->items, key);
+    if (item) {
+        item->ref_count--;
+        if (item->ref_count == 0) {
+            g_hash_table_remove(gc_marker->items, key);
+        }
+    }
+    g_mutex_unlock(&(gc_marker->mutex));
+}
+
+static void
+rbg_gc_unguard_all_raw(RBGGCMarker *gc_marker)
+{
+    g_mutex_lock(&(gc_marker->mutex));
+    g_hash_table_remove_all(gc_marker->items);
+    g_mutex_unlock(&(gc_marker->mutex));
 }
 
 void
-rbg_gc_unguard(gpointer key)
+rbg_gc_guard(gpointer key, VALUE rb_object)
 {
-    if (!rbg_objects)
+    if (!rbg_gc_marker_raw)
         return;
 
-    g_hash_table_remove(rbg_objects, key);
+    rbg_gc_guard_raw(rbg_gc_marker_raw, key, rb_object);
 }
 
-static VALUE
-rbg_gc_marker_new_raw(GHashTable *rb_objects)
+void
+rbg_gc_unguard(gpointer key)
 {
-    VALUE gc_marker;
+    if (!rbg_gc_marker_raw)
+        return;
 
-    gc_marker = TypedData_Wrap_Struct(rb_cData,
-                                      &rbg_gc_marker_type,
-                                      rb_objects);
-    return gc_marker;
+    rbg_gc_unguard_raw(rbg_gc_marker_raw, key);
 }
 
 VALUE
 rbg_gc_marker_new(void)
 {
-    GHashTable *rb_objects;
-
-    rb_objects = g_hash_table_new(g_direct_hash, g_direct_equal);
-    return rbg_gc_marker_new_raw(rb_objects);
+    return rbg_gc_marker_new_raw();
 }
 
 void
 rbg_gc_marker_guard(VALUE rb_gc_marker, VALUE rb_object)
 {
-    GHashTable *rb_objects;
-
+    RBGGCMarker *gc_marker;
     TypedData_Get_Struct(rb_gc_marker,
-                         GHashTable,
+                         RBGGCMarker,
                          &rbg_gc_marker_type,
-                         rb_objects);
-    g_hash_table_insert(rb_objects,
-                        (gpointer)rb_object,
-                        (gpointer)rb_object);
+                         gc_marker);
+    rbg_gc_guard_raw(gc_marker, RVAL2POINTER(rb_object), rb_object);
 }
 
 void
 rbg_gc_marker_unguard(VALUE rb_gc_marker, VALUE rb_object)
 {
-    GHashTable *rb_objects;
-
     if (!RB_TYPE_P(rb_gc_marker, RUBY_T_DATA))
         return;
     if (!RTYPEDDATA_P(rb_gc_marker))
         return;
 
+    RBGGCMarker *gc_marker;
     TypedData_Get_Struct(rb_gc_marker,
-                         GHashTable,
+                         RBGGCMarker,
                          &rbg_gc_marker_type,
-                         rb_objects);
-    g_hash_table_remove(rb_objects, (gpointer)rb_object);
+                         gc_marker);
+    rbg_gc_unguard_raw(gc_marker, RVAL2POINTER(rb_object));
 }
 
 void
 rbg_gc_marker_unguard_all(VALUE rb_gc_marker)
 {
-    GHashTable *rb_objects;
-
+    RBGGCMarker *gc_marker;
     TypedData_Get_Struct(rb_gc_marker,
-                         GHashTable,
+                         RBGGCMarker,
                          &rbg_gc_marker_type,
-                         rb_objects);
-    g_hash_table_remove_all(rb_objects);
+                         gc_marker);
+    rbg_gc_unguard_all_raw(gc_marker);
 }
 
 void
 Init_glib_gc(void)
 {
-    VALUE gc_marker;
-
-    rbg_objects = g_hash_table_new(g_direct_hash, g_direct_equal);
-    gc_marker = rbg_gc_marker_new_raw(rbg_objects);
+    VALUE gc_marker = rbg_gc_marker_new_raw();
     rb_ivar_set(mGLib, rb_intern("gc_marker"), gc_marker);
+    TypedData_Get_Struct(gc_marker,
+                         RBGGCMarker,
+                         &rbg_gc_marker_type,
+                         rbg_gc_marker_raw);
 }

data/ext/glib2/rbglib-variant-type.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-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
@@ -303,14 +303,10 @@ Init_glib_variant_type(void)
         DEF_TYPE(DICT_ENTRY);
         DEF_TYPE(DICTIONARY);
         DEF_TYPE(STRING_ARRAY);
-#  if GLIB_CHECK_VERSION(2, 30, 0)
         DEF_TYPE(OBJECT_PATH_ARRAY);
-#  endif
         DEF_TYPE(BYTESTRING);
         DEF_TYPE(BYTESTRING_ARRAY);
-#  if GLIB_CHECK_VERSION(2, 30, 0)
         DEF_TYPE(VARDICT);
-#  endif
 
 #undef DEF_TYPE
     }

data/ext/glib2/rbglib-variant.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-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
@@ -22,7 +22,7 @@
 
 #define RG_TARGET_NAMESPACE cVariant
 
-#define _SELF(s) (DATA_PTR(s))
+#define _SELF(s) (RTYPEDDATA_DATA(s))
 
 static VALUE RG_TARGET_NAMESPACE;
 
@@ -191,7 +191,6 @@ rg_ruby_to_variant(VALUE rb_value, VALUE rb_variant_type)
             }
         }
         return g_variant_new_strv(strings, length);
-#if GLIB_CHECK_VERSION(2, 30, 0)
     } else if (g_variant_type_equal(variant_type,
                                     G_VARIANT_TYPE_OBJECT_PATH_ARRAY)) {
         const gchar **paths;
@@ -210,7 +209,6 @@ rg_ruby_to_variant(VALUE rb_value, VALUE rb_variant_type)
             }
         }
         return g_variant_new_objv(paths, length);
-#endif
     } else if (g_variant_type_equal(variant_type, G_VARIANT_TYPE_ARRAY)) {
         int i;
         GVariantBuilder builder;
@@ -259,7 +257,7 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &rb_value, &rb_variant_type);
     variant = rg_ruby_to_variant(rb_value, rb_variant_type);
     g_variant_ref_sink(variant);
-    DATA_PTR(self) = variant;
+    RTYPEDDATA_DATA(self) = variant;
 
     return Qnil;
 }

data/ext/glib2/rbglib.c

@@ -1072,6 +1072,10 @@ extern void Init_glib2(void);
 void
 Init_glib2(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
     const gchar **filename_charsets;
 
     id_inspect = rb_intern("inspect");

data/ext/glib2/rbglib.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2002-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2002-2020  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -32,8 +32,8 @@
 G_BEGIN_DECLS
 
 #define RBGLIB_MAJOR_VERSION 3
-#define RBGLIB_MINOR_VERSION 3
-#define RBGLIB_MICRO_VERSION 9
+#define RBGLIB_MINOR_VERSION 4
+#define RBGLIB_MICRO_VERSION 4
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC
@@ -139,6 +139,9 @@ G_BEGIN_DECLS
 #define RVAL2GUINT32S(ary, n) rbg_rval2guint32s(&(ary), &(n))
 #define RVAL2GDOUBLES(ary, n) rbg_rval2gdoubles(&(ary), &(n))
 
+#define RVAL2POINTER(value) ((gpointer)(value))
+#define POINTER2RVAL(pointer) ((VALUE)(pointer))
+
 #define GINTS2RVAL(ary, n) rbg_gints2rval(ary, n)
 #define GINTS2RVAL_FREE(ary, n) rbg_gints2rval(ary, n)
 
@@ -154,7 +157,7 @@ G_BEGIN_DECLS
 
 #ifdef G_PLATFORM_WIN32
 #  ifdef RUBY_GLIB2_COMPILATION
-#    define RUBY_GLIB2_VAR __declspec(dllexport)
+#    define RUBY_GLIB2_VAR extern __declspec(dllexport)
 #  else
 #    define RUBY_GLIB2_VAR extern __declspec(dllimport)
 #  endif