glib2 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42560ee70c7312fba3da7de85a532df79ee25bf3e5b4349cd1fedffab6456b4d
-  data.tar.gz: 0641f51f740794a4e5e766b4984b2cd2b7fdd614443c144b1515f6319f52065f
+  metadata.gz: ef469f628bed077a10e35ecb3522c274fe83d980616c75efd2730bcfef0d0c29
+  data.tar.gz: 20cadc5036763bb2c79d3acb439dda77a645088725ed30578a3fcbd1fade69b6
 SHA512:
-  metadata.gz: 1e17958d37d49057439955c13049dd29b5b1ba935ec413f507de857fcb4c0696c0fef6dbfcd8577f7906b9647ba49f9016b95fcaf87b66f6bc42d90cfa64c737
-  data.tar.gz: 4b13605e314b55f1319c76bc641a5299ffc596eb1dbbe5d8d5d28bee5c5226e1478406e54b6999007b62c882f84b3d31bf49dc32cdee33f81c217aae96215f0b
+  metadata.gz: 4546a38b2fa84f5d0b361d731501bd808243d8536764aeea6d93526b446895099a576950b8c7384e69c57b56af4da07088ac78ade8f1c9b48b64c30603d1de5f
+  data.tar.gz: 8cb1ed8bce4fb173ac04ac38e9746e3099cf746ce86d7b7ec583dd601e4c74310a9d452f161e1b85a810561481100ebe386a9ef3e5aa7430440b36c32fda98cc

data/Rakefile

@@ -17,194 +17,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 $LOAD_PATH.unshift("./lib")
-require 'gnome2/rake/package-task'
-
-bin_dir            = nil
-include_dir        = nil
-glib2_include_dir  = nil
-libffi_lib_dir     = nil
-
-build_host         = nil
+require "gnome2/rake/package-task"
 
 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")
