glib2 2.2.3-x86-mingw32 → 2.2.4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c00ead1509b3cedcfc7a69ae6822007d9673c6bd
-  data.tar.gz: efa937c359a4dc40d12ac75539dd63b25e94f4ce
+  metadata.gz: 311eca3a11c3befb2791ddb9a0126841e40e8255
+  data.tar.gz: 008ecee00553650ca9600ed2ccdb989be1a2eb0c
 SHA512:
-  metadata.gz: 4ff53d80984367bf27fcb648c783c3927fb557ec157089bf7b8b56d963370dfe34fc7df49ade6574f0fb764359116f02e8082bd7a753d9d923525dfbc94d1caf
-  data.tar.gz: a5956895b3d2483c4a1650df2eb89e38a80bb569d561e6b9949b434e09d1adbe87decd0e608709a365892854c0a76b50000f01822e5b25e91808a96eb7366aa0
+  metadata.gz: 28c292c2fcc4cea95eac85abcd8605758e1eae2458b3e4675682be5cd04808b22d703249d8204fef24f920aa680626dc882bd701d84054dfd11ac58fe237488e
+  data.tar.gz: da24c299e148e3b01abc3774031c129b6de69a4701117e2ccfb3026ec3e2f516f669269e0d413cffcc3c53ee9ab8c5de7dae07146e48937e0df28b02c3a78209

data/Rakefile

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 
 $LOAD_PATH.unshift("./lib")
-require 'gnome2-raketask'
+require 'gnome2/rake/package-task'
 
 bin_dir            = nil
 include_dir        = nil
@@ -10,21 +10,21 @@ libffi_lib_dir     = nil
 
 build_host         = nil
 
-package = GNOME2Package.new do |_package|
-  bin_dir            = (_package.windows.absolute_binary_dir + "bin").to_s
-  include_dir        = (_package.windows.absolute_binary_dir + "include").to_s
+package_task = GNOME2::Rake::PackageTask.new 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
+  libffi_lib_dir     = (package.windows.absolute_binary_dir + "lib").to_s
 
