glib2 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaabbfe21ac69c6585d82b569ebd6f2da7b5d3d0
-  data.tar.gz: 94bb5881c554caa65395f55ed06e1c1995e1b5d3
+  metadata.gz: 6d462be0e4a6a612ec2225e654bb2d0a904a5e32
+  data.tar.gz: 98c1268474602947218d0ca851a97c6f6eaec874
 SHA512:
-  metadata.gz: 99c21a1c2345607bc0cf02c3573eb32c62fa6bf140e69ba3d17e6e507b6a4b0695a84870c4cccdbd750d423b60a70517ef181bf88550b5789df35f32f902da77
-  data.tar.gz: 14bc39e43f8ca0079af6732cc041f1d7616704ef614d4660aa639539343fa6cd166d69d4eb8506c20347c944e9b61648a3fa7e972e2df6e7c6d02690cba8a92f
+  metadata.gz: 7b223daf9866e5a09a3406dcc8370c016ffa6dc3c71b62cfa5d7c4b2592da785cc3f148550ebf53e85a42b2ee76ca20082cfb2c44c439305a45a947729a59138
+  data.tar.gz: e9fe1e88848f518f8cf04d72e2276828a02e7ac0b52ead04693ed6619a57af2a89c965e6a532a6484de0fc4d2be8569cc06c46fe8850a72e8fee25320552956d

data/Rakefile

@@ -36,7 +36,10 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
 
   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.runtime = [
+    ["pkg-config", ">= 0"],
+    ["native-package-installer", ">= 0"],
+  ]
   package.dependency.gem.development = [["test-unit", ">= 2"]]
   package.windows.packages = []
   package.windows.dependencies = []
@@ -85,12 +88,13 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.50.2",
+      :version => "2.52.1",
       :compression_method => "xz",
       :windows => {
         :need_autoreconf => true,
         :patches => [
           "glib-2.48.0-add-missing-exeext.diff",
+          "glib-2.52.1-fix-build-error.diff",
         ],
         :built_file => "bin/libglib-2.0-0.dll",
       },

data/ext/glib2/extconf.rb

@@ -17,10 +17,10 @@ require 'mkmf-gnome2'
 setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package([package_id, 2, 12, 0],
-                                   :altlinux => "glib2-devel",
+                                   :alt_linux => "glib2-devel",
                                    :debian => "libglib2.0-dev",
                                    :redhat => "glib2-devel",
-                                   :arch => "glib2",
+                                   :arch_linux => "glib2",
                                    :homebrew => "glib",
                                    :macports => "glib2")
   exit(false)
@@ -46,6 +46,8 @@ have_func("ruby_native_thread_p", ruby_header)
 have_func("rb_thread_call_with_gvl", ruby_header)
 have_func("rb_gc_register_mark_object", ruby_header)
 have_func("rb_exc_new_str", ruby_header)
+# For Ruby 2.1. TODO: Remove this when we drop Ruby 2.1 support.
+have_func("rb_enc_str_new_static", ruby_header)
 
 have_var("curr_thread", [ruby_header, "node.h"])
 have_var("rb_curr_thread", [ruby_header, "node.h"])

data/ext/glib2/glib2.def

@@ -22,6 +22,7 @@ EXPORTS
 	rbgobj_create_object
 	rbgobj_gobject_new
 	rbgobj_gobject_initialize
+	rbgobj_boxed_alloc_func
 	rbgobj_boxed_create
 	rbgobj_boxed_get
 	rbgobj_boxed_get_default
@@ -47,6 +48,8 @@ EXPORTS
 	rbgobj_get_enum
 	rbgobj_make_flags
 	rbgobj_get_flags
+	rbgobj_enum_alloc_func
+	rbgobj_flags_alloc_func
 	rbgobj_register_g2r_func
 	rbgobj_register_r2g_func
 	rbgobj_register_class
@@ -54,6 +57,7 @@ EXPORTS
 	rbgobj_register_property_setter
 	rbgobj_class_init_func
 	rbgobj_register_type
+	rbgobj_object_alloc_func
 	rbgobj_set_signal_func
 	rbgobj_get_signal_func
 	rbgobj_set_signal_call_func

data/ext/glib2/rbglib-bytes.c