-  libffi_lib_dir     = (package.windows.absolute_binary_dir + "lib").to_s
-
-  build_host         = package.windows.build_host
-
-  package.description = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
-  package.windows.packages = []
-  package.windows.dependencies = []
-  package.external_packages = [
-    {
-      :name => "libiconv",
-      :download_site => :gnu,
-      :label => "libiconv",
-      :version => "1.15",
-      :windows => {
-        :built_file => "bin/libiconv-2.dll",
-      },
-    },
-    {
-      :name => "gettext",
-      :download_site => :gnu,
-      :label => "gettext-runtime",
-      :version => "0.19.8.1",
-      :base_dir_in_package => "gettext-runtime",
-      :windows => {
-        :built_file => "bin/libintl-8.dll",
-      },
-    },
-    {
-      :name => "libffi",
-      :download_base_url => "ftp://sourceware.org/pub/libffi",
-      :label => "libffi",
-      :version => "3.2.1",
-      :windows => {
-        :built_file => "bin/libffi-6.dll",
-      },
-    },
-    {
-      :name => "pcre",
-      :download_base_url => "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre",
-      :label => "PCRE",
-      :version => "8.40",
-      :windows => {
-        :configure_args => [
-          "--enable-unicode-properties",
-        ],
-        :built_file => "bin/libpcre-1.dll",
-      },
-    },
-    {
-      :name => "glib",
-      :download_site => :gnome,
-      :label => "GLib",
-      :version => "2.58.1",
-      :compression_method => "xz",
-      :windows => {
-        :built_file => "bin/libglib-2.0-0.dll",
-      },
-    },
-    {
-      :name => "gmp",
-      :download_site => :gnu,
-      :label => "GNU MP",
-      :version => "6.1.2",
-      :compression_method => "xz",
-      :windows => {
-        :configure_args => [
-          "--disable-static",
-          "--enable-shared",
-        ],
-        :built_file => "bin/libgmp-10.dll",
-      },
-    },
-    {
-      :name => "nettle",
-      :download_base_url => "http://www.lysator.liu.se/~nisse/archive",
-      :label => "Nettle",
-      :version => "3.2",
-      :windows => {
-        :configure_args => [],
-        :built_file => "bin/libnettle-6-2.dll",
-      },
-    },
-    {
-      :name => "libtasn1",
-      :download_site => :gnu,
-      :label => "Libtasn1",
-      :version => "4.13",
-      :windows => {
-        :built_file => "bin/libtasn1-6.dll",
-      },
-    },
-    {
-      :name => "libidn2",
-      :download_site => :gnu,
-      :download_name => "libidn",
-      :label => "Libidn2",
-      :version => "2.0.5",
-      :windows => {
-        :built_file => "bin/libidn2-0.dll",
-      },
-    },
-    {
-      :name => "p11-glue/p11-kit",
-      :download_site => :github,
-      :label => "p11-kit",
-      :version => "0.23.14",
-      :windows => {
-        :built_file => "bin/libp11-kit-0.dll",
-      },
-    },
-    {
-      :name => "gnutls",
-      :download_base_url => "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.4",
-      :label => "GnuTLS",
-      :version => "3.4.10",
-      :compression_method => "xz",
-      :windows => {
-        :configure_args => [
-          "--disable-cxx",
-          "--disable-tools",
-          "--disable-doc",
-        ],
-        :use_cc_environment_variable => false,
-        :patches => [
-        ],
-        :built_file => "bin/libgnutls-30.dll",
-      },
-    },
-    {
-      :name => "glib-networking",
-      :download_site => :gnome,
-      :label => "glib-networking",
-      :version => "2.58.0",
-      :compression_method => "xz",
-      :windows => {
-        :meson_args => [
-          "-Dlibproxy_support=false",
-          "-Dgnome_proxy_support=false",
-        ],
-        :built_file => "lib/gio/modules/libgiognutls.dll",
-      },
-    },
-  ]
-  package.cross_compiling do |spec|
-    if /mingw|mswin/ =~ spec.platform.to_s
-      spec.add_runtime_dependency("cairo", ">= 1.15.9")
-    end
-  end
-end
-package_task.define
-
-namespace :windows do
-  namespace :glib do
-    pkg_config_dir = package_task.windows.absolute_binary_dir + "lib/pkgconfig"
-    pc_path = pkg_config_dir + "glib-2.0.pc"
-    patched_path = pkg_config_dir + "patched"
-    file patched_path.to_s do
-      original_pc = pc_path.read
-      new_pc = original_pc.gsub(/^Cflags:/) do |matched|
-        "#{matched} -I${includedir}"
-      end
-      pc_path.open("w") do |pc_file|
-        pc_file.write(new_pc)
-      end
-      touch(patched_path)
-    end
-
-    desc "Add include path for libintl.h"
-    task :cross => patched_path.to_s
-  end
-
-  namespace :builder do
-    task :after => "windows:glib:cross"
-  end
+GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
 end

data/ext/glib2/rbgcompat.h

@@ -19,11 +19,4 @@
  *  MA  02110-1301  USA
  */
 
-#ifndef __RBGCOMPAT_H__
-#define __RBGCOMPAT_H__
-
-G_BEGIN_DECLS
-
-G_END_DECLS
-
-#endif
+#pragma once

data/ext/glib2/rbglib-gc.c

@@ -23,7 +23,9 @@
 static GHashTable *rbg_objects = NULL;
 
 static void
-gc_marker_mark_each(gpointer key, gpointer value, gpointer user_data)
+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);
@@ -41,7 +43,9 @@ gc_marker_free(void *data)
 {
     GHashTable *hash_table = data;
     g_hash_table_unref(hash_table);
-    rbg_objects = NULL;
+    if (hash_table == rbg_objects) {
+        rbg_objects = NULL;
+    }
 }
 
 static const rb_data_type_t rbg_gc_marker_type = {
@@ -76,14 +80,75 @@ rbg_gc_unguard(gpointer key)
     g_hash_table_remove(rbg_objects, key);
 }
 