-  build_host         = _package.windows.build_host
+  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", ">= 0"]]
-  _package.dependency.gem.development = [["test-unit", ">= 2"]]
-  _package.win32.packages = []
-  _package.win32.dependencies = []
-  _package.external_packages = [
+  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", ">= 0"]]
+  package.dependency.gem.development = [["test-unit", ">= 2"]]
+  package.windows.packages = []
+  package.windows.dependencies = []
+  package.external_packages = [
     {
       :name => "libiconv",
       :download_site => :gnu,
@@ -48,7 +48,7 @@ package = GNOME2Package.new do |_package|
       :name => "libffi",
       :download_base_url => "ftp://sourceware.org/pub/libffi",
       :label => "libffi",
-      :version => "3.1",
+      :version => "3.2.1",
       :windows => {
         :built_file => "bin/libffi-6.dll",
       },
@@ -57,7 +57,7 @@ package = GNOME2Package.new do |_package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.42.0",
+      :version => "2.42.1",
       :compression_method => "xz",
       :windows => {
         :need_autoreconf => true,
@@ -95,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.18",
+      :version => "3.2.21",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -111,7 +111,7 @@ package = GNOME2Package.new do |_package|
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.42.0",
+      :version => "2.42.1",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -123,10 +123,35 @@ package = GNOME2Package.new do |_package|
       },
     },
   ]
-  _package.cross_compiling do |spec|
+  package.cross_compiling do |spec|
     if /mingw|mswin/ =~ spec.platform.to_s
       spec.add_runtime_dependency("cairo", ">= 1.12.8")
     end
   end
 end
-package.define_tasks
+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
+end

data/ext/glib2/extconf.rb

@@ -14,7 +14,7 @@ package_id = "gobject-2.0"
 
 require 'mkmf-gnome2'
 
-setup_win32(module_name, base_dir)
+setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package([package_id, 2, 12, 0],
                                    :debian => "libglib2.0-dev",

data/ext/glib2/rbglib.c

@@ -912,14 +912,14 @@ So they occur "cross-thread violation".
 static gpointer
 my_malloc(gsize n_bytes)
 {
-    /* Should we rescue NoMemoryError? */ 
+    /* Should we rescue NoMemoryError? */
     return ruby_xmalloc(n_bytes);
 }
 
 static gpointer
 my_realloc(gpointer mem, gsize n_bytes)
 {
-    /* Should we rescue NoMemoryError? */ 
+    /* Should we rescue NoMemoryError? */
     return ruby_xrealloc(mem, n_bytes);
 }
 

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 3
+#define RBGLIB_MICRO_VERSION 4
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/ext/glib2/rbglib2conversions.h

@@ -52,4 +52,6 @@
 #define RVAL2GKEYFILEFLAGS(o)              (RVAL2GFLAGS(o, G_TYPE_KEY_FILE_FLAGS))
 #define GKEYFILEFLAGS2RVAL(o)              (GFLAGS2RVAL(o, G_TYPE_KEY_FILE_FLAGS))
 
+#define RVAL2GFORMATSIZEFLAGS(o)           (RVAL2GFLAGS(o, G_TYPE_FORMAT_SIZE_FLAGS))
+#define GFORMATSIZEFLAGS2RVAL(o)           (GFLAGS2RVAL(o, G_TYPE_FORMAT_SIZE_FLAGS))
 #endif /* __GLIB2CONVERSIONS_H__ */

data/ext/glib2/rbglib_fileutils.c

@@ -57,6 +57,27 @@ rbglib_m_format_size_for_display(G_GNUC_UNUSED VALUE self, VALUE size)
 }
 #endif
 
+#if GLIB_CHECK_VERSION(2, 30, 0)
+static VALUE
+rbglib_m_format_size(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+{
+    VALUE rb_size, rb_options;
+
+    rb_scan_args(argc, argv, "11", &rb_size, &rb_options);
+    if (NIL_P(rb_options)) {
+      return CSTR2RVAL_FREE(g_format_size(NUM2UINT(rb_size)));
+    } else {
+      VALUE rb_flags;
+      rbg_scan_options(rb_options,
+                       "flags", &rb_flags,
+                       NULL);
+
+      return CSTR2RVAL_FREE(g_format_size_full(NUM2UINT(rb_size),
+                                               RVAL2GFORMATSIZEFLAGS(rb_flags)));
+    }
+}
+#endif
+
 void
 Init_glib_fileutils(void)
 {
@@ -91,4 +112,8 @@ Init_glib_fileutils(void)
     rbg_define_singleton_method(mGLib, "format_size_for_display",
 			      rbglib_m_format_size_for_display, 1);
 #endif
+#if GLIB_CHECK_VERSION(2, 30, 0)
+    rbg_define_singleton_method(mGLib, "format_size",
+                                rbglib_m_format_size, -1);
+#endif
 }

data/ext/glib2/rbglib_source.c

@@ -63,6 +63,13 @@ rg_attach(int argc, VALUE *argv, VALUE self)
                                     RVAL2BOXED(context, G_TYPE_MAIN_CONTEXT)));
 }
 
+static VALUE
+rg_destroy(VALUE self)
+{
+    g_source_destroy(_SELF(self));
+    return self;
+}
+
 static VALUE
 rg_destroyed_p(VALUE self)
 {
@@ -101,6 +108,21 @@ rg_id(VALUE self)
     return UINT2NUM(g_source_get_id(_SELF(self)));
 }
 
+#if GLIB_CHECK_VERSION(2, 26, 0)
+static VALUE
+rg_name(VALUE self)
+{
+    return CSTR2RVAL(g_source_get_name(_SELF(self)));
+}
+
+static VALUE
+rg_set_name(VALUE self, VALUE name)
+{
+    g_source_set_name(_SELF(self), RVAL2CSTR(name));
+    return self;
+}
+#endif
+
 static VALUE
 rg_context(VALUE self)
 {
@@ -121,7 +143,7 @@ rg_set_callback(VALUE self)
     G_RELATIVE(self, func);
     g_source_set_callback(_SELF(self),
                           (GSourceFunc)source_func,
-                          (gpointer)func, 
+                          (gpointer)func,
                           (GDestroyNotify)NULL);
     return self;
 }
@@ -132,6 +154,23 @@ void        g_source_set_callback_indirect  (GSource *source,
                                              GSourceCallbackFuncs *callback_funcs);
 */
 
