glib2 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eb848d80c98299853e48020a8dd40d75621e5c8
-  data.tar.gz: e3adcc8d05626b832fbdadd7ab792f4d8bdd8cd3
+  metadata.gz: 04730751dce8565060ffd80a06d6a0ff6a15810a
+  data.tar.gz: 259e897aa9cd8d7a9ed55fd4d5d46250d8fffefe
 SHA512:
-  metadata.gz: acf367073537e5e0d7428196406187e463ef5e8f055d3313c6ecba10ed7e9995151368f5dc285b380c200df0034ea342f2a8220b881d86d194d413a5e8e9e6cc
-  data.tar.gz: 54aebddcd2bdf934eabb00a771fd691a8f0384ff275754b38aa95c69dfeea5074688315f02c7148abc098d2de20f032f69853243d252e2adde57c2bf01b51176
+  metadata.gz: 012bb0c94321282d928c856e78861ba209fd043dc89aad1f91e9c452c33e26a894efba8291923dfaa78d2763f8f7e9729c8a7918bb205ea12b8805c8349ebc0b
+  data.tar.gz: 570415824340c5482d8ff2673f5b41c64a4dcd11f33c1e01f9ed3c497e4fda0f4e92a9a1a90ff6a9850e8dddcaf32500b1ebe6cd01454fc13cf61a6117975cab

data/Rakefile

@@ -23,20 +23,43 @@ package = GNOME2Package.new do |_package|
   _package.dependency.gem.runtime = [["pkg-config", ">= 0"]]
   _package.dependency.gem.development = [["test-unit", ">= 2"]]
   _package.win32.packages = []