+static VALUE
+rbg_gc_marker_new_raw(GHashTable *rb_objects)
+{
+    VALUE gc_marker;
+
+    gc_marker = TypedData_Wrap_Struct(rb_cData,
+                                      &rbg_gc_marker_type,
+                                      rb_objects);
+    return gc_marker;
+}
+
+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);
+}
+
+void
+rbg_gc_marker_guard(VALUE rb_gc_marker, VALUE rb_object)
+{
+    GHashTable *rb_objects;
+
+    TypedData_Get_Struct(rb_gc_marker,
+                         GHashTable,
+                         &rbg_gc_marker_type,
+                         rb_objects);
+    g_hash_table_insert(rb_objects,
+                        (gpointer)rb_object,
+                        (gpointer)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;
+
+    TypedData_Get_Struct(rb_gc_marker,
+                         GHashTable,
+                         &rbg_gc_marker_type,
+                         rb_objects);
+    g_hash_table_remove(rb_objects, (gpointer)rb_object);
+}
+
+void
+rbg_gc_marker_unguard_all(VALUE rb_gc_marker)
+{
+    GHashTable *rb_objects;
+
+    TypedData_Get_Struct(rb_gc_marker,
+                         GHashTable,
+                         &rbg_gc_marker_type,
+                         rb_objects);
+    g_hash_table_remove_all(rb_objects);
+}
+
 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);
+    gc_marker = rbg_gc_marker_new_raw(rbg_objects);
     rb_ivar_set(mGLib, rb_intern("gc_marker"), gc_marker);
 }

data/ext/glib2/rbglib.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 3
-#define RBGLIB_MICRO_VERSION 0
+#define RBGLIB_MICRO_VERSION 1
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbglib_maincontext.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -33,8 +33,6 @@ static ID id_poll_func;
 static ID id_call;
 
 static VALUE mGLibSource;
-static ID id__callbacks__;
-static GHashTable *callbacks_table;
 
 static GThread *main_thread;
 
@@ -123,10 +121,6 @@ restore_poll_func(G_GNUC_UNUSED VALUE data)
 static VALUE
 source_remove(G_GNUC_UNUSED VALUE self, VALUE tag)
 {
-    VALUE callback;
-    callback = G_GET_RELATIVE(mGLibSource, id__callbacks__, tag);
-    G_REMOVE_RELATIVE(mGLibSource, id__callbacks__, tag);
-    g_hash_table_remove(callbacks_table, (gpointer)callback);
     return CBOOL2RVAL(g_source_remove(NUM2UINT(tag)));
 }
 
@@ -137,15 +131,21 @@ source_current_source(G_GNUC_UNUSED VALUE self)
 }
 
 static gboolean
-invoke_source_func(gpointer data)
+source_func(gpointer data)
 {
     callback_info_t *info = (callback_info_t *)data;
-    gboolean ret;
 
-    ret = RVAL2CBOOL(rb_funcall(info->callback, id_call, 0));
-    if (!ret)
-        G_REMOVE_RELATIVE(mGLibSource, id__callbacks__, UINT2NUM(info->id));
-    return ret;
+    return RVAL2CBOOL(rb_funcall(info->callback, id_call, 0));
+}
+
+static void
+source_destroy_notify(gpointer data)
+{
+    callback_info_t *info = data;
+
+    rbgobj_remove_relative(mGLibSource, (ID)0, info->callback);
+
+    xfree(info);
 }
 
 /*****************************************/
@@ -420,13 +420,14 @@ timeout_add(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
     priority = NIL_P(rb_priority) ? G_PRIORITY_DEFAULT : NUM2INT(rb_priority);
     info = ALLOC(callback_info_t);
     info->callback = func;
-    id = g_timeout_add_full(priority, NUM2UINT(interval),
-                            (GSourceFunc)invoke_source_func,
-                            (gpointer)info, g_free);
+    id = g_timeout_add_full(priority,
+                            NUM2UINT(interval),
+                            source_func,
+                            info,
+                            source_destroy_notify);
     info->id = id;
     rb_id = UINT2NUM(id);
-    G_RELATIVE2(mGLibSource, func, id__callbacks__, rb_id);
-    g_hash_table_insert(callbacks_table, (gpointer)func, info);
+    rbgobj_add_relative(mGLibSource, func);
     return rb_id;
 }
 