+#if GLIB_CHECK_VERSION(2, 36, 0)
+static VALUE
+rg_ready_time(VALUE self)
+{
+    gint64 ready_time;
+    ready_time = g_source_get_ready_time(_SELF(self));
+    return LL2NUM(ready_time);
+}
+
+static VALUE
+rg_set_ready_time(VALUE self, VALUE ready_time)
+{
+    g_source_set_ready_time(_SELF(self), NUM2LL(ready_time));
+    return self;
+}
+#endif
+
 static VALUE
 rg_add_poll(VALUE self, VALUE fd)
 {
@@ -166,7 +205,7 @@ gboolean    g_source_remove_by_user_data    (gpointer user_data);
 void
 Init_glib_source(void)
 {
-    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_SOURCE, "Source", mGLib); 
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_SOURCE, "Source", mGLib);
 
     id_call = rb_intern("call");
 
@@ -176,14 +215,23 @@ Init_glib_source(void)
                     "CONTINUE", CBOOL2RVAL(G_SOURCE_CONTINUE));
 
     RG_DEF_METHOD(attach, -1);
+    RG_DEF_METHOD(destroy, 0);
     RG_DEF_METHOD_P(destroyed, 0);
     RG_DEF_METHOD(set_priority, 1);
     RG_DEF_METHOD(priority, 0);
     RG_DEF_METHOD(set_can_recurse, 1);
     RG_DEF_METHOD_P(can_recurse, 0);
     RG_DEF_METHOD(id, 0);
+#if GLIB_CHECK_VERSION(2, 26, 0)
+    RG_DEF_METHOD(name, 0);
+    RG_REPLACE_SET_PROPERTY(name, 1);
+#endif
     RG_DEF_METHOD(context, 0);
     RG_DEF_METHOD(set_callback, 0);
+#if GLIB_CHECK_VERSION(2, 36, 0)
+    RG_DEF_METHOD(ready_time, 0);
+    RG_REPLACE_SET_PROPERTY(ready_time, 1);
+#endif
     RG_DEF_METHOD(add_poll, 1);
     RG_DEF_METHOD(remove_poll, 1);
 #if GLIB_CHECK_VERSION(2, 28, 0)

data/ext/glib2/rbglib_threads.c

