glib2 3.2.5 → 3.2.6

data/README.md

@@ -0,0 +1,42 @@
+# Ruby/GLib2
+
+Ruby/GLib2 is a Ruby binding of GLib-2.12.x.
+
+## Requirements
+
+  Ruby >= 1.9.x: http://www.ruby-lang.org/
+  pkg-config.rb: http://github.com/rcairo/pkg-config
+  GLib >= 2.12.x: http://www.gtk.org/
+
+## Install (RubyGems)
+
+```
+  % sudo gem install glib2
+```
+Windows:
+
+```
+  > gem install glib2 --platform x86-mingw32
+```
+
+## Install (traditional)
+
+Install ruby-1.9.x or later, pkg-config.rb and GLib-2.12.x.
+
+```
+  % ruby extconf.rb
+  % make
+  % sudo make install
+```
+
+## Copying
+
+   Copyright (c) 2002-2010 Ruby-GNOME2 Project Team
+
+   This program is free software.
+   You can distribute/modify this program under the terms of
+   the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1.
+
+## Project Website
+
+   https://ruby-gnome2.osdn.jp/

data/Rakefile

@@ -26,7 +26,10 @@ libffi_lib_dir     = nil
 
 build_host         = nil
 
-package_task = GNOME2::Rake::PackageTask.new do |package|
+package_name = File.basename(__dir__)
+spec = Gem::Specification.load("#{package_name}.gemspec")
+
+package_task = GNOME2::Rake::PackageTask.new(spec, __dir__) do |package|
   bin_dir            = (package.windows.absolute_binary_dir + "bin").to_s
   include_dir        = (package.windows.absolute_binary_dir + "include").to_s
   glib2_include_dir  = File.join(include_dir, "glib-2.0")
@@ -34,7 +37,6 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
 
   build_host         = package.windows.build_host
 