@@ -446,13 +447,12 @@ timeout_add_seconds(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
     info->callback = func;
     id = g_timeout_add_seconds_full(priority,
                                     NUM2UINT(interval),
-                                    (GSourceFunc)invoke_source_func,
-                                    (gpointer)info,
-                                    g_free);
+                                    source_func,
+                                    info,
+                                    source_destroy_notify);
     info->id = id;
     rb_id = UINT2NUM(id);
-    G_RELATIVE2(mGLibSource, func, id__callbacks__, rb_id);
-    g_hash_table_insert(callbacks_table, (gpointer)func, info);
+    rbgobj_add_relative(mGLibSource, func);
     return rb_id;
 }
 #endif
@@ -484,26 +484,16 @@ idle_add(gint argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 
     info = ALLOC(callback_info_t);
     info->callback = func;
-    id = g_idle_add_full(priority, (GSourceFunc)invoke_source_func,
-                         (gpointer)info, g_free);
+    id = g_idle_add_full(priority,
+                         source_func,
+                         info,
+                         source_destroy_notify);
     info->id = id;
     rb_id = UINT2NUM(id);
-    G_RELATIVE2(mGLibSource, func, id__callbacks__, rb_id);
-    g_hash_table_insert(callbacks_table, (gpointer)func, info);
+    rbgobj_add_relative(mGLibSource, func);
     return rb_id;
 }
 
-static VALUE
-idle_remove(G_GNUC_UNUSED VALUE self, VALUE func)
-{
-    callback_info_t *info;
-
-    info = g_hash_table_lookup(callbacks_table, (gpointer)func);
-    G_REMOVE_RELATIVE(mGLibSource, id__callbacks__, UINT2NUM(info->id));
-    g_hash_table_remove(callbacks_table, (gpointer)func);
-    return CBOOL2RVAL(g_idle_remove_by_data((gpointer)info));
-}
-
 static VALUE
 child_watch_source_new(G_GNUC_UNUSED VALUE self, VALUE pid)
 {
@@ -535,8 +525,6 @@ Init_glib_main_context(void)
     VALUE child_watch = rb_define_module_under(mGLib, "ChildWatch");
 
     id_call = rb_intern("call");
-    id__callbacks__ = rb_intern("__callbacks__");
-    callbacks_table = g_hash_table_new(NULL, NULL);
 
     g_static_private_set(&rg_polling_key, GINT_TO_POINTER(FALSE), NULL);
 
@@ -584,7 +572,6 @@ Init_glib_main_context(void)
 #endif
     rbg_define_singleton_method(idle, "source_new", idle_source_new, 0);
     rbg_define_singleton_method(idle, "add", idle_add, -1);
-    rbg_define_singleton_method(idle, "remove", idle_remove, 1);
 
     rbg_define_singleton_method(child_watch, "source_new", child_watch_source_new, 1);
     rbg_define_singleton_method(child_watch, "add", child_watch_add, 1);

data/ext/glib2/rbgobject.c

@@ -23,12 +23,9 @@
  *  MA  02110-1301  USA
  */
 
-#include "ruby.h"
 #include "rbgprivate.h"
 #include <ctype.h>
 
-#include "rbgprivate.h"
-
 static ID id_relatives;
 static ID id_delete;
 static ID id_module_eval;
@@ -191,16 +188,16 @@ rbgobj_add_relative(VALUE obj, VALUE relative)
     if (rb_obj_is_kind_of(obj, mGLibObject)) {
         rbgobj_object_add_relative(obj, relative);
     } else {
-        VALUE hash = Qnil;
+        VALUE rb_gc_marker = Qnil;
 
         if (RVAL2CBOOL(rb_ivar_defined(obj, id_relatives)))
-            hash = rb_ivar_get(obj, id_relatives);
+            rb_gc_marker = rb_ivar_get(obj, id_relatives);
 
-        if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
-            hash = rb_hash_new();
-            rb_ivar_set(obj, id_relatives, hash);
+        if (NIL_P(rb_gc_marker)) {
+            rb_gc_marker = rbg_gc_marker_new();
+            rb_ivar_set(obj, id_relatives, rb_gc_marker);
         }
-        rb_hash_aset(hash, relative, Qnil);
+        rbg_gc_marker_guard(rb_gc_marker, relative);
     }
 }
 