@@ -0,0 +1,78 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2017  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"
+
+#define RG_TARGET_NAMESPACE cBytes
+
+#define _SELF(s) (RVAL2BOXED(s, G_TYPE_BYTES))
+
+#if GLIB_CHECK_VERSION(2, 32, 0)
+static VALUE RG_TARGET_NAMESPACE;
+
+static VALUE
+rg_initialize(int argc, VALUE *argv, VALUE self)
+{
+    GBytes *bytes;
+    VALUE rb_data;
+
+    rb_scan_args(argc, argv, "01", &rb_data);
+    if (NIL_P(rb_data)) {
+        bytes = g_bytes_new(NULL, 0);
+    } else {
+        const gchar *data = RVAL2CSTR_PTR(rb_data);
+        bytes = g_bytes_new(data, RSTRING_LEN(rb_data));
+    }
+    G_INITIALIZE(self, bytes);
+
+    return Qnil;
+}
+
+static VALUE
+rg_to_s(VALUE self)
+{
+    GBytes *bytes;
+    gconstpointer data;
+    gsize size;
+    VALUE rb_data;
+
+    bytes = _SELF(self);
+    data = g_bytes_get_data(bytes, &size);
+#  ifdef HAVE_RB_ENC_STR_NEW_STATIC
+    rb_data = rb_enc_str_new_static(data, size, rb_ascii8bit_encoding());
+    rb_iv_set(rb_data, "@bytes", self);
+#  else
+    rb_data = rb_enc_str_new(data, size, rb_ascii8bit_encoding());
+#  endif
+    return rb_data;
+}
+#endif
+
+void
+Init_glib_bytes(void)
+{
+#if GLIB_CHECK_VERSION(2, 32, 0)
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_BYTES, "Bytes", mGLib);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(to_s, 0);
+    RG_DEF_ALIAS("to_str", "to_s");
+#endif
+}

data/ext/glib2/rbglib.c

@@ -1189,4 +1189,5 @@ union       GDoubleIEEE754;
     Init_glib_matchinfo();
     Init_glib_date_time();
     Init_glib_time_zone();
+    Init_glib_bytes();
 }

data/ext/glib2/rbglib.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2002-2016  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 1
-#define RBGLIB_MICRO_VERSION 1
+#define RBGLIB_MICRO_VERSION 2
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbglib_datetime.c

@@ -69,8 +69,10 @@ rg_s_now(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
         date = g_date_time_new_now_local();
     } else if (is_utc_timezone(rb_timezone)) {
         date = g_date_time_new_now_utc();
+#if GLIB_CHECK_VERSION(2, 34, 0)
     } else if (is_timezone(rb_timezone)) {
         date = g_date_time_new_now(RVAL2GTIMEZONE(rb_timezone));
+#endif
     } else {
         rb_raise(rb_eArgError,
                  "timezone must be nil, :local, :utc or GLib::TimeZone: "
@@ -158,6 +160,7 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
                                            hour,
                                            minute,
                                            second);
+#if GLIB_CHECK_VERSION(2, 34, 0)
         } else if (is_timezone(rb_timezone)) {
             GTimeZone *timezone = NULL;
 
@@ -169,6 +172,7 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
                                        hour,
                                        minute,
                                        second);