-  _package.win32.dependencies = ["libffi", "gettext-runtime"]
+  _package.win32.dependencies = []
   _package.external_packages = [
+    {
+      :name => "libiconv",
+      :download_site => :gnu,
+      :label => "libiconv",
+      :version => "1.14",
+      :windows => {
+        :built_file => "bin/libiconv-2.dll",
+      },
+    },
+    {
+      :name => "gettext",
+      :download_site => :gnu,
+      :label => "gettext-runtime",
+      :version => "0.19.2",
+      :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.1",
+      :windows => {
+        :built_file => "bin/libffi-6.dll",
+      },
+    },
     {
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.38.2",
+      :version => "2.42.0",
       :compression_method => "xz",
       :windows => {
-        :configure_args => [
-          "LIBFFI_CFLAGS=-I#{include_dir}",
-          "LIBFFI_LIBS=-L#{libffi_lib_dir} -lffi",
-          "--disable-modular-tests",
-        ],
         :need_autoreconf => true,
         :patches => [
           "glib-2.38.2-add-missing-exeext.diff",
@@ -46,9 +69,9 @@ package = GNOME2Package.new do |_package|
     },
     {
       :name => "gmp",
-      :download_base_url => "ftp://ftp.gmplib.org/pub/gmp-5.1.3",
+      :download_base_url => "ftp://ftp.gmplib.org/pub/gmp-6.0.0",
       :label => "GNU MP",
-      :version => "5.1.3",
+      :version => "6.0.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -72,7 +95,7 @@ package = GNOME2Package.new do |_package|
       :name => "gnutls",
       :download_base_url => "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2",
       :label => "GnuTLS",
-      :version => "3.2.12",
+      :version => "3.2.18",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -88,7 +111,7 @@ package = GNOME2Package.new do |_package|
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.38.2",
+      :version => "2.42.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -107,43 +130,3 @@ package = GNOME2Package.new do |_package|
   end
 end
 package.define_tasks
-
-namespace :win32 do
-  namespace :libffi do
-    namespace :header do
-      desc "Move libffi headers to include/"
-      task :fix do
-        libffi_version = "libffi-3.0.6"
-        mv(Dir.glob(File.join(libffi_lib_dir, libffi_version, "include", "*.h")),
-           include_dir)
-        rm_rf(File.join(libffi_lib_dir, libffi_version))
-      end
-    end
-  end
-
-  namespace :downloader do
-    task :after => [
-      "win32:libffi:header:fix",
-    ]
-  end
-
-  namespace :gettext do
-    namespace :header do
-      desc "Copy gettext headers to include/glib-2.0/"
-      task :fix do
-        cp(File.join(include_dir, "libintl.h"),
-           glib2_include_dir)
-      end
-    end
-  end
-
-  namespace :builder do
-    namespace :build do
-      namespace :glib do
-        task :after => [
-          "win32:gettext:header:fix",
-        ]
-      end
-    end
-  end
-end

data/ext/glib2/extconf.rb

@@ -42,7 +42,7 @@ have_func("rb_errinfo", ruby_header)
 have_func("rb_sourcefile", ruby_header)
 have_func("rb_sourceline", ruby_header)
 have_func("ruby_set_current_source", ruby_header)
-have_func("rb_thread_blocking_region", ruby_header)
+have_func("rb_thread_call_without_gvl2", ruby_header)
 have_func("ruby_native_thread_p", ruby_header)
 have_func("rb_thread_call_with_gvl", ruby_header)
 have_func("rb_str_new_cstr", ruby_header)
@@ -68,6 +68,7 @@ end
 glib_mkenums(enum_types_prefix, headers, "G_TYPE_", ["glib-object.h"])
 
 $defs << "-DRUBY_GLIB2_COMPILATION"
+
 create_makefile(module_name)
 
 pkg_config_dir = with_config("pkg-config-dir")

data/ext/glib2/glib2.def

@@ -108,6 +108,8 @@ EXPORTS
 	rbg_check_array_type
 	rbg_check_hash_type
 	rbg_scan_options
+	rbg_inspect
+	rbg_interrupt_source_new
 	rbgutil_id_module_eval		DATA
 	rbgutil_def_setters
 	rbgutil_glist2ary

data/ext/glib2/rbglib.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 2
 #define RBGLIB_MINOR_VERSION 2
-#define RBGLIB_MICRO_VERSION 0
+#define RBGLIB_MICRO_VERSION 1
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/ext/glib2/rbglib_maincontext.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -21,16 +21,6 @@
 
 #include "rbgprivate.h"
 
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
-#  include <version.h>
-#  include <rubysig.h>
-#  include <node.h>
-#  include <time.h>
-#  ifdef HAVE_CURR_THREAD
-#    define rb_curr_thread curr_thread
-#  endif
-#endif
-
 GStaticPrivate rg_polling_key = G_STATIC_PRIVATE_INIT;
 
 /*
@@ -51,13 +41,6 @@ typedef struct _callback_info_t
 /*****************************************/
 static GPollFunc default_poll_func;
 
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
-
-/* just for ruby-1.9.0. */
-#if !defined(RUBY_UBF_IO) && defined(RB_UBF_DFL)
-#  define RUBY_UBF_IO RB_UBF_DFL
-#endif
-
 typedef struct _PollInfo
 {
     GPollFD *ufds;
@@ -87,7 +70,11 @@ rg_poll(GPollFD *ufds, guint nfsd, gint timeout)
     info.result = 0;
 
     g_static_private_set(&rg_polling_key, GINT_TO_POINTER(TRUE), NULL);
+#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL2
+    rb_thread_call_without_gvl2(rg_poll_in_blocking, &info, RUBY_UBF_IO, NULL);
+#else
     rb_thread_blocking_region(rg_poll_in_blocking, &info, RUBY_UBF_IO, NULL);
+#endif
     g_static_private_set(&rg_polling_key, GINT_TO_POINTER(FALSE), NULL);
 
     return info.result;
@@ -99,20 +86,6 @@ ruby_source_set_priority (G_GNUC_UNUSED VALUE self, G_GNUC_UNUSED VALUE priority
     return Qnil;
 }
 
-#else
-static gint
-rg_poll(GPollFD *ufds, guint nfsd, gint timeout)
-{
-    gint result;
-
-    TRAP_BEG;
-    result = default_poll_func(ufds, nfsd, timeout);
-    TRAP_END;
-
-    return result;
-}
-#endif
-
 static void
 restore_poll_func(G_GNUC_UNUSED VALUE data)
 {
@@ -121,294 +94,6 @@ restore_poll_func(G_GNUC_UNUSED VALUE data)
     }
 }
 
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
-static guint ruby_source_id = 0;
-
-/* from eval.c */
-#define WAIT_FD     (1<<0)
-#define WAIT_SELECT (1<<1)
-#define WAIT_TIME   (1<<2)
-#define WAIT_JOIN   (1<<3)
-#define WAIT_PID    (1<<4)
-
-#define DELAY_INFTY 1E30
-
-#ifdef RUBY_RELEASE_YEAR
-#  define CHECK_RUBY_RELEASE_DATE(year, month, day)     \
-    (RUBY_RELEASE_YEAR >= (year) &&                     \
-     RUBY_RELEASE_MONTH >= (month) &&                   \
-     RUBY_RELEASE_DAY >= (day))
-#else
-#  define CHECK_RUBY_RELEASE_DATE(year, month, day) 0
-#endif
-
-static double
-timeofday(void)
-{
-    struct timeval tv;
-#if CHECK_RUBY_RELEASE_DATE(2009, 1, 7)
-/* The following CLOCK_MONOTONIC change was introduced into
- * Ruby 1.8.6 and 1.8.7 at 2009-01-07.
- *
- * 1.8.6:
- * Wed Jan  7 10:06:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
- *
- *        * eval.c (timeofday): use monotonic clock.  based on a patch
- *          from zimbatm <zimbatm@oree.ch> in [ruby-core:16627].
- *
- * 1.8.7:
- * Wed Jan  7 10:09:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
- *
- *        * eval.c (timeofday): use monotonic clock.  based on a patch
- *          from zimbatm <zimbatm@oree.ch> in [ruby-core:16627].
- */
-#  ifdef CLOCK_MONOTONIC
-    struct timespec tp;
-
-    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
-        return (double)tp.tv_sec + (double)tp.tv_nsec * 1e-9;
-    }
-#  endif
-#endif
-    gettimeofday(&tv, NULL);
-    return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6;
-}
-
-/*****************************************/
-typedef struct _RGSource
-{
-    GSource source;
-
-    GList *poll_fds;
-    GList *old_poll_fds;
-    gboolean ready;
-} RGSource;
-
-static void
-source_cleanup_poll_fds(GSource *source)
-{
-    RGSource *rg_source = (RGSource *)source;
-    GList *node;
-
-    for (node = rg_source->old_poll_fds; node; node = g_list_next(node)) {
-        GPollFD *poll_fd = node->data;
-
-        g_source_remove_poll(source, poll_fd);
-        g_slice_free(GPollFD, poll_fd);
-    }
-    g_list_free(rg_source->old_poll_fds);
-    rg_source->old_poll_fds = NULL;
-}
-
-static inline void
-source_prepare_add_poll_fd(GSource *source, gint fd, guchar events)
-{
-    GPollFD *poll_fd;
-    GList *node;
-    RGSource *rg_source = (RGSource *)source;
-
-    for (node = rg_source->old_poll_fds; node; node = g_list_next(node)) {
-        poll_fd = node->data;
-        if (poll_fd->fd == fd && poll_fd->events == events) {
-            rg_source->old_poll_fds =
-                g_list_remove_link(rg_source->old_poll_fds, node);
-            rg_source->poll_fds = g_list_concat(rg_source->poll_fds, node);
-            return;
-        }
-    }
-
-    poll_fd = g_slice_new0(GPollFD);
-    poll_fd->fd = fd;
-    poll_fd->events = events;
-
-    g_source_add_poll(source, poll_fd);
-    rg_source->poll_fds = g_list_prepend(rg_source->poll_fds, poll_fd);
-}
-
-static inline void
-source_prepare_add_poll(GSource *source, rb_thread_t thread)
-{
-    if (thread->wait_for == WAIT_FD) {
-        /* The thread is blocked on thread->fd for read. */
-        source_prepare_add_poll_fd(source, thread->fd, G_IO_IN);
-        return;
-    }
-
-    if (thread->wait_for & WAIT_SELECT) {
-        /* thread->fd is the maximum fd of the fds in the various sets. Need to
-         * check the sets to see which fd's to wait for */
-        int fd;
-
-        for (fd = 0; fd < thread->fd; fd++) {
-            gushort events = 0;
-
-            if (FD_ISSET(fd, &thread->readfds))
-                events |= G_IO_IN;
-            if (FD_ISSET(fd, &thread->writefds))
-                events |= G_IO_OUT;
-            if (FD_ISSET(fd, &thread->exceptfds))
-                events |= G_IO_PRI | G_IO_ERR | G_IO_HUP;
-
-            if (events != 0)
-              source_prepare_add_poll_fd(source, fd, events);
-        }
-    }
-}
-
-static inline gboolean
-source_prepare_setup_poll_fd(GSource *source, gint *timeout)
-{
-    RGSource *rg_source = (RGSource *)source;
-    rb_thread_t thread;
-    gdouble now;
-
-    g_assert(rg_source->old_poll_fds == NULL);
-    rg_source->old_poll_fds = rg_source->poll_fds;
-    rg_source->poll_fds = NULL;
-
-    now = timeofday();
-    thread = rb_curr_thread;
-    do {
-        thread = thread->next;
-
-        if ((thread->wait_for == 0 && thread->status == THREAD_RUNNABLE &&
-             thread != rb_curr_thread) ||
-            (thread->wait_for & WAIT_JOIN &&
-             thread->join->status == THREAD_KILLED)) {
-            rg_source->poll_fds = g_list_concat(rg_source->poll_fds,
-                                                rg_source->old_poll_fds);
-            rg_source->old_poll_fds = NULL;
-            return TRUE;
-        }
-
-        if (thread->wait_for & WAIT_TIME && thread->delay != DELAY_INFTY) {
-            gint delay;
-
-            delay = (thread->delay - now) * 1000;
-            if (delay <= 0) {
-                rg_source->poll_fds = g_list_concat(rg_source->poll_fds,
-                                                    rg_source->old_poll_fds);
-                rg_source->old_poll_fds = NULL;
-                return TRUE;
-            }
-            if (*timeout == -1 || delay < *timeout)
-                *timeout = delay;
-        }
-
-        if (thread->wait_for == WAIT_FD || thread->wait_for & WAIT_SELECT)
-            source_prepare_add_poll(source, thread);
-    } while (thread != rb_curr_thread);
-
-    source_cleanup_poll_fds(source);
-
-    return FALSE;
-}
-
-static gboolean
-source_prepare(GSource *source, gint *timeout)
-{
-    RGSource *rg_source = (RGSource *)source;
-
-    *timeout = -1;
-    rg_source->ready = source_prepare_setup_poll_fd(source, timeout);
-
-    return rg_source->ready;
-}
-
-static gboolean
-source_check(GSource *source)
-{
-    RGSource *rg_source = (RGSource *)source;
-    GList *node;
-
-    if (rg_source->ready)
-        return TRUE;
-
-    for (node = rg_source->poll_fds; node; node = g_list_next(node)) {
-        GPollFD *poll_fd = node->data;
-
-        if (poll_fd->revents)
-            return TRUE;
-    }
-
-    return FALSE;
-}
-
-static gboolean
-source_dispatch(G_GNUC_UNUSED GSource *source,
-                G_GNUC_UNUSED GSourceFunc callback,
-                G_GNUC_UNUSED gpointer user_data)
-{
-    TRAP_BEG;
-    rb_thread_schedule();
-    TRAP_END;
-
-    return TRUE;
-}
-
-static void
-source_finalize(GSource *source)
-{
-    RGSource *rg_source = (RGSource *)source;
-    GList *node;
-
-    for (node = rg_source->old_poll_fds; node; node = g_list_next(node)) {
-        GPollFD *poll_fd = node->data;
-        g_slice_free(GPollFD, poll_fd);
-    }
-
-    for (node = rg_source->poll_fds; node; node = g_list_next(node)) {
-        GPollFD *poll_fd = node->data;
-        g_slice_free(GPollFD, poll_fd);
-    }
-
-    g_list_free(rg_source->old_poll_fds);
-    rg_source->old_poll_fds = NULL;
-
-    g_list_free(rg_source->poll_fds);
-    rg_source->poll_fds = NULL;
-}
-
-static GSourceFuncs source_funcs = {
-    source_prepare,
-    source_check,
-    source_dispatch,
-    source_finalize,
-    NULL,
-    NULL
-};
-
-static GSource *
-ruby_source_new(void)
-{
-    GSource *source;
-    RGSource *rg_source;
-
-    source = g_source_new(&source_funcs, sizeof(RGSource));
-    g_source_set_can_recurse(source, TRUE);
-
-    rg_source = (RGSource *)source;
-    rg_source->poll_fds = NULL;
-    rg_source->old_poll_fds = NULL;
-
-    return source;
-}
-
-static VALUE
-ruby_source_set_priority(G_GNUC_UNUSED VALUE self, VALUE priority)
-{
-    GSource *ruby_source = NULL;
-
-    if (ruby_source_id != 0)
-        ruby_source = g_main_context_find_source_by_id(NULL, ruby_source_id);
-
-    if (ruby_source)
-        g_source_set_priority(ruby_source, NUM2INT(priority));
-
-    return Qnil;
-}
-#endif
-
 static VALUE
 source_remove(G_GNUC_UNUSED VALUE self, VALUE tag)
 {
@@ -463,14 +148,6 @@ rg_initialize(VALUE self)
     context = g_main_context_new();
 
     g_main_context_set_poll_func(context, rg_poll);
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
-    {
-        GSource *source;
-        source = ruby_source_new();
-        g_source_attach(source, context);
-        g_source_unref(source);
-    }
-#endif
 
     G_INITIALIZE(self, context);
     return Qnil;
@@ -822,17 +499,6 @@ child_watch_add(VALUE self, VALUE pid)
                                       (GChildWatchFunc)child_watch_func, (gpointer)func));
 }
 
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
-static void
-ruby_source_remove(G_GNUC_UNUSED VALUE data)
-{
-    if (ruby_source_id != 0) {
-        g_source_remove(ruby_source_id);
-        ruby_source_id = 0;
-    }
-}
-#endif
-
 void
 Init_glib_main_context(void)
 {
@@ -896,16 +562,4 @@ Init_glib_main_context(void)
     default_poll_func = g_main_context_get_poll_func(NULL);
     g_main_context_set_poll_func(NULL, rg_poll);
     rb_set_end_proc(restore_poll_func, Qnil);
-
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
-    {
-        GSource *source;
-
-        source = ruby_source_new();
-        g_source_set_priority(source, G_PRIORITY_DEFAULT_IDLE);
-        ruby_source_id = g_source_attach(source, NULL);
-        g_source_unref(source);
-        rb_set_end_proc(ruby_source_remove, Qnil);
-    }
-#endif
 }

data/ext/glib2/rbglib_mainloop.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005,2006 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -57,10 +57,35 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
+static gboolean
+quit_loop(gpointer user_data)
+{
+    GMainLoop *loop = user_data;
+    g_main_loop_quit(loop);
+    return G_SOURCE_REMOVE;
+}
+
 static VALUE
 rg_run(VALUE self)
 {
-    g_main_loop_run(_SELF(self));
+    GMainLoop *loop;
+    GSource *interrupt_source;
+
+    loop = _SELF(self);
+
+    interrupt_source = rbg_interrupt_source_new();
+    g_source_set_callback(interrupt_source,
+                          quit_loop,
+                          loop,
+                          NULL);
+    g_source_attach(interrupt_source,
+                    g_main_loop_get_context(loop));
+    g_main_loop_run(loop);
+    g_source_destroy(interrupt_source);
+    g_source_unref(interrupt_source);
+
+    rb_thread_check_ints();
+
     return self;
 }
 

data/ext/glib2/rbgobj_boxed.c

@@ -47,7 +47,7 @@ boxed_free(boxed_holder *holder)
     if (holder->own && holder->boxed)
         g_boxed_free(holder->type, holder->boxed);
 
-    free(holder);
+    xfree(holder);
 }
 
 /**********************************************************************/