@@ -253,26 +250,34 @@ rbgobj_get_relative_removable(VALUE obj, ID obj_ivar_id, VALUE hash_key)
 }
 
 void
-rbgobj_remove_relative(VALUE obj, ID obj_ivar_id, VALUE hash_key)
+rbgobj_remove_relative(VALUE obj, ID obj_ivar_id, VALUE relative)
 {
     static VALUE cGLibObject = Qnil;
     if (NIL_P(cGLibObject)) {
         cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
     }
 
+    if (obj_ivar_id == (ID)0) {
+        obj_ivar_id = id_relatives;
+    }
+
     if ((obj_ivar_id == id_relatives || obj_ivar_id == rbgobj_id_children) &&
         rb_obj_is_kind_of(obj, cGLibObject)) {
-        rbgobj_object_remove_relative(obj, hash_key);
+        rbgobj_object_remove_relative(obj, relative);
     } else {
-        VALUE hash = Qnil;
+        VALUE rb_gc_marker = Qnil;
 
         if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
-            hash = rb_ivar_get(obj, obj_ivar_id);
+            rb_gc_marker = rb_ivar_get(obj, obj_ivar_id);
 
-        if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
+        if (NIL_P(rb_gc_marker)) {
             /* should not happen. */
+        } else if (RB_TYPE_P(rb_gc_marker, RUBY_T_HASH)) {
+            /* For backward compatibility. */
+            VALUE relatives = rb_gc_marker;
+            rb_funcall(relatives, id_delete, 1, relative);
         } else {
-            rb_funcall(hash, id_delete, 1, hash_key);
+            rbg_gc_marker_unguard(rb_gc_marker, relative);
         }
     }
 }

data/ext/glib2/rbgobject.h

@@ -20,17 +20,14 @@
  *  MA  02110-1301  USA
  */
 
-#ifndef __RBGOBJECT_H__
-#define __RBGOBJECT_H__
+#pragma once
 
 #include <glib-object.h>
-#include "ruby.h"
+#include <ruby.h>
 #include "rbglib.h"
 #include "rbgutil.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* macros */
 
@@ -169,7 +166,7 @@ extern VALUE rbgobj_create_object(VALUE klass); /* deprecated */
 
 extern VALUE rbgobj_get_ruby_object_from_gobject(GObject* gobj, gboolean alloc);
 
-/* For Ruby/Gstreamer */
+/* For Ruby/GObjectIntrospection */
 extern void rbgobj_gobject_initialize(VALUE obj, gpointer cobj);
 
 /* deprecated */