@@ -29,7 +29,7 @@ static VALUE
 rg_s_init(VALUE self)
 {
 #ifdef HAVE_G_THREAD_INIT
-#ifdef G_THREADS_ENABLED
+#if defined(G_THREADS_ENABLED) && !GLIB_CHECK_VERSION(2, 32, 0)
     g_thread_init(NULL);
 #endif
 #endif

data/ext/glib2/rbglib_utils.c

@@ -59,7 +59,7 @@ rg_s_getenv(G_GNUC_UNUSED VALUE self, VALUE variable)
 static VALUE
 rg_s_setenv(G_GNUC_UNUSED VALUE self, VALUE variable, VALUE value, VALUE overwrite)
 {
-    return CBOOL2RVAL(g_setenv(RVAL2CSTR(variable), 
+    return CBOOL2RVAL(g_setenv(RVAL2CSTR(variable),
                                RVAL2CSTR_ACCEPT_NIL(value),
                                RVAL2CBOOL(overwrite)));
 }
@@ -277,9 +277,9 @@ static VALUE
 rg_s_check_version_p(G_GNUC_UNUSED VALUE self, VALUE major, VALUE minor, VALUE micro)
 {
     return CBOOL2RVAL(glib_major_version > NUM2UINT(major) ||
-                      (glib_major_version == NUM2UINT(major) && 
+                      (glib_major_version == NUM2UINT(major) &&
                        glib_minor_version > NUM2UINT(minor)) ||
-                      (glib_major_version == NUM2UINT(major) && 
+                      (glib_major_version == NUM2UINT(major) &&
                        glib_minor_version == NUM2UINT(minor) &&
                        glib_micro_version >= NUM2UINT(micro)));
 }
@@ -293,6 +293,11 @@ Init_glib_utils(void)
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, G_TYPE_USER_DIRECTORY, "G_");
 #endif
 
+#if GLIB_CHECK_VERSION(2, 30, 0)
+    G_DEF_CLASS(G_TYPE_FORMAT_SIZE_FLAGS,
+                "FormatSizeFlags", RG_TARGET_NAMESPACE);
+#endif
+
     RG_DEF_SMETHOD(application_name, 0);
     RG_DEF_SMETHOD(set_application_name, 1);
     RG_DEF_SMETHOD(prgname, 0);

data/ext/glib2/rbgobj_convert.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) 2006  Sjoerd Simons, Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -39,9 +39,9 @@ void
 Init_gobject_convert(void)
 {
     /* TODO: unref the below tables on exit. */
-    tables = g_hash_table_new_full(g_int_hash, g_int_equal, NULL,
+    tables = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL,
                                    rg_convert_table_free);
-    class_to_g_type_map = g_hash_table_new(g_int_hash, g_int_equal);
+    class_to_g_type_map = g_hash_table_new(g_direct_hash, g_direct_equal);
 }
 
 void
@@ -49,17 +49,20 @@ rbgobj_convert_define(const RGConvertTable *table)
 {
     RGConvertTable *copied_table;
     copied_table = g_memdup(table, sizeof(RGConvertTable));
-    g_hash_table_insert(tables, &(copied_table->type), copied_table);
+    g_hash_table_insert(tables,
+                        GUINT_TO_POINTER(copied_table->type),
+                        copied_table);
     if (copied_table->klass != Qfalse && !NIL_P(copied_table->klass)) {
         g_hash_table_insert(class_to_g_type_map,
-                            &(copied_table->klass), &(copied_table->type));
+                            GUINT_TO_POINTER(copied_table->klass),
+                            GUINT_TO_POINTER(copied_table->type));
     }
 }
 
 RGConvertTable *
 rbgobj_convert_lookup(GType type)
 {
-    return g_hash_table_lookup(tables, &type);
+    return g_hash_table_lookup(tables, GUINT_TO_POINTER(type));
 }
 
 gboolean
@@ -128,11 +131,11 @@ GType
 rbgobj_convert_rvalue2gtype(VALUE value)
 {
     VALUE klass;
-    GType *result;
+    gpointer result;
 
     klass = rb_class_of(value);
-    result = g_hash_table_lookup(class_to_g_type_map, &klass);
-    return result ? *result : 0;
+    result = g_hash_table_lookup(class_to_g_type_map, GUINT_TO_POINTER(klass));
+    return GPOINTER_TO_UINT(result);
 }
 
 gboolean

data/lib/glib2/deprecatable.rb

@@ -91,29 +91,33 @@ module GLib
     private
 
     def const_missing(deprecated_const)
-      if new_const = (@@deprecated_const[self] || {})[deprecated_const.to_sym]
-        msg = "#{caller[0]}: '#{[name, deprecated_const].join('::')}' has been deprecated."
-        case new_const
-        when String, Symbol
-          new_const_val = constant_get(new_const)
-          case new_const_val
-          when GLib::Enum, GLib::Flags
-            alt = " or ':#{new_const_val.nick.gsub('-', '_')}'"
-          end
-          warn "#{msg} Use '#{new_const}'#{alt}."
-          return const_set(deprecated_const, new_const_val)
-        when Hash
-          if new_const[:raise]
-            raise DeprecatedError.new("#{msg} #{new_const[:raise]}")
-          elsif new_const[:warn]
-            warn "#{msg} #{new_const[:warn]}"
-          else
-            warn "#{msg} Don't use this constant anymore."
-          end
-          return
+      new_const = (@@deprecated_const[self] || {})[deprecated_const.to_sym]
+      if new_const.nil?
+        return super
+      end
+
+      msg = "#{caller[0]}: '#{[name, deprecated_const].join('::')}' has been deprecated."
+      case new_const
+      when String, Symbol
+        new_const_val = constant_get(new_const)
+        case new_const_val
+        when GLib::Enum, GLib::Flags
+          alt = " or ':#{new_const_val.nick.gsub('-', '_')}'"
+        end
+        warn "#{msg} Use '#{new_const}'#{alt}."
+        return const_set(deprecated_const, new_const_val)
+      when Hash
+        if new_const[:raise]
+          raise DeprecatedError.new("#{msg} #{new_const[:raise]}")
+        elsif new_const[:warn]
+          warn "#{msg} #{new_const[:warn]}"
+        else
+          warn "#{msg} Don't use this constant anymore."
         end
+        return
+      else
+        super
       end
-      raise NameError.new("uninitialized constant #{[self, deprecated_const].join('::')}")
     end
 
     def constant_get(const)