glib2 3.1.1-x86-mingw32 → 3.1.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f5bd3c313946391f89b67d5b1abe326257b0c0
-  data.tar.gz: 4f4de89c485d946f3016c37ea48c1ac9c5360877
+  metadata.gz: 78c5768d0162d3049e768ff2cf9ea32b0a8fb9f9
+  data.tar.gz: e910e41a84e7118636d5842f7e073266a011a196
 SHA512:
-  metadata.gz: 0de43fa7cdd8ff369a5a6fc3519498b8ac8574adc3c28ff12d6dd59342edbedd02cba71f44b7fa6b494080cea5346ba231544872ede2870b4e0c6eb79a987b9d
-  data.tar.gz: feb187f9bada12f36573d6dd385799707cf0c3cd4affa9453e2fc28c7b856eb8206b05634d1658cda4792726d9076643fcd857e470d6ff671139bb6b5d3f4aa4
+  metadata.gz: c78814c229424c4d754bf3b8c551602b72a9fb92e7153bd245891403bdf6978ef07ef7b90a6651ded890a74bae882a738b674dadbe5e47cc9c3396dbd2b5c846
+  data.tar.gz: 9787350a69a436ea643b88ebc9a3393c16a6d5e86edf30db28dafec4adf807cf7ee3f9f0673f2200a8e8a4f89b672a603ad9ea87c1b64d28626d8fb7e3eecb27

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);
 }