+#endif
         } else {
             rb_raise(rb_eArgError,
                      ":timezone must be nil, :local, :utc or GLib::TimeZone: "

data/ext/glib2/rbglib_timezone.c

@@ -22,6 +22,7 @@
 #define RG_TARGET_NAMESPACE cTimeZone
 #define _SELF(s) ((GTimeZone*)RVAL2BOXED(s, G_TYPE_TIME_ZONE))
 
+#if GLIB_CHECK_VERSION(2, 34, 0)
 static VALUE
 rg_initialize(gint argc, VALUE *argv, VALUE self)
 {
@@ -68,10 +69,12 @@ rg_offset(VALUE self, VALUE rb_interval)
     gint interval = NUM2INT(rb_interval);
     return INT2NUM(g_time_zone_get_offset(_SELF(self), interval));
 }
+#endif
 
 void
 Init_glib_time_zone(void)
 {
+#if GLIB_CHECK_VERSION(2, 34, 0)
     VALUE RG_TARGET_NAMESPACE;
     RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_TIME_ZONE, "TimeZone", mGLib);
     RG_DEF_METHOD(initialize, -1);
@@ -79,4 +82,5 @@ Init_glib_time_zone(void)
     RG_DEF_SMETHOD(utc, 0);
     RG_DEF_METHOD(abbreviation, 1);
     RG_DEF_METHOD(offset, 1);
+#endif
 }

data/ext/glib2/rbgobj_boxed.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -52,8 +52,8 @@ boxed_free(boxed_holder *holder)
 
 /**********************************************************************/
 
-static VALUE
-rbgobj_boxed_s_allocate(VALUE klass)
+VALUE
+rbgobj_boxed_alloc_func(VALUE klass)
 {
     const RGObjClassInfo *cinfo = rbgobj_lookup_class(klass);
     boxed_holder *holder;
@@ -147,7 +147,7 @@ rg_initialize_copy(VALUE self, VALUE orig)
 VALUE
 rbgobj_boxed_create(VALUE klass)
 {
-    return rbgobj_boxed_s_allocate(klass);
+    return rbgobj_boxed_alloc_func(klass);
 }
 
 /**********************************************************************/
@@ -199,7 +199,7 @@ rbgobj_make_boxed_raw(gpointer p, GType gtype, VALUE klass, gint flags)
     VALUE result;
     boxed_holder *holder;
 
-    result = rbgobj_boxed_s_allocate(klass);
+    result = rbgobj_boxed_alloc_func(klass);
 
     Data_Get_Struct(result, boxed_holder, holder);
 
@@ -254,7 +254,7 @@ rbgobj_boxed_unown(VALUE boxed)
 
     if (!holder->own) {
         rb_raise(rb_eArgError,
-                 "The boxed is already unowned: %p",
+                 "The boxed is already unowned: %" PRIsVALUE,
                  boxed);
     }
 
@@ -289,7 +289,7 @@ Init_gobject_gboxed(void)
     rbgobj_register_g2r_func(G_TYPE_BOXED, boxed_to_ruby);
     rbgobj_register_r2g_func(G_TYPE_BOXED, boxed_from_ruby);
 
-    rb_define_alloc_func(RG_TARGET_NAMESPACE, (VALUE(*)_((VALUE)))rbgobj_boxed_s_allocate);
+    rb_define_alloc_func(RG_TARGET_NAMESPACE, rbgobj_boxed_alloc_func);
     rbg_define_singleton_method(RG_TARGET_NAMESPACE, "gtype", generic_s_gtype, 0);
     rbg_define_method(RG_TARGET_NAMESPACE, "gtype", generic_gtype, 0);
     RG_DEF_METHOD(initialize, 0);

data/ext/glib2/rbgobj_enums.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2004-2006  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -254,8 +254,8 @@ rg_s_values(VALUE self)
                      enum_s_values_ensure, (VALUE)args.gclass);
 }
 
-static VALUE
-enum_s_allocate(VALUE self)
+VALUE
+rbgobj_enum_alloc_func(VALUE self)
 {
     GType gtype = CLASS2GTYPE(self);
 
@@ -426,7 +426,7 @@ Init_gobject_genums(void)
     RG_DEF_SMETHOD(range, 0);
     RG_DEF_SMETHOD(values, 0);
 
-    rb_define_alloc_func(RG_TARGET_NAMESPACE, enum_s_allocate);
+    rb_define_alloc_func(RG_TARGET_NAMESPACE, rbgobj_enum_alloc_func);
 
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_METHOD(to_i, 0);

data/ext/glib2/rbgobj_flags.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2004-2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004-2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -201,8 +201,8 @@ rg_s_values(VALUE klass)
     return result;
 }
 
-static VALUE
-flags_s_allocate(VALUE self)
+VALUE
+rbgobj_flags_alloc_func(VALUE self)
 {
     GType gtype = CLASS2GTYPE(self);
 
@@ -533,7 +533,7 @@ Init_gobject_gflags(void)
     RG_DEF_SMETHOD(mask, 0);
     RG_DEF_SMETHOD(values, 0);
 
-    rb_define_alloc_func(RG_TARGET_NAMESPACE, flags_s_allocate);
+    rb_define_alloc_func(RG_TARGET_NAMESPACE, rbgobj_flags_alloc_func);
 
     RG_DEF_METHOD(initialize, -1);
 

data/ext/glib2/rbgobj_object.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2004  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2003  Masahiro Sakai
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
@@ -77,8 +77,8 @@ holder_free(gobj_holder *holder)
     xfree(holder);
 }
 