-  package.summary = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
   package.description = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
   package.dependency.gem.runtime = [
     ["pkg-config", ">= 1.2.2"],
@@ -88,13 +90,12 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.56.0",
+      :version => "2.56.1",
       :compression_method => "xz",
       :windows => {
         :need_autoreconf => true,
         :patches => [
           "glib-2.54.1-add-missing-exeext.diff",
-          "glib-2.56.0-add-missing-weekday-full-is-locale.patch",
         ],
         :built_file => "bin/libglib-2.0-0.dll",
       },
@@ -137,7 +138,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :download_site => :gnu,
       :download_name => "libidn",
       :label => "Libidn2",
-      :version => "2.0.4",
+      :version => "2.0.5",
       :windows => {
         :built_file => "bin/libidn2-0.dll",
       },
@@ -146,7 +147,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "p11-glue/p11-kit",
       :download_site => :github,
       :label => "p11-kit",
-      :version => "0.23.3",
+      :version => "0.23.12",
       :windows => {
         :built_file => "bin/libp11-kit-0.dll",
       },
@@ -173,7 +174,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.56.0",
+      :version => "2.56.1",
       :compression_method => "xz",
       :windows => {
         :meson_args => [

data/ext/glib2/glib2.def

@@ -70,6 +70,7 @@ EXPORTS
 	rbgobj_get_signal_call_func
 	rbgobj_add_constants
 	rbgobj_constant_remap
+	rbgobj_signal_new
 	rbgobj_signal_wrap
 	g_rclosure_new
 	g_rclosure_new_call
@@ -165,6 +166,10 @@ EXPORTS
 	rbglib_int64_to_num
 	rbg_variant_to_ruby
 	rbg_variant_from_ruby
+	rbg_variant_type_from_ruby
+
+	rbg_gc_guard
+	rbg_gc_unguard
 
 	g_source_get_type
 	g_connect_flags_get_type

data/ext/glib2/rbglib-gc.c

@@ -0,0 +1,89 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  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
+ */
+
+#include "rbgprivate.h"
+
+static GHashTable *rbg_objects = NULL;
+
+static void
+gc_marker_mark_each(gpointer key, gpointer value, gpointer user_data)
+{
+    VALUE rb_object = (VALUE)value;
+    rb_gc_mark(rb_object);
+}
+
+static void
+gc_marker_mark(void *data)
+{
+    GHashTable *hash_table = data;
+    g_hash_table_foreach(hash_table, gc_marker_mark_each, NULL);
+}
+
+static void
+gc_marker_free(void *data)
+{
+    GHashTable *hash_table = data;
+    g_hash_table_unref(hash_table);
+    rbg_objects = NULL;
+}
+
+static const rb_data_type_t rbg_gc_marker_type = {
+    "GLib::GCMarker",
+    {
+        gc_marker_mark,
+        gc_marker_free,
+        NULL,
+    },
+    NULL,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+void
+rbg_gc_guard(gpointer key, VALUE rb_object)
+{
+    if (!rbg_objects)
+        return;
+
+    g_hash_table_insert(rbg_objects,
+                        key,
+                        (gpointer)rb_object);
+}
+
+void
+rbg_gc_unguard(gpointer key)
+{
+    if (!rbg_objects)
+        return;
+
+    g_hash_table_remove(rbg_objects, key);
+}
+
+void
+Init_glib_gc(void)
+{
+    VALUE gc_marker;
+
+    rbg_objects = g_hash_table_new(g_direct_hash, g_direct_equal);
+    gc_marker = TypedData_Wrap_Struct(rb_cData,
+                                      &rbg_gc_marker_type,
+                                      rbg_objects);
+    rb_ivar_set(mGLib, rb_intern("gc_marker"), gc_marker);
+}

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

@@ -26,6 +26,23 @@
 
 static VALUE RG_TARGET_NAMESPACE;
 
+GVariantType *
+rbg_variant_type_from_ruby(VALUE rb_variant_type)
+{
+    if (NIL_P(rb_variant_type)) {
+        return NULL;
+    }
+
+    if (RB_TYPE_P(rb_variant_type, RUBY_T_STRING)) {
+        rb_variant_type = rb_funcall(RG_TARGET_NAMESPACE,
+                                     rb_intern("new"),
+                                     1,
+                                     rb_variant_type);
+    }
+
+    return RVAL2BOXED(rb_variant_type, G_TYPE_VARIANT_TYPE);
+}
+
 static VALUE
 rg_s_valid_p(G_GNUC_UNUSED VALUE klass, VALUE rb_string)
 {

data/ext/glib2/rbglib.c

@@ -1146,6 +1146,9 @@ union       GDoubleIEEE754;
     rb_define_const(RG_TARGET_NAMESPACE, "PRIORITY_LOW", INT2FIX(G_PRIORITY_LOW));
 
 /*    Init_mem(); */
+
+    Init_glib_gc();
+
     Init_gutil();
     Init_gutil_callback();
 

data/ext/glib2/rbglib.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 2
-#define RBGLIB_MICRO_VERSION 5
+#define RBGLIB_MICRO_VERSION 6
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC
@@ -232,6 +232,11 @@ extern guint64 rbglib_num_to_uint64(VALUE val);
 extern VALUE rbg_variant_to_ruby(GVariant *variant);
 extern GVariant *rbg_variant_from_ruby(VALUE rb_variant);
 
+extern GVariantType *rbg_variant_type_from_ruby(VALUE rb_variant_type);
+
+
+extern void rbg_gc_guard(gpointer key, VALUE rb_object);
+extern void rbg_gc_unguard(gpointer key);
 
 #ifdef __cplusplus
 }

data/ext/glib2/rbglib2conversions.h

@@ -41,7 +41,7 @@
 #define GTIMER2RVAL(o)                     (BOXED2RVAL(o, G_TYPE_TIMER))
 #define RVAL2GVALUE(o)                     ((GValue*)RVAL2BOXED(o, G_TYPE_VALUE))
 #define GVALUE2RVAL(o)                     (BOXED2RVAL(o, G_TYPE_VALUE))
-#define RVAL2GVARIANTTYPE(o)               ((GVariantType *)RVAL2BOXED(o, G_TYPE_VARIANT_TYPE))
+#define RVAL2GVARIANTTYPE(o)               (rbg_variant_type_from_ruby(o))
 #define GVARIANTTYPE2RVAL(o)               (BOXED2RVAL(o, G_TYPE_VARIANT_TYPE))
 
 #define RVAL2GIOCONDITION(o)               (RVAL2GFLAGS(o, G_TYPE_IO_CONDITION))

data/ext/glib2/rbgobj_boxed.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -26,8 +26,9 @@
 VALUE RG_TARGET_NAMESPACE;
 
 static void
-boxed_mark(boxed_holder *holder)
+boxed_mark(void *data)
 {
+    boxed_holder *holder = data;
     const RGObjClassInfo *cinfo;
 
     cinfo = GTYPE2CINFO_NO_CREATE(holder->type);
@@ -36,8 +37,9 @@ boxed_mark(boxed_holder *holder)
 }
 
 static void
-boxed_free(boxed_holder *holder)
+boxed_free(void *data)
 {
+    boxed_holder *holder = data;
     const RGObjClassInfo *cinfo;
 
     cinfo = GTYPE2CINFO_NO_CREATE(holder->type);
@@ -50,6 +52,26 @@ boxed_free(boxed_holder *holder)
     xfree(holder);
 }
 
+static const rb_data_type_t rg_glib_boxed_type = {
+    "GLib::Boxed",
+    {
+        boxed_mark,
+        boxed_free,
+        NULL,
+    },
+    NULL,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static boxed_holder *
+rbgobj_boxed_get_raw(VALUE rb_boxed)
+{
+    boxed_holder *holder;
+    TypedData_Get_Struct(rb_boxed, boxed_holder, &rg_glib_boxed_type, holder);
+    return holder;
+}
+
 /**********************************************************************/
 
 VALUE
@@ -57,18 +79,20 @@ rbgobj_boxed_alloc_func(VALUE klass)
 {
     const RGObjClassInfo *cinfo = rbgobj_lookup_class(klass);
     boxed_holder *holder;
-    VALUE result;
+    VALUE rb_boxed;
 
     if (cinfo->gtype == G_TYPE_BOXED)
         rb_raise(rb_eTypeError, "abstract class");
 
-    result = Data_Make_Struct(klass, boxed_holder,
-                              boxed_mark, boxed_free, holder);
+    rb_boxed = TypedData_Make_Struct(klass,
+                                     boxed_holder,
+                                     &rg_glib_boxed_type,
+                                     holder);
     holder->type  = cinfo->gtype;
     holder->boxed = NULL;
     holder->own   = FALSE;
 
-    return result;
+    return rb_boxed;
 }
 
 static VALUE
@@ -102,21 +126,14 @@ static VALUE
 rg_inspect(VALUE self)
 {
     boxed_holder *holder;
-    gchar *s;
-    VALUE result;
-
-    Data_Get_Struct(self, boxed_holder, holder);
-
-    s = g_strdup_printf("#<%s:%p ptr=%p own=%s>",
-                        rb_class2name(CLASS_OF(self)),
-                        (void *)self,
-                        holder->boxed,
-                        holder->own ? "true" : "false");
 
-    result = rb_str_new2(s);
-    g_free(s);
+    holder = rbgobj_boxed_get_raw(self);
 
-    return result;
+    return rb_sprintf("#<%" PRIsVALUE ":%p ptr=%p own=%s>",
+                      CLASS_OF(self),
+                      (gpointer)self,
+                      holder->boxed,
+                      holder->own ? "true" : "false");
 }
 
 static VALUE
@@ -131,8 +148,8 @@ rg_initialize_copy(VALUE self, VALUE orig)
         rb_raise(rb_eTypeError, "wrong argument class");
     }
 
-    Data_Get_Struct(self, boxed_holder, holder1);
-    Data_Get_Struct(orig, boxed_holder, holder2);
+    holder1 = rbgobj_boxed_get_raw(self);
+    holder2 = rbgobj_boxed_get_raw(orig);
 
     holder1->boxed = g_boxed_copy(holder2->type, holder2->boxed);
     holder1->own   = TRUE;
@@ -156,7 +173,7 @@ void
 rbgobj_boxed_initialize(VALUE obj, gpointer boxed)
 {
     boxed_holder *holder;
-    Data_Get_Struct(obj, boxed_holder, holder);
+    holder = rbgobj_boxed_get_raw(obj);
     holder->boxed = boxed;
     holder->own   = TRUE;
 }
@@ -167,13 +184,15 @@ rbgobj_boxed_get_default(VALUE obj, GType gtype)
     boxed_holder *holder;
 
     if (!RVAL2CBOOL(rb_obj_is_kind_of(obj, GTYPE2CLASS(gtype))))
-        rb_raise(rb_eArgError, "invalid argument %s (expect %s)",
-                 rb_class2name(CLASS_OF(obj)),
-                 rb_class2name(GTYPE2CLASS(gtype)));
+        rb_raise(rb_eArgError,
+                 "invalid argument %" PRIsVALUE " (expect %" PRIsVALUE ")",
+                 CLASS_OF(obj),
+                 GTYPE2CLASS(gtype));
 
-    Data_Get_Struct(obj, boxed_holder, holder);
+    holder = rbgobj_boxed_get_raw(obj);
     if (!holder->boxed)
-        rb_raise(rb_eArgError, "uninitialize %s", rb_class2name(CLASS_OF(obj)));
+        rb_raise(rb_eArgError, "uninitialize %" PRIsVALUE,
+                 CLASS_OF(obj));
 
     return holder->boxed;
 }
@@ -201,7 +220,7 @@ rbgobj_make_boxed_raw(gpointer p, GType gtype, VALUE klass, gint flags)
 
     result = rbgobj_boxed_alloc_func(klass);
 
-    Data_Get_Struct(result, boxed_holder, holder);
+    holder = rbgobj_boxed_get_raw(result);
 
     if (flags & RBGOBJ_BOXED_NOT_COPY) {
         holder->boxed = p;
@@ -250,7 +269,7 @@ rbgobj_boxed_unown(VALUE boxed)
 {
     boxed_holder *holder;
 
-    Data_Get_Struct(boxed, boxed_holder, holder);
+    holder = rbgobj_boxed_get_raw(boxed);
 
     if (!holder->own) {
         rb_raise(rb_eArgError,

data/ext/glib2/rbgobj_closure.c

@@ -46,7 +46,7 @@ static VALUE
 rclosure_default_g2r_func(guint num, const GValue *values)
 {
     guint i;
-    VALUE args = rb_ary_new2(num);
+    VALUE args = rb_ary_new_capa(num);
     for (i = 0; i < num; i++)
         rb_ary_store(args, i, GVAL2RVAL(&values[i]));
     return args;
@@ -290,12 +290,13 @@ g_rclosure_attach(GClosure *closure, VALUE object)
     static VALUE cGLibObject = Qnil;
     GRClosure *rclosure = (GRClosure *)closure;
 
+    rbgobj_add_relative(object, rclosure->rb_holder);
+
     if (NIL_P(cGLibObject)) {
         cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
     }
     if (rb_obj_is_kind_of(object, cGLibObject)) {
         GObject *gobject;
-        rbgobj_object_add_relative(object, rclosure->rb_holder);
         gobject = RVAL2GOBJ(object);
         rclosure->count++;
         g_object_weak_ref(gobject, rclosure_weak_notify, rclosure);