@@ -71,11 +71,27 @@ rbgobj_boxed_s_allocate(VALUE klass)
     return result;
 }
 
-static G_GNUC_NORETURN VALUE
+static VALUE
 rg_initialize(VALUE self)
 {
-    rb_raise(rb_eTypeError, "can't initialize %s",
-             rb_class2name(CLASS_OF(self)));
+    VALUE rb_class;
+
+    rb_class = CLASS_OF(self);
+    if (RVAL2CBOOL(rb_ivar_defined(rb_class, rb_intern("@size")))) {
+        const RGObjClassInfo *cinfo;
+        gpointer instance;
+        gsize instance_size;
+        cinfo = rbgobj_lookup_class(rb_class);
+        instance_size = NUM2UINT(rb_iv_get(rb_class, "@size"));
+        instance = alloca(instance_size);
+        memset(instance, 0, instance_size);
+        G_INITIALIZE(self, g_boxed_copy(cinfo->gtype, instance));
+    } else {
+        rb_raise(rb_eTypeError, "can't initialize %s",
+                 rb_class2name(rb_class));
+    }
+
+    return Qnil;
 }
 
 static VALUE

data/ext/glib2/rbgobj_object.c

@@ -58,7 +58,7 @@ holder_mark(gobj_holder *holder)
 }
 
 static void