-static VALUE
-gobj_s_allocate(VALUE klass)
+VALUE
+rbgobj_object_alloc_func(VALUE klass)
 {
     gobj_holder* holder;
     VALUE result;
@@ -96,7 +96,7 @@ gobj_s_allocate(VALUE klass)
 VALUE
 rbgobj_create_object(VALUE klass)
 {
-    return gobj_s_allocate(klass);
+    return rbgobj_object_alloc_func(klass);
 }
 
 void
@@ -135,7 +135,7 @@ rbgobj_get_ruby_object_from_gobject(GObject* gobj, gboolean alloc)
     } else if (alloc) {
         VALUE obj;
 
-        obj = gobj_s_allocate(GTYPE2CLASS(G_OBJECT_TYPE(gobj)));
+        obj = rbgobj_object_alloc_func(GTYPE2CLASS(G_OBJECT_TYPE(gobj)));
         gobj = g_object_ref(gobj);
         rbgobj_gobject_initialize(obj, (gpointer)gobj);
         return obj;
@@ -960,7 +960,7 @@ Init_gobject_gobject(void)
 
     RUBY_GOBJECT_OBJ_KEY = g_quark_from_static_string("__ruby_gobject_object__");
 
-    rb_define_alloc_func(RG_TARGET_NAMESPACE, (VALUE(*)_((VALUE)))gobj_s_allocate);
+    rb_define_alloc_func(RG_TARGET_NAMESPACE, rbgobj_object_alloc_func);
     RG_DEF_SMETHOD_BANG(new, -1);
 
     rbg_define_singleton_method(RG_TARGET_NAMESPACE, "property", &gobj_s_property, 1);

data/ext/glib2/rbgobj_type.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2002-2013  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -175,6 +175,23 @@ rbgobj_lookup_class_by_gtype_without_lock(GType gtype, VALUE parent,
       cinfo->klass = rb_funcall(rb_cClass, id_new, 1, parent);
     }
 
+    switch (fundamental_type){
+      case G_TYPE_BOXED:
+        rb_define_alloc_func(cinfo->klass, rbgobj_boxed_alloc_func);
+        break;
+      case G_TYPE_OBJECT:
+        rb_define_alloc_func(cinfo->klass, rbgobj_object_alloc_func);
+        break;
+      case G_TYPE_ENUM:
+        rb_define_alloc_func(cinfo->klass, rbgobj_enum_alloc_func);
+        break;
+      case G_TYPE_FLAGS:
+        rb_define_alloc_func(cinfo->klass, rbgobj_flags_alloc_func);
+        break;
+      default:
+        break;
+    }
+
     cinfod = (RGObjClassInfoDynamic *)g_hash_table_lookup(dynamic_gtype_list,
                                                           g_type_name(gtype));
     if (cinfod){

data/ext/glib2/rbgobj_typeinterface.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011,2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2006  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -30,7 +30,7 @@ VALUE RG_TARGET_NAMESPACE;
 static VALUE
 rg_append_features(G_GNUC_UNUSED VALUE self, VALUE klass)
 {
-    if (!rb_obj_is_kind_of(klass, cInstantiatable))
+    if (!RVAL2CBOOL(rb_class_inherited_p(klass, cInstantiatable)))
         rb_raise(rb_eTypeError, "Not a subclass of GLib::Instantiatable");
     return rb_call_super(1, &klass);
 }

data/ext/glib2/rbgobject.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2003,2006  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -247,8 +247,10 @@ extern void rbgobj_register_property_setter(GType gtype, const char* prop_name,
 extern void rbgobj_register_property_getter(GType gtype, const char* prop_name, GValueToRValueFunc func);
 extern void rbgobj_class_init_func(gpointer g_class, gpointer class_data);
 extern void rbgobj_register_type(VALUE klass, VALUE type_name, GClassInitFunc class_init);
+extern VALUE rbgobj_object_alloc_func(VALUE klass);
 
 /* rbgobj_boxed.c */
+extern VALUE rbgobj_boxed_alloc_func(VALUE klass);
 extern VALUE rbgobj_boxed_create(VALUE klass); /* deprecated */
 extern gpointer rbgobj_boxed_get(VALUE obj, GType gtype);
 extern gpointer rbgobj_boxed_get_default(VALUE obj, GType gtype);
@@ -267,6 +269,8 @@ extern gint rbgobj_get_enum(VALUE obj, GType gtype);
 extern VALUE rbgobj_make_flags(guint n, GType gtype);
 extern guint rbgobj_get_flags(VALUE obj, GType gtype);
 extern void rbgobj_define_const(VALUE mod, const char *name, VALUE value);
+extern VALUE rbgobj_enum_alloc_func(VALUE klass);
+extern VALUE rbgobj_flags_alloc_func(VALUE klass);
 
 
 /* rbglib_mainloop.c */

data/ext/glib2/rbgprivate.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2007-2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007-2017  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
@@ -152,6 +152,7 @@ G_GNUC_INTERNAL void Init_glib_regex(void);
 G_GNUC_INTERNAL void Init_glib_matchinfo(void);
 G_GNUC_INTERNAL void Init_glib_date_time(void);
 G_GNUC_INTERNAL void Init_glib_time_zone(void);
+G_GNUC_INTERNAL void Init_glib_bytes(void);
 
 G_GNUC_INTERNAL void Init_gobject_convert(void);
 G_GNUC_INTERNAL void Init_gobject_gtype(void);

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

@@ -123,14 +123,16 @@ module GNOME2
           s.author                = @author
           s.email                 = @email
           s.homepage              = @homepage
-          s.licenses              = ["LGPLv2.1+"]
+          s.licenses              = ["LGPL-2.1+"]
           s.version               = version
-          extensions              = FileList["ext/#{@name}/extconf.rb"]
+          extensions              = FileList["ext/#{@name}/extconf.rb",
+                                             "dependency-check/Rakefile"]
           extensions.existing!
           s.extensions            = extensions
           s.require_paths         = ["lib"]
           files                   = FileList["ChangeLog", "README",
                                              "Rakefile", "extconf.rb",
+                                             "dependency-check/Rakefile",
                                              "lib/**/*.rb",
                                              "ext/**/depend",
                                              "ext/**/*.{c,h,def,rb}",

data/lib/mkmf-gnome2.rb

@@ -13,6 +13,7 @@ require 'English'
 require 'mkmf'
 require 'pkg-config'
 require 'glib-mkenums'
+require "native-package-installer"
 
 $CFLAGS += " #{ENV['CFLAGS']}" if ENV['CFLAGS']
 
@@ -106,7 +107,7 @@ include_path = nil
 if ENV['GTK_BASEPATH'] and /cygwin/ !~ RUBY_PLATFORM
   include_path = (ENV['GTK_BASEPATH'] + "\\INCLUDE").gsub("\\", "/")
 #  $hdrdir += " -I#{include_path} "
-  $CFLAGS += " -I#{include_path} "
+  $INCFLAGS += " -I#{include_path} "
 end
 
 def windows_platform?
@@ -123,7 +124,7 @@ def setup_windows(target_name, base_dir=nil)
       base_dir = Pathname(base_dir) if base_dir.is_a?(String)
       binary_base_dir = base_dir + "vendor" + "local"
       if binary_base_dir.exist?
-        $CFLAGS += " -I#{binary_base_dir}/include"
+        $INCFLAGS += " -I#{binary_base_dir}/include"
         pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
         PKGConfig.add_path(pkg_config_dir.to_s)
       end
@@ -147,7 +148,8 @@ def find_gem_spec(package)
 end
 
 def setup_homebrew_libffi
-  return unless package_platform == :homebrew
+  platform = NativePackageInstaller::Platform.detect
+  return unless platform.is_a?(NativePackageInstaller::Platform::Homebrew)
 
   PKGConfig.add_path("/usr/local/opt/libffi/lib/pkgconfig")
 end
@@ -463,127 +465,14 @@ def check_cairo(options={})
       add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options)
       $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
     end
-    $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo"
+    $INCFLAGS += " -I#{rcairo_source_dir}/ext/cairo"
   end
 
   PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
 end
 
-def package_platform
-  if File.exist?("/etc/debian_version")
-    :debian
-  elsif File.exist?("/etc/fedora-release")
-    :fedora
-  elsif File.exist?("/etc/redhat-release")
-    :redhat
-  elsif File.exist?("/etc/SuSE-release")
-    :suse
-  elsif File.exist?("/etc/altlinux-release")
-    :altlinux
-  elsif find_executable("pacman")
-    :arch
-  elsif find_executable("brew")
-    :homebrew
-  elsif find_executable("port")
-    :macports
-  else
-    :unknown
-  end
-end
-
-def super_user?
-  Process.uid.zero?
-end
-
-def normalize_native_package_info(native_package_info)
-  native_package_info ||= {}
-  native_package_info = native_package_info.dup
-  native_package_info[:fedora] ||= native_package_info[:redhat]
-  native_package_info[:suse] ||= native_package_info[:fedora]
-  native_package_info
-end
-
 def install_missing_native_package(native_package_info)
-  platform = package_platform
-  native_package_info = normalize_native_package_info(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, :altlinux
-    install_command = "apt-get install -V -y #{package_command_line}"
-  when :fedora, :redhat
-    install_command = "yum install -y #{package_command_line}"
-  when :suse
-    install_command = "zypper --non-interactive install #{package_command_line}"
-  when :arch
-    install_command = "pacman -S --noconfirm #{package_command_line}"
-  when :homebrew
-    need_super_user_priviledge = false
-    install_command = "brew install #{package_command_line}"
-  when :macports
-    install_command = "port install -y #{package_command_line}"
-  else
-    return false
-  end
-
-  have_priviledge = (not need_super_user_priviledge or super_user?)
-  unless have_priviledge
-    sudo = find_executable("sudo")
-  end
-
-  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_name}>: "
-      sudo_options = "-p #{Shellwords.escape(prompt)}"
-      install_command = "#{sudo} #{sudo_options} #{install_command}"
-      succeeded = xsystem(install_command)
-    else
-      succeeded = false
-      failed_to_get_super_user_priviledge = true
-    end
-  end
-
-  if failed_to_get_super_user_priviledge
-    result_message = "require super user privilege"
-  else
-    result_message = succeeded ? "succeeded" : "failed"
-  end
-  Logging.postpone do
-    "#{installing_message}#{result_message}\n"
-  end
-  message("#{result_message}\n")
-
-  error_message = nil
-  unless succeeded
-    if failed_to_get_super_user_priviledge
-      error_message = <<-EOM
-'#{package_name}' native package is required.
-run the following command as super user to install required native package:
-  \# #{install_command}
-EOM
-    else
-      error_message = <<-EOM
-failed to run '#{install_command}'.
-EOM
-    end
-  end
-  if error_message
-    message("%s", error_message)
-    Logging.message("%s", error_message)
-  end
-
-  Logging.message("--------------------\n\n")
-
-  succeeded
+  NativePackageInstaller.install(native_package_info)
 end
 
 def required_pkg_config_package(package_info, native_package_info=nil)

data/test/test-bytes.rb

@@ -0,0 +1,36 @@
+# Copyright (C) 2017  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
+
+class TestGLibBytes < Test::Unit::TestCase
+  include GLibTestUtils
+
+  setup do
+    only_glib_version(2, 32, 0)
+  end
+
+  test "#to_s" do
+    data = "Hello"
+    bytes = GLib::Bytes.new(data)
+    string = bytes.to_s
+    assert_equal([data, Encoding::ASCII_8BIT],
+                 [string, string.encoding])
+  end
+
+  test "#to_str" do
+    bytes = GLib::Bytes.new("Hello")
+    assert_equal(bytes.to_s, bytes.to_str)
+  end
+end

data/test/test-date-time.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2016-2017  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
@@ -15,6 +15,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestDateTime < Test::Unit::TestCase
+  include GLibTestUtils
+
   def test_now_local
     now = GLib::DateTime.now(:local)
     format = "%Y-%m-%d-%H-%M"
@@ -74,6 +76,7 @@ class TestDateTime < Test::Unit::TestCase
     end
 
     test "timezone: local time zone" do
+      only_glib_version(2, 34, 0)
       time = Time.now
       tz = GLib::TimeZone.local
       datetime = GLib::DateTime.new(:timezone => tz,
@@ -92,6 +95,7 @@ class TestDateTime < Test::Unit::TestCase
     end
 
     test "timezone: UTC time zone" do
+      only_glib_version(2, 34, 0)
       time = Time.now.utc
       tz = GLib::TimeZone.utc
       datetime = GLib::DateTime.new(:timezone => tz,

data/test/test-match-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2017  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
@@ -15,6 +15,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestMatchInfo < Test::Unit::TestCase
+  include GLibTestUtils
+
+  setup do
+    only_glib_version(2, 30, 0)
+  end
+
   def test_string
     regex = GLib::Regex.new("[A-Z]+")
     match_info = regex.match("abc def")

data/test/test-regex.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2017  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
@@ -15,6 +15,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestRegex < Test::Unit::TestCase
+  include GLibTestUtils
+
+  setup do
+    only_glib_version(2, 30, 0)
+  end
+
   def test_enum_match_flags
     assert_const_defined(GLib, :RegexMatchFlags)
     assert_kind_of(GLib::RegexMatchFlags, GLib::RegexMatchFlags::PARTIAL_HARD)

data/test/test-time-zone.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2016-2017  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
@@ -15,6 +15,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestTimeZone < Test::Unit::TestCase
+  include GLibTestUtils
+
+  setup do
+    only_glib_version(2, 34, 0)
+  end
+
   sub_test_case "new" do
     test "local" do
       local_1 = GLib::TimeZone.local

data/test/test-type-interface.rb

@@ -0,0 +1,38 @@
+# Copyright (C) 2017  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
+
+class TestTypeInterface < Test::Unit::TestCase
+  sub_test_case("#append_features") do
+    def test_not_instantiatable
+      plain_class = Class.new
+      assert_raise(TypeError.new("Not a subclass of GLib::Instantiatable")) do
+        plain_class.class_eval do
+          include GLib::TypePlugin
+        end
+      end
+    end
+
+    def test_instantiatable
+      gobject_class = Class.new(GLib::Object)
+      gobject_class.class_eval do
+        include GLib::TypePlugin
+      end
+      assert do
+        gobject_class.method_defined?(:use)
+      end
+    end
+  end
+end

data/test/test-variant-type.rb

@@ -111,6 +111,7 @@ class TestGLibVariantType < Test::Unit::TestCase
     end
 
     test "OBJECT_PATH_ARRAY" do
+      only_glib_version(2, 30, 0)
       assert_equal("ao", GLib::VariantType::OBJECT_PATH_ARRAY.to_s)
     end
 
@@ -123,6 +124,7 @@ class TestGLibVariantType < Test::Unit::TestCase
     end
 
     test "VARDICT" do
+      only_glib_version(2, 30, 0)
       assert_equal("a{sv}", GLib::VariantType::VARDICT.to_s)
     end
   end

data/test/test_key_file.rb

@@ -13,7 +13,7 @@
 # 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
- 
+
 require 'tempfile'
 
 class TestGLibKeyFile < Test::Unit::TestCase
@@ -35,10 +35,14 @@ class TestGLibKeyFile < Test::Unit::TestCase
     end
     if GLib.check_version?(2, 31, 2)
       assert_equal(temp.path, key_file.load_from_dirs(base_name, search_dirs))
-    else
+    elsif GLib.check_version?(2, 30, 0)
       assert_raise(GLib::KeyFileError::NotFound) do
         key_file.load_from_dirs(base_name, search_dirs)
       end
+    else
+      assert_raise(GLib::KeyFileError::Parse) do
+        key_file.load_from_dirs(base_name, search_dirs)
+      end
     end
     temp.puts(<<-EOK)
 [General]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: native-package-installer
+  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
@@ -52,6 +66,7 @@ files:
 - ext/glib2/glib-enum-types.h
 - ext/glib2/glib2.def
 - ext/glib2/rbgcompat.h
+- ext/glib2/rbglib-bytes.c
 - ext/glib2/rbglib-variant-type.c
 - ext/glib2/rbglib-variant.c
 - ext/glib2/rbglib.c
@@ -154,10 +169,12 @@ files:
 - test/glib-test-utils.rb
 - test/run-test.rb
 - test/test-binding.rb
+- test/test-bytes.rb
 - test/test-date-time.rb
 - test/test-match-info.rb
 - test/test-regex.rb
 - test/test-time-zone.rb
+- test/test-type-interface.rb
 - test/test-variant-type.rb
 - test/test-version.rb
 - test/test_enum.rb
@@ -178,7 +195,7 @@ files:
 - test/test_win32.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses:
-- LGPLv2.1+
+- LGPL-2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []