glib2 3.3.8 → 3.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bd17bde266ff29b1445dd41b0a33549472b10082d3a33dd566e90200ee16ca1
-  data.tar.gz: f8ff9860d9fbe9a600546aaf66332022537f8ad5376712a6bdabc46b92903984
+  metadata.gz: 3801c55a0485d01299188fed3c0c31014218b6b7b14d89569eb382cb957e7a55
+  data.tar.gz: a6000f1cbbdfbd5002852cdccc94f1289e26475f03af643f86f34766b2fb9674
 SHA512:
-  metadata.gz: b47ecb4c251f0d6d573a25177c313c221563961ef55d89130a67ed1aabad171ec90147434c1c7aee708a448c2df43fd7704af2e95d6d82a48ad7f6b11e1163ed
-  data.tar.gz: 83491d543291507cfe2bb44a41689866dc1ae35d987f3fd3b4a8d02f3be33b81e8f2ccfd51a28d124c23dc7c7667848ec1bf5dc2374022ede9eec91256acbca5
+  metadata.gz: f6d18cfb2fbb7102f1e7e4353fa77b18f3166486645024f7153a0c1ee8219a284a7b768c6437bb777d4f10dd84e0ac72980b004c004d59c37b8ebb6739e831ff
+  data.tar.gz: 5330b0737f3f5b1363e3c75bc946717080c874bc88b51f3d450c28154481d0efa83031b7d334dc02085a834f151b2bb13fe729bce63b33ca2f7648bda19f751e

data/ext/glib2/extconf.rb

@@ -1,6 +1,18 @@
-=begin
-extconf.rb for Ruby/GLib extention library
-=end
+# Copyright (C) 2002-2019  Ruby-GNOME 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
 
 require 'pathname'
 
@@ -12,12 +24,12 @@ $LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
 module_name = "glib2"
 package_id = "gobject-2.0"
 
-require 'mkmf-gnome2'
+require "mkmf-gnome"
 
 unless required_pkg_config_package([package_id, 2, 12, 0],
                                    :alt_linux => "glib2-devel",
                                    :debian => "libglib2.0-dev",
-                                   :redhat => "glib2-devel",
+                                   :redhat => "pkgconfig(#{package_id})",
                                    :arch_linux => "glib2",
                                    :homebrew => "glib",
                                    :macports => "glib2",
@@ -75,7 +87,11 @@ include_paths = PKGConfig.cflags_only_I(package_id)
 headers = include_paths.split.inject(headers) do |result, path|
   result + Dir.glob(File.join(path.sub(/^-I/, ""), "gobject", "gsignal.h"))
 end
-glib_mkenums(enum_types_prefix, headers, "G_TYPE_", ["glib-object.h"])
+glib_mkenums(enum_types_prefix,
+             headers,
+             "G_TYPE_",
+             [],
+             preamble: "#include \"rbgprivate.h\"")
 
 $defs << "-DRUBY_GLIB2_COMPILATION"
 

data/ext/glib2/glib2.def

@@ -45,6 +45,7 @@ EXPORTS
 	rbgobj_lookup_class
 	rbgobj_lookup_class_by_gtype
 	rbgobj_gtype_to_ruby_class
+	rbgobj_gtype_from_ruby
 	rbgobj_ptr2cptr
 	rbgobj_ptr_new
 	rbgobj_make_enum
@@ -106,6 +107,8 @@ EXPORTS
         rbg_rval2strv_accept_nil
         rbg_rval2strv_dup
         rbg_rval2strv_dup_accept_nil
+        rbg_rval2filenamev
+        rbg_rval2filenamev_accept_nil
         rbg_strv2rval
         rbg_strv2rval_free
         rbg_rval2gbooleans
@@ -171,7 +174,9 @@ EXPORTS
 	rbg_gc_guard
 	rbg_gc_unguard
 
-	g_source_get_type
+	rbg_is_bytes
+	rbg_is_object
+	rbg_is_value
+
 	g_connect_flags_get_type
-	g_poll_fd_get_type
 	g_signal_flags_get_type

data/ext/glib2/rbglib-bytes.c

@@ -20,10 +20,18 @@
 
 #include "rbgprivate.h"
 
-#define RG_TARGET_NAMESPACE cBytes
+static VALUE rb_cGLibBytes;
+
+#define RG_TARGET_NAMESPACE rb_cGLibBytes
 
 #define _SELF(s) (RVAL2BOXED(s, G_TYPE_BYTES))
 
+gboolean
+rbg_is_bytes(VALUE object)
+{
+    return RVAL2CBOOL(rb_obj_is_kind_of(object, RG_TARGET_NAMESPACE));
+}
+
 #if GLIB_CHECK_VERSION(2, 32, 0)
 static VALUE RG_TARGET_NAMESPACE;
 

data/ext/glib2/rbglib-gc.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2018-2019  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2018-2019  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -53,8 +53,6 @@ static const rb_data_type_t rbg_gc_marker_type = {
     {
         gc_marker_mark,
         gc_marker_free,
-        NULL,
-        {0},
     },
     NULL,
     NULL,

data/ext/glib2/rbglib.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -323,7 +323,7 @@ rbg_filename_from_ruby(VALUE filename)
 struct rval2strv_args {
     VALUE ary;
     long n;
-    const gchar **result;
+    gchar **result;
 };
 
 static VALUE
@@ -333,28 +333,28 @@ rbg_rval2strv_body(VALUE value)
     struct rval2strv_args *args = (struct rval2strv_args *)value;
 
     for (i = 0; i < args->n; i++)
-        args->result[i] = RVAL2CSTR(RARRAY_PTR(args->ary)[i]);
+        args->result[i] = (gchar *)RVAL2CSTR(RARRAY_PTR(args->ary)[i]);
     args->result[args->n] = NULL;
 
     return Qnil;
 }
 
 static G_GNUC_NORETURN VALUE
-rbg_rval2strv_rescue(VALUE value)
+rbg_rval2strv_rescue(VALUE value, VALUE error)
 {
     g_free(((struct rval2strv_args *)value)->result);
 
-    rb_exc_raise(rb_errinfo());
+    rb_exc_raise(error);
 }
 
-const gchar **
+gchar **
 rbg_rval2strv(volatile VALUE *value, long *n)
 {
     struct rval2strv_args args;
 
     args.ary = *value = rb_ary_dup(rb_ary_to_ary(*value));
     args.n = RARRAY_LEN(args.ary);
-    args.result = g_new(const gchar *, args.n + 1);
+    args.result = g_new(gchar *, args.n + 1);
 
     rb_rescue(rbg_rval2strv_body, (VALUE)&args,
               rbg_rval2strv_rescue, (VALUE)&args);
@@ -365,7 +365,7 @@ rbg_rval2strv(volatile VALUE *value, long *n)
     return args.result;
 }
 
-const gchar **
+gchar **
 rbg_rval2strv_accept_nil(volatile VALUE *value, long *n)
 {
     if (!NIL_P(*value))
@@ -397,11 +397,11 @@ rbg_rval2strv_dup_body(VALUE value)
 }
 
 static G_GNUC_NORETURN VALUE
-rbg_rval2strv_dup_rescue(VALUE value)
+rbg_rval2strv_dup_rescue(VALUE value, VALUE error)
 {
-    g_free(((struct rval2strv_dup_args *)value)->result);
+    g_strfreev(((struct rval2strv_dup_args *)value)->result);
 
-    rb_exc_raise(rb_errinfo());
+    rb_exc_raise(error);
 }
 
 gchar **
@@ -411,7 +411,7 @@ rbg_rval2strv_dup(volatile VALUE *value, long *n)
 
     args.ary = *value = rb_ary_dup(rb_ary_to_ary(*value));
     args.n = RARRAY_LEN(args.ary);
-    args.result = g_new(gchar *, args.n + 1);
+    args.result = g_new0(gchar *, args.n + 1);
 
     rb_rescue(rbg_rval2strv_dup_body, (VALUE)&args,
               rbg_rval2strv_dup_rescue, (VALUE)&args);
@@ -434,6 +434,63 @@ rbg_rval2strv_dup_accept_nil(volatile VALUE *value, long *n)
     return NULL;
 }
 
+struct rval2filenamev_args {
+    VALUE ary;
+    long n;
+    gchar **result;
+};
+
+static VALUE
+rbg_rval2filenamev_body(VALUE value)
+{
+    long i;
+    struct rval2filenamev_args *args = (struct rval2filenamev_args *)value;
+
+    for (i = 0; i < args->n; i++)
+        args->result[i] = RVAL2CSTRFILENAME(RARRAY_PTR(args->ary)[i]);
+    args->result[args->n] = NULL;
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbg_rval2filenamev_rescue(VALUE value, VALUE error)
+{
+    g_strfreev(((struct rval2filenamev_args *)value)->result);
+
+    rb_exc_raise(error);
+}
+
+gchar **
+rbg_rval2filenamev(volatile VALUE *value, long *n)
+{
+    struct rval2filenamev_args args;
+
+    args.ary = *value = rb_ary_dup(rb_ary_to_ary(*value));
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_new0(gchar *, args.n + 1);
+
+    rb_rescue(rbg_rval2filenamev_body, (VALUE)&args,
+              rbg_rval2filenamev_rescue, (VALUE)&args);
+
+    if (n != NULL)
+        *n = args.n;
+
+    return args.result;
+}
+
+gchar **
+rbg_rval2filenamev_accept_nil(volatile VALUE *value, long *n)
+{
+    if (!NIL_P(*value))
+        return rbg_rval2filenamev(value, n);
+
+    if (n != NULL)
+        *n = 0;
+
+    return NULL;
+}
+
 VALUE
 rbg_strv2rval(const gchar **strings)
 {
@@ -490,11 +547,11 @@ rbg_rval2gbooleans_body(VALUE value)
 }
 
 static G_GNUC_NORETURN VALUE
-rbg_rval2gbooleans_rescue(VALUE value)
+rbg_rval2gbooleans_rescue(VALUE value, VALUE error)
 {
     g_free(((struct rbg_rval2gbooleans_args *)value)->result);
 
-    rb_exc_raise(rb_errinfo());
+    rb_exc_raise(error);
 }
 
 gboolean *
@@ -533,11 +590,11 @@ rbg_rval2gints_body(VALUE value)
 }
 
 static G_GNUC_NORETURN VALUE
-rbg_rval2gints_rescue(VALUE value)
+rbg_rval2gints_rescue(VALUE value, VALUE error)
 {
     g_free(((struct rbg_rval2gints_args *)value)->result);
 
-    rb_exc_raise(rb_errinfo());
+    rb_exc_raise(error);
 }
 
 gint *
@@ -576,11 +633,11 @@ rbg_rval2gint8s_body(VALUE value)
 }
 
 static G_GNUC_NORETURN VALUE
-rbg_rval2gint8s_rescue(VALUE value)
+rbg_rval2gint8s_rescue(VALUE value, VALUE error)
 {
     g_free(((struct rbg_rval2gint8s_args *)value)->result);
 
-    rb_exc_raise(rb_errinfo());
+    rb_exc_raise(error);
 }
 
 gint8 *
@@ -619,11 +676,11 @@ rbg_rval2guint8s_body(VALUE value)
 }
 
 static G_GNUC_NORETURN VALUE
-rbg_rval2guint8s_rescue(VALUE value)
+rbg_rval2guint8s_rescue(VALUE value, VALUE error)
 {
     g_free(((struct rbg_rval2guint8s_args *)value)->result);
 
-    rb_exc_raise(rb_errinfo());
+    rb_exc_raise(error);
 }
 
 guint8 *
@@ -662,11 +719,11 @@ rbg_rval2guint16s_body(VALUE value)
 }
 
 static G_GNUC_NORETURN VALUE
-rbg_rval2guint16s_rescue(VALUE value)
+rbg_rval2guint16s_rescue(VALUE value, VALUE error)
 {
     g_free(((struct rbg_rval2guint16s_args *)value)->result);
 
-    rb_exc_raise(rb_errinfo());
+    rb_exc_raise(error);
 }
 
 guint16 *
@@ -705,11 +762,11 @@ rbg_rval2guint32s_body(VALUE value)
 }
 
 static G_GNUC_NORETURN VALUE
-rbg_rval2guint32s_rescue(VALUE value)
+rbg_rval2guint32s_rescue(VALUE value, VALUE error)
 {
     g_free(((struct rbg_rval2guint32s_args *)value)->result);
 
-    rb_exc_raise(rb_errinfo());
+    rb_exc_raise(error);
 }
 
 guint32 *
@@ -748,11 +805,11 @@ rbg_rval2gdoubles_body(VALUE value)
 }
 
 static G_GNUC_NORETURN VALUE
-rbg_rval2gdoubles_rescue(VALUE value)
+rbg_rval2gdoubles_rescue(VALUE value, VALUE error)
 {
     g_free(((struct rbg_rval2gdoubles_args *)value)->result);
 
-    rb_exc_raise(rb_errinfo());
+    rb_exc_raise(error);
 }
 
 gdouble *

data/ext/glib2/rbglib.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2002-2019  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2019  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -27,16 +27,13 @@
 #include "rbglibdeprecated.h"
 #include "rbglib2conversions.h"
 
-#ifndef __RBGLIB_H__
-#define __RBGLIB_H__
+#pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 3
-#define RBGLIB_MICRO_VERSION 8
+#define RBGLIB_MICRO_VERSION 9
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC
@@ -195,10 +192,12 @@ VALUE rbg_filename_to_ruby(const gchar *filename);
 extern VALUE rbg_filename_to_ruby_free(gchar *filename);
 extern gchar *rbg_filename_from_ruby(VALUE filename);
 
-const gchar **rbg_rval2strv(volatile VALUE *value, long *n);
-const gchar **rbg_rval2strv_accept_nil(volatile VALUE *value, long *n);
+gchar **rbg_rval2strv(volatile VALUE *value, long *n);
+gchar **rbg_rval2strv_accept_nil(volatile VALUE *value, long *n);
 gchar **rbg_rval2strv_dup(volatile VALUE *value, long *n);
 gchar **rbg_rval2strv_dup_accept_nil(volatile VALUE *value, long *n);
+gchar **rbg_rval2filenamev(volatile VALUE *value, long *n);
+gchar **rbg_rval2filenamev_accept_nil(volatile VALUE *value, long *n);
 VALUE rbg_strv2rval(const gchar **strings);
 VALUE rbg_strv2rval_free(gchar **strings);
 
@@ -234,12 +233,13 @@ extern GVariant *rbg_variant_from_ruby(VALUE rb_variant);
 
 extern GVariantType *rbg_variant_type_from_ruby(VALUE rb_variant_type);
 
-
 extern void rbg_gc_guard(gpointer key, VALUE rb_object);
 extern void rbg_gc_unguard(gpointer key);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
-#endif /* __RBGLIB_H__ */
+/* predicates */
+extern gboolean rbg_is_bytes(VALUE object);
+extern gboolean rbg_is_object(VALUE object);
+extern gboolean rbg_is_value(VALUE object);
+
+G_END_DECLS

data/ext/glib2/rbglib2conversions.h

@@ -33,8 +33,8 @@
 #define GMAINCONTEXT2RVAL(o)               (BOXED2RVAL(o, G_TYPE_MAIN_CONTEXT))
 #define RVAL2GMAINLOOP(o)                  ((GMainLoop*)RVAL2BOXED(o, G_TYPE_MAIN_LOOP))
 #define GMAINLOOP2RVAL(o)                  (BOXED2RVAL(o, G_TYPE_MAIN_LOOP))
-#define RVAL2GPOLLFD(o)                    ((GPollFD*)RVAL2BOXED(o, G_TYPE_POLL_FD))
-#define GPOLLFD2RVAL(o)                    (BOXED2RVAL(o, G_TYPE_POLL_FD))
+#define RVAL2GPOLLFD(o)                    ((GPollFD*)RVAL2BOXED(o, G_TYPE_POLLFD))
+#define GPOLLFD2RVAL(o)                    (BOXED2RVAL(o, G_TYPE_POLLFD))
 #define RVAL2GSOURCE(o)                    ((GSource*)RVAL2BOXED(o, G_TYPE_SOURCE))
 #define GSOURCE2RVAL(o)                    (BOXED2RVAL(o, G_TYPE_SOURCE))
 #define RVAL2GTIMER(o)                     ((GTimer*)RVAL2BOXED(o, G_TYPE_TIMER))

data/ext/glib2/rbglib_iochannel.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -503,17 +503,20 @@ rg_close(gint argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-rg_create_watch(VALUE self, VALUE condition)
+rg_create_watch(int argc, VALUE *argv, VALUE self)
 {
+    VALUE rb_condition;
+    VALUE rb_block;
     VALUE rb_source;
 
-    rb_source = BOXED2RVAL(g_io_create_watch(_SELF(self), NUM2INT(condition)),
+    rb_scan_args(argc, argv, "1&", &rb_condition, &rb_block);
+    rb_source = BOXED2RVAL(g_io_create_watch(_SELF(self), NUM2INT(rb_condition)),
                            G_TYPE_SOURCE);
     rb_extend_object(rb_source, rb_mIOChannelSource);
-    if (rb_block_given_p()) {
+    if (!NIL_P(rb_block)) {
         ID id_set_callback;
         CONST_ID(id_set_callback, "set_callback");
-        rb_funcall(rb_source, id_set_callback, 0);
+        rb_funcall_with_block(rb_source, id_set_callback, 0, NULL, rb_block);
     }
     return rb_source;
 }
@@ -545,15 +548,15 @@ guint       g_io_add_watch_full             (GIOChannel *channel,
 */
 
 static VALUE
-rg_io_channel_source_set_callback(VALUE self)
+rg_io_channel_source_set_callback(int argc, VALUE *argv, VALUE self)
 {
-    VALUE callback;
+    VALUE rb_callback;
 
-    callback = rb_block_proc();
-    G_RELATIVE(self, callback);
+    rb_scan_args(argc, argv, "&", &rb_callback);
+    G_RELATIVE(self, rb_callback);
     g_source_set_callback(RVAL2BOXED(self, G_TYPE_SOURCE),
                           (GSourceFunc)io_func,
-                          (gpointer)callback,
+                          (gpointer)rb_callback,
                           (GDestroyNotify)NULL);
     return self;
 }
@@ -810,7 +813,7 @@ Init_glib_io_channel(void)
     RG_DEF_METHOD(seek, -1);
     RG_DEF_METHOD(set_pos, 1);
     RG_DEF_METHOD(close, -1);
-    RG_DEF_METHOD(create_watch, 1);
+    RG_DEF_METHOD(create_watch, -1);
     RG_DEF_METHOD(add_watch, 1);
     RG_DEF_METHOD(buffer_size, 0);
     RG_DEF_METHOD(set_buffer_size, 1);
@@ -852,5 +855,5 @@ Init_glib_io_channel(void)
     rb_define_method(rb_mIOChannelSource,
                      "set_callback",
                      rg_io_channel_source_set_callback,
-                     0);
+                     -1);
 }