-holder_free(gobj_holder *holder)
+holder_unref(gobj_holder *holder)
 {
     if (holder->gobj) {
         if (!holder->destroyed) {
@@ -68,6 +68,12 @@ holder_free(gobj_holder *holder)
         }
         holder->gobj = NULL;
     }
+}
+
+static void
+holder_free(gobj_holder *holder)
+{
+    holder_unref(holder);
     xfree(holder);
 }
 
@@ -608,6 +614,23 @@ rg_inspect(VALUE self)
     return result;
 }
 
+static VALUE
+rg_unref(VALUE self)
+{
+    gobj_holder* holder;
+
+    Data_Get_Struct(self, gobj_holder, holder);
+
+    if (holder->destroyed)
+        rb_raise(rb_eTypeError, "destroyed GLib::Object");
+    if (!holder->gobj)
+        rb_raise(rb_eTypeError, "uninitialize GLib::Object");
+
+    holder_unref(holder);
+
+    return self;
+}
+
 static VALUE
 rg_type_name(VALUE self)
 {
@@ -842,6 +865,7 @@ Init_gobject_gobject(void)
 
     RG_DEF_METHOD(initialize, -1);
     rbg_define_method(RG_TARGET_NAMESPACE, "ref_count", gobj_ref_count, 0); /* for debugging */
+    RG_DEF_METHOD(unref, 0);
     RG_DEF_METHOD(inspect, 0);
     RG_DEF_METHOD(type_name, 0);
 

data/ext/glib2/rbgobj_type.c

@@ -26,7 +26,9 @@
 /**********************************************************************/
 /* Type Mapping */
 
+#ifndef rb_cMutex
 static VALUE rb_cMutex;
+#endif
 static VALUE lookup_class_mutex;
 
 static ID id_new;
@@ -69,11 +71,7 @@ rbgobj_lookup_class(VALUE klass)
 
     if (TYPE(klass) == T_CLASS) {
         VALUE super;
-        if (FL_TEST(klass, FL_SINGLETON)) {
-            super = rb_class_real(klass);
-        } else {
-            super = rb_funcall(klass, id_superclass, 0);
-        }
+        super = rb_funcall(klass, id_superclass, 0);
         return rbgobj_lookup_class(super);
     }
 
@@ -768,7 +766,9 @@ Init_gobject_gtype(void)
     init_typemap();
 
     /* type */
+#ifndef rb_cMutex
     rb_cMutex = rb_const_get(rb_cObject, rb_intern("Mutex"));
+#endif
     id_lock = rb_intern("lock");
     id_unlock = rb_intern("unlock");
     lookup_class_mutex = rb_funcall(rb_cMutex, id_new, 0);

data/ext/glib2/rbgprivate.h

@@ -56,9 +56,7 @@ typedef struct {
     GType type;
 } boxed_holder;
 
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
 G_GNUC_INTERNAL extern GStaticPrivate rg_polling_key;
-#endif
 
 extern VALUE rbgobj_cEnum;
 extern VALUE rbgobj_cFlags;

data/ext/glib2/rbgutil.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2004 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -133,6 +133,44 @@ rbgutil_key_equal(VALUE rb_key, const char *key)
     }
 }
 