@@ -335,10 +332,6 @@ typedef struct {
 
 extern void rbgobj_convert_define(const RGConvertTable *table);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __RBGOBJECT_H__ */
+G_END_DECLS
 
 #include "rbgcompat.h"

data/ext/glib2/rbgprivate.h

@@ -18,8 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#ifndef __RBGPRIVATE_H__
-#define __RBGPRIVATE_H__
+#pragma once
 
 /*
  * CentOS 6: GLib 2.28
@@ -123,6 +122,13 @@ G_GNUC_INTERNAL void rg_enum_add_constants(VALUE mod, GType enum_type, const gch
 G_GNUC_INTERNAL void rg_flags_add_constants(VALUE mod, GType flags_type, const gchar *strip_prefix);
 G_GNUC_INTERNAL char *rg_obj_constant_lookup(const char *name);
 
+G_GNUC_INTERNAL VALUE rbg_gc_marker_new(void);
+G_GNUC_INTERNAL void rbg_gc_marker_guard(VALUE rb_gc_marker,
+                                         VALUE rb_object);
+G_GNUC_INTERNAL void rbg_gc_marker_unguard(VALUE rb_gc_marker,
+                                           VALUE rb_object);
+G_GNUC_INTERNAL void rbg_gc_marker_unguard_all(VALUE rb_gc_marker);
+
 G_GNUC_INTERNAL void Init_glib_gc(void);
 
 G_GNUC_INTERNAL void Init_gutil(void);
@@ -189,5 +195,3 @@ G_GNUC_INTERNAL void Init_gobject_gtypemodule(void);
 G_GNUC_INTERNAL void Init_gobject_gbinding(void);
 
 G_END_DECLS
-
-#endif

data/ext/glib2/rbgutil.h

@@ -19,19 +19,16 @@
  *  MA  02110-1301  USA
  */
 
-#ifndef __RBGUTIL_H__
-#define __RBGUTIL_H__
+#pragma once
 
 #include <glib-object.h>
-#include "ruby.h"
+#include <ruby.h>
 #include <ruby/encoding.h>
 #include "rbglib.h"
 #include "rbgutil_list.h"
 #include "rbgutildeprecated.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define RG_DEF_MODFUNC(method, argc) \
         rb_define_module_function(RG_TARGET_NAMESPACE, #method, rg_m_ ## method, argc)
@@ -114,8 +111,4 @@ RUBY_GLIB2_VAR ID rbgutil_id_module_eval;
 extern void rbgutil_glibid_r2g_func(VALUE from, GValue* to);
 extern VALUE rbgutil_sym_g2r_func(const GValue *from);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __RBGUTIL_H__ */
+G_END_DECLS

data/lib/glib2.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2005-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
@@ -114,20 +114,7 @@ module GLib
   end
 end
 
-
-base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
-vendor_dir = base_dir + "vendor" + "local"
-if vendor_dir.exist?
-  require "cairo"
-end
-
-GLib.prepend_dll_path(vendor_dir + "bin")
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/glib2.so"
-rescue LoadError
-  require 'glib2.so'
-end
+require "glib2.so"
 
 module GLib
   module MetaInterface
@@ -269,8 +256,9 @@ GLib::Log.set_log_domain(GLib::Object::LOG_DOMAIN)
 GLib::Log.set_log_domain(GLib::Thread::LOG_DOMAIN)
 GLib::Log.set_log_domain(GLib::Module::LOG_DOMAIN)
 
-require 'glib2/version'
+require "glib2/version"
 require "glib2/regex"
+require "glib2/deprecated"
 =begin
 Don't we need this?
 ObjectSpace.define_finalizer(GLib) {

data/lib/glib2/deprecated.rb

@@ -0,0 +1,23 @@
+# 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
+
+module GLib
+  module Idle
+    extend GLib::Deprecatable
+    define_deprecated_singleton_method :remove,
+                                       warn: "Use 'GLib::Source.remove(id)'."
+  end
+end

data/lib/glib2/version.rb

@@ -32,6 +32,5 @@ module GLib
         (version <=> [major, minor, micro]) >= 0
       end
     end
-
   end
 end

data/lib/mkmf-gnome2.rb

@@ -115,24 +115,10 @@ def windows_platform?
   /cygwin|mingw|mswin/ === RUBY_PLATFORM
 end
 
+# For backward compatibility
 def setup_windows(target_name, base_dir=nil)
   checking_for(checking_message("Windows")) do
-    if windows_platform?
-      import_library_name = "libruby-#{target_name}.a"
-      $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
-      $cleanfiles << import_library_name
-      base_dir ||= Pathname($0).dirname.parent.parent.expand_path
-      base_dir = Pathname(base_dir) if base_dir.is_a?(String)
-      binary_base_dir = base_dir + "vendor" + "local"
-      if binary_base_dir.exist?
-        $INCFLAGS += " -I#{binary_base_dir}/include"
-        pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
-        PKGConfig.add_path(pkg_config_dir.to_s)
-      end
-      true
-    else
-      false
-    end
+    windows_platform?
   end
 end
 # For backward compatibility
@@ -214,16 +200,13 @@ def add_depend_package_path(target_name, target_source_dir, target_build_dir)
     $INCFLAGS = "-I#{target_build_dir} #{$INCFLAGS}"
   end
 
-  if windows_platform?
-    library_base_name = "ruby-#{target_name.gsub(/-/, '_')}"
-    case RUBY_PLATFORM
-    when /cygwin|mingw/
-      $LDFLAGS << " -L#{target_build_dir}"
-      $libs << " -l#{library_base_name}"
-    when /mswin/
-      $DLDFLAGS << " /libpath:#{target_build_dir}"
-      $libs << " lib#{library_base_name}.lib"
-    end
+  library_base_name = target_name.gsub(/-/, "_")
+  case RUBY_PLATFORM
+  when /cygwin|mingw/
+    $libs << " " << File.join(target_build_dir, "#{library_base_name}.so")
+  when /mswin/
+    $DLDFLAGS << " /libpath:#{target_build_dir}"
+    $libs << " #{library_base_name}-$(arch).lib"
   end
 end
 
@@ -473,7 +456,7 @@ def required_pkg_config_package(package_info, native_package_info=nil)
   else
     required_package_info = [package_info]
   end
-  if required_package_info.include?("gobject-introspection-1.0")
+  if required_package_info[0] == "gobject-introspection-1.0"
     setup_homebrew_libffi
   end
   return true if PKGConfig.have_package(*required_package_info)

data/sample/keyfile.rb

@@ -9,8 +9,6 @@
 
 require 'glib2'
 
-$KCODE = "U"
-
 #
 # Create a GLib::KeyFile
 #
@@ -18,14 +16,14 @@ kf = GLib::KeyFile.new
 kf.set_value("Group 1", "value", "Hello World")
 kf.set_comment("Group 1", nil, "This file is generated by keyfile.rb")
 kf.set_string("Group 1", "string", "Hello World\nRuby-GNOME2") 
-kf.set_locale_string("Group 1", "locale_string", "ja", "こんにちわ世界")
+kf.set_locale_string("Group 1", "locale_string", "ja", "こんにちは、世界")
 kf.set_locale_string("Group 1", "locale_string", "en", "Hello World")
 kf.set_boolean("Group 1", "boolean", true)
 kf.set_integer("Group 1", "integer", 1)
 kf.set_double("Group 1", "double", 1.0)
 kf.set_string_list("Group 2", "string_list", ["foo", "bar"])
-kf.set_locale_string_list("Group 2", "locale_string_list", "ja", ["こんにちわ", "世界"])
-kf.set_locale_string_list("Group 2", "locale_string_list", "en", ["Hellow", "World"])
+kf.set_locale_string_list("Group 2", "locale_string_list", "ja", ["こんにちは", "世界"])
+kf.set_locale_string_list("Group 2", "locale_string_list", "en", ["Hello", "World"])
 kf.set_boolean_list("Group 2", "boolean_list", [true, false])
 kf.set_integer_list("Group 2", "integer_list", [1, 2, 3])
 kf.set_double_list("Group 2", "double_list", [1.2, 1.3, 1.45])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -147,6 +147,7 @@ files:
 - lib/glib-mkenums.rb
 - lib/glib2.rb
 - lib/glib2/deprecatable.rb
+- lib/glib2/deprecated.rb
 - lib/glib2/regex.rb
 - lib/glib2/version.rb
 - lib/gnome2-raketask.rb
@@ -220,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 3.0.0.beta1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.