+static gboolean
+rbg_interrupt_prepare (G_GNUC_UNUSED GSource *soruce,
+                      G_GNUC_UNUSED gint *timouet)
+{
+    return rb_thread_interrupted(rb_thread_current());
+}
+
+static gboolean
+rbg_interrupt_check (G_GNUC_UNUSED GSource *soruce)
+{
+    return rb_thread_interrupted(rb_thread_current());
+}
+
+static gboolean
+rbg_interrupt_dispatch (G_GNUC_UNUSED GSource *soruce,
+                       GSourceFunc callback,
+                       gpointer user_data)
+{
+    if (callback) {
+        return callback(user_data);
+    } else {
+        return G_SOURCE_REMOVE;
+    }
+}
+
+static GSourceFuncs rbg_interrupt_funcs = {
+    rbg_interrupt_prepare,
+    rbg_interrupt_check,
+    rbg_interrupt_dispatch,
+    NULL
+};
+
+GSource *
+rbg_interrupt_source_new(void)
+{
+    return g_source_new(&rbg_interrupt_funcs, sizeof(GSource));
+}
+
 void
 Init_gutil(void)
 {

data/ext/glib2/rbgutil.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -105,6 +105,7 @@ extern VALUE rbgutil_string_set_utf8_encoding(VALUE string);
 extern gboolean rbgutil_key_equal(VALUE rb_string, const char *key);
 
 extern const gchar *rbg_inspect(VALUE object);
+extern GSource *rbg_interrupt_source_new(void);
 
 /*< protected >*/
 RUBY_GLIB2_VAR ID rbgutil_id_module_eval;

data/ext/glib2/rbgutil_callback.c

@@ -195,11 +195,9 @@ rbgutil_invoke_callback(VALUE (*func)(VALUE), VALUE arg)
 {
 #ifdef HAVE_NATIVETHREAD
     if (ruby_native_thread_p()) {
-#  ifdef HAVE_RB_THREAD_BLOCKING_REGION
         if (!GPOINTER_TO_INT(g_static_private_get(&rg_polling_key))) {
             return rbgutil_protect(func, arg);
         }
-#  endif
 #  ifdef HAVE_RB_THREAD_CALL_WITH_GVL
         {
             CallbackRequest req;

data/lib/gnome2/rake/external-package.rb

@@ -26,6 +26,7 @@ module GNOME2
                                        :download_site,
                                        :download_base_url,
                                        :compression_method,
+                                       :base_dir_in_package,
                                        :windows,
                                        :native,
                                        :patches,
@@ -72,6 +73,10 @@ module GNOME2
         need_autoreconf
       end
 
+      def base_dir_in_package
+        super || "."
+      end
+
       def windows
         super || WindowsConfiguration.new({})
       end
@@ -99,6 +104,8 @@ module GNOME2
           base_url = "http://ftp.gnome.org/pub/gnome/sources"
           release_series = version.gsub(/\A(\d+\.\d+)(?:[^\d].*)?\z/, '\1')
           base_url << "/#{name}/#{release_series}"
+        when :gnu
+          base_url = "http://ftp.gnu.org/pub/gnu/#{name}"
         else
           base_url = nil
         end
@@ -109,6 +116,7 @@ module GNOME2
                                               :include_paths,
                                               :library_paths,
                                               :configure_args,
+                                              :cmake_args,
                                               :cc_args,
                                               :patches,
                                               :built_file,
@@ -139,6 +147,10 @@ module GNOME2
           super || []
         end
 
+        def cmake_args
+          super || []
+        end
+
         def cc_args
           super || []
         end

data/lib/gnome2/rake/native-binary-build-task.rb

@@ -75,7 +75,7 @@ module GNOME2
       end
 
       def build_package_task_body(package)
-        package_tmp_dir = @package.tmp_dir + package.name
+        package_tmp_dir = @package.tmp_dir + "native" + package.name
         rm_rf(package_tmp_dir)
         mkdir_p(package_tmp_dir)
 
@@ -84,7 +84,9 @@ module GNOME2
           sh("tar", "xf", tar_full_path.to_s) or exit(false)
         end
 
-        Dir.chdir((package_tmp_dir + package.base_name).to_s) do
+        package_dir_path =
+          package_tmp_dir + package.base_name + package.base_dir_in_package
+        Dir.chdir(package_dir_path.to_s) do
           package.native.patches.each do |patch|
             sh("patch -p1 < #{@package.patches_dir}/#{patch}")
           end

data/lib/gnome2/rake/package.rb

@@ -108,6 +108,15 @@ module GNOME2
         def build_host
           super || "i686-w64-mingw32"
         end
+
+        def build_architecture
+          case build_host
+          when /\Ai\d86-/
+            "x86_64"
+          else
+            "x64"
+          end
+        end
       end
 
       class NativeConfiguration

data/lib/gnome2/rake/win32-binary-build-task.rb

@@ -93,7 +93,7 @@ class GNOME2Win32BinaryBuildTask
   end
 
   def build_package_task_body(package)
-    package_tmp_dir = @package.tmp_dir + package.name
+    package_tmp_dir = @package.tmp_dir + "windows" + package.name
     rm_rf(package_tmp_dir)
     mkdir_p(package_tmp_dir)
 
@@ -102,25 +102,22 @@ class GNOME2Win32BinaryBuildTask
       sh("tar", "xf", tar_full_path.to_s)
     end
 
-    Dir.chdir((package_tmp_dir + package.base_name).to_s) do
+    package_dir_path =
+      package_tmp_dir + package.base_name + package.base_dir_in_package
+    Dir.chdir(package_dir_path.to_s) do
       package.windows.patches.each do |patch|
         sh("patch -p1 < #{@package.patches_dir}/#{patch}")
       end
-      sh("./autogen.sh") if package.windows.need_autogen?
-      sh("autoreconf --install") if package.windows.need_autoreconf?
-      cc_env = "CC=#{cc(package)}"
-      sh("./configure",
-         cc_env,
-         "CPPFLAGS=#{cppflags(package)}",
-         "LDFLAGS=#{ldflags(package)}",
-         "--prefix=#{dist_dir}",
-         "--host=#{@package.windows.build_host}",
-         *package.windows.configure_args) or exit(false)
+      if File.exist?("configure")
+        configure(package)
+      else
+        cmake(package)
+      end
       common_make_args = []
       common_make_args << "MAKE=make"
       common_make_args << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
       if package.windows.use_cc_environment_variable?
-        common_make_args << cc_env
+        common_make_args << cc_env(package)
       end
       add_gobject_introspection_make_args(common_make_args)
       build_make_args = common_make_args.dup
@@ -152,6 +149,43 @@ class GNOME2Win32BinaryBuildTask
     end
   end
 
+  def configure(package)
+    sh("./autogen.sh") if package.windows.need_autogen?
+    sh("autoreconf --install") if package.windows.need_autoreconf?
+    sh("./configure",
+       cc_env(package),
+       "CPPFLAGS=#{cppflags(package)}",
+       "LDFLAGS=#{ldflags(package)}",
+       "--prefix=#{dist_dir}",
+       "--host=#{@package.windows.build_host}",
+       *package.windows.configure_args) or exit(false)
+  end
+
+  def cmake(package)
+    toolchain_cmake_path = "toolchain.cmake"
+    File.open(toolchain_cmake_path, "w") do |toolchain|
+      toolchain.puts(<<-CMAKE)
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(MSVC_CXX_ARCHITECTURE_ID #{@package.windows.build_architecture})
+SET(CMAKE_SYSTEM_PROCESSOR #{@package.windows.build_architecture})
+
+SET(CMAKE_C_COMPILER #{@package.windows.build_host}-gcc)
+SET(CMAKE_CXX_COMPILER #{@package.windows.build_host}-g++)
+SET(CMAKE_RC_COMPILER #{@package.windows.build_host}-windres)
+
+SET(CMAKE_FIND_ROOT_PATH #{cmake_root_paths.join(" ")})
+      CMAKE
+    end
+    sh("cmake",
+       ".",
+       "-DCMAKE_TOOLCHAIN_FILE=#{toolchain_cmake_path}",
+       *package.windows.cmake_args) or exit(false)
+  end
+
+  def cc_env(package)
+    "CC=#{cc(package)}"
+  end
+
   def build_packages
     packages = @package.external_packages.select do |package|
       package.windows.build?
@@ -168,28 +202,36 @@ class GNOME2Win32BinaryBuildTask
     dist_dir + "share" + "license"
   end
 
+  def glib2_binary_base_dir
+    @package.glib2_root_dir + "vendor" + "local"
+  end
+
   def glib2_include_path
-    "#{@package.glib2_root_dir}/vendor/local/include"
+    "#{glib2_binary_base_dir}/include"
   end
 
   def glib2_lib_path
-    "#{@package.glib2_root_dir}/vendor/local/lib"
+    "#{glib2_binary_base_dir}/lib"
   end
 
   def rcairo_win32_dir
     @package.project_root_dir.parent + "rcairo.win32"
   end
 
+  def rcairo_win32_binary_base_dir
+    rcairo_win32_dir + "vendor" + "local"
+  end
+
   def rcairo_win32_pkgconfig_path
-    "#{rcairo_win32_dir}/vendor/local/lib/pkgconfig"
+    "#{rcairo_win32_binary_base_dir}/lib/pkgconfig"
   end
 
   def rcairo_win32_include_path
-    "#{rcairo_win32_dir}/vendor/local/include"
+    "#{rcairo_win32_binary_base_dir}/include"
   end
 
   def rcairo_win32_lib_path
-    "#{rcairo_win32_dir}/vendor/local/lib"
+    "#{rcairo_win32_binary_base_dir}/lib"
   end
 
   def cc(package)
@@ -230,6 +272,17 @@ class GNOME2Win32BinaryBuildTask
     ldflags.join(" ")
   end
 
+  def cmake_root_paths
+    paths = [
+      "/usr/#{@package.windows.build_host}",
+      rcairo_win32_binary_base_dir.to_path,
+    ]
+    @package.windows.build_dependencies.each do |package|
+      paths << "#{@package.project_root_dir}/#{package}/vendor/local"
+    end
+    paths
+  end
+
   def add_gobject_introspection_make_args(common_make_args)
     unless @package.windows.build_dependencies.include?("gobject-introspection")
       return

data/lib/mkmf-gnome2.rb

@@ -16,9 +16,51 @@ require 'glib-mkenums'
 
 $CFLAGS += " #{ENV['CFLAGS']}" if ENV['CFLAGS']
 
+def gcc?
+  CONFIG["GCC"] == "yes"
+end
+
+def disable_optimization_build_flag(flags)
+  if gcc?
+    flags.gsub(/(^|\s)?-O\d(\s|$)?/, '\\1-O0\\2')
+  else
+    flags
+  end
+end
+
+def enable_debug_build_flag(flags)
+  if gcc?
+    debug_option_pattern = /(^|\s)?-g\d?(\s|$)?/
+    if debug_option_pattern =~ flags
+      flags.gsub(debug_option_pattern, '\\1-g3\\2')
+    else
+      flags + " -g3"
+    end
+  else
+    flags
+  end
+end
+
+checking_for(checking_message("--enable-debug-build option")) do
+  enable_debug_build = enable_config("debug-build", false)
+  if enable_debug_build
+    $CFLAGS = disable_optimization_build_flag($CFLAGS)
+    $CFLAGS = enable_debug_build_flag($CFLAGS)
+
+    CONFIG["CXXFLAGS"] = disable_optimization_build_flag(CONFIG["CXXFLAGS"])
+    CONFIG["CXXFLAGS"] = enable_debug_build_flag(CONFIG["CXXFLAGS"])
+  end
+  enable_debug_build
+end
+
 def try_compiler_option(opt, &block)
   checking_for "#{opt} option to compiler" do
-    $CFLAGS += " #{opt}" if try_compile '', opt, &block
+    if try_compile '', opt + " -Werror", &block
+      $CFLAGS += " #{opt}"
+      true
+    else
+      false
+    end
   end
 end
 
@@ -52,6 +94,7 @@ try_compiler_option '-Wswitch-enum'
 try_compiler_option '-Wundef'
 # NOTE: Incredible amounts of false positives.
 #try_compiler_option '-Wunreachable-code'
+try_compiler_option '-Wout-of-line-declaration'
 try_compiler_option '-Wunsafe-loop-optimizations'
 try_compiler_option '-Wwrite-strings'
 
@@ -457,17 +500,19 @@ def install_missing_native_package(native_package_info)
   package = native_package_info[platform]
   return false if package.nil?
 
+  package_name, *options = package
+  package_command_line = [package_name, *options].join(" ")
   need_super_user_priviledge = true
   case platform
   when :debian
-    install_command = "apt-get install -V -y #{package}"
+    install_command = "apt-get install -V -y #{package_command_line}"
   when :fedora, :redhat
-    install_command = "yum install -y #{package}"
+    install_command = "yum install -y #{package_command_line}"
   when :homebrew
     need_super_user_priviledge = false
-    install_command = "brew install #{package}"
+    install_command = "brew install #{package_command_line}"
   when :macports
-    install_command = "port install -y #{package}"
+    install_command = "port install -y #{package_command_line}"
   else
     return false
   end
@@ -477,14 +522,14 @@ def install_missing_native_package(native_package_info)
     sudo = find_executable("sudo")
   end
 
-  installing_message = "installing '#{package}' native package... "
+  installing_message = "installing '#{package_name}' native package... "
   message("%s", installing_message)
   failed_to_get_super_user_priviledge = false
   if have_priviledge
     succeeded = xsystem(install_command)
   else
     if sudo
-      prompt = "[sudo] password for %u to install <#{package}>: "
+      prompt = "[sudo] password for %u to install <#{package_name}>: "
       sudo_options = "-p #{Shellwords.escape(prompt)}"
       install_command = "#{sudo} #{sudo_options} #{install_command}"
       succeeded = xsystem(install_command)
@@ -508,7 +553,7 @@ def install_missing_native_package(native_package_info)
   unless succeeded
     if failed_to_get_super_user_priviledge
       error_message = <<-EOM
-'#{package}' native package is required.
+'#{package_name}' native package is required.
 run the following command as super user to install required native package:
   \# #{install_command}
 EOM
@@ -557,4 +602,3 @@ check_ruby_func
 if /mingw/ =~ RUBY_PLATFORM
   $ruby.gsub!('\\', '/')
 end
-

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
 description: Ruby/GLib2 is a Ruby binding of GLib-2.x.
@@ -47,19 +47,6 @@ extra_rdoc_files: []
 files:
 - README
 - Rakefile
-- extconf.rb
-- lib/glib-mkenums.rb
-- lib/glib2.rb
-- lib/glib2/deprecatable.rb
-- lib/gnome2-raketask.rb
-- lib/gnome2/rake/external-package.rb
-- lib/gnome2/rake/native-binary-build-task.rb
-- lib/gnome2/rake/package-task.rb
-- lib/gnome2/rake/package.rb
-- lib/gnome2/rake/source-download-task.rb
-- lib/gnome2/rake/win32-binary-build-task.rb
-- lib/gnome2/rake/win32-binary-download-task.rb
-- lib/mkmf-gnome2.rb
 - ext/glib2/depend
 - ext/glib2/extconf.rb
 - ext/glib2/glib2.def
@@ -128,6 +115,19 @@ files:
 - ext/glib2/rbgutil_list.h
 - ext/glib2/rbgutildeprecated.c
 - ext/glib2/rbgutildeprecated.h
+- extconf.rb
+- lib/glib-mkenums.rb
+- lib/glib2.rb
+- lib/glib2/deprecatable.rb
+- lib/gnome2-raketask.rb
+- lib/gnome2/rake/external-package.rb
+- lib/gnome2/rake/native-binary-build-task.rb
+- lib/gnome2/rake/package-task.rb
+- lib/gnome2/rake/package.rb
+- lib/gnome2/rake/source-download-task.rb
+- lib/gnome2/rake/win32-binary-build-task.rb
+- lib/gnome2/rake/win32-binary-download-task.rb
+- lib/mkmf-gnome2.rb
 - sample/bookmarkfile.rb
 - sample/idle.rb
 - sample/iochannel.rb
@@ -169,17 +169,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.