glib2 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f1f3a2a20d2c831632e5d9a6e437da57c3659d1818084bc1e232d6cfb52c49a
-  data.tar.gz: ba0d64602875b282d42aeacf73c90dc8cfd308b5cad0d7c2ba38c0ecba35b79b
+  metadata.gz: 1f7cf87b441a08ee8539b6fe8047ac17ccbddf01192d9ebe639e61d4502b8db6
+  data.tar.gz: 2a2c83a5a84822a3407c4314f50fa1d813e86aa011b8505654e04f270bfa5af9
 SHA512:
-  metadata.gz: 0b83b96292c0e38a7d5b48e238527c8ba8085500023cb1fa5608b8ea6fa6ff5036d5394ee8f29a79d53e37e56763e041abb4140eb733e512e2d54bd88943ae63
-  data.tar.gz: 6214cff6429d9e9596ee49df06c066f932b7c043edff4a95b054acfae06b46f645f1d85ac3b2036580dbfcbd55358a6178899a3d82ce466ebb18705d8411eb39
+  metadata.gz: 628b45c99d217e5d5690e442b58332b9496c5d7fa8ec1e28305eb064a429ba5eb545ffffb4c0eba3b2cd16065fa3c92c11dc48451f5dbceca424300f2674f4de
+  data.tar.gz: 37ad935316cec032ccdfddafb295a34c07e6dad0f8e9826e0af0cc3d829bffd2a2d9b945bb562af2cf6ad70a95b78245121018026194260764783947b76634ec

data/ext/glib2/extconf.rb

@@ -14,8 +14,6 @@ package_id = "gobject-2.0"
 
 require 'mkmf-gnome2'
 
-setup_windows(module_name, base_dir)
-
 unless required_pkg_config_package([package_id, 2, 12, 0],
                                    :alt_linux => "glib2-devel",
                                    :debian => "libglib2.0-dev",
@@ -65,12 +63,15 @@ ignore_headers = [
 unless windows_platform?
   ignore_headers << "gwin32.h"
 end
+if PKGConfig.check_version?(package_id, 2, 60, 0)
+  ignore_headers << "gunicode.h"
+end
 headers = include_paths.split.inject([]) do |result, path|
   result + Dir.glob(File.join(path.sub(/^-I/, ""), "glib", "*.h"))
 end.reject do |file|
   ignore_headers.include?(File.basename(file))
 end
-include_paths = PKGConfig.cflags_only_I("gobject-2.0")
+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

data/ext/glib2/rbglib-gc.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2018-2019  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
@@ -54,6 +54,7 @@ static const rb_data_type_t rbg_gc_marker_type = {
         gc_marker_mark,
         gc_marker_free,
         NULL,
+        {0},
     },
     NULL,
     NULL,

data/ext/glib2/rbglib.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 3
-#define RBGLIB_MICRO_VERSION 2
+#define RBGLIB_MICRO_VERSION 3
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC
@@ -155,7 +155,7 @@ extern "C" {
 #define G_DEF_ERROR2(domain, name, module, parent) \
     rbgerr_define_gerror(domain, name, module, parent, G_TYPE_INVALID)
 
-#if defined(G_PLATFORM_WIN32) && !defined(RUBY_GLIB2_STATIC_COMPILATION)
+#ifdef G_PLATFORM_WIN32
 #  ifdef RUBY_GLIB2_COMPILATION
 #    define RUBY_GLIB2_VAR __declspec(dllexport)
 #  else

data/ext/glib2/rbglib_iochannel.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -247,19 +247,20 @@ rg_readline(gint argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "01", &line_term);
 
-    if (! NIL_P(line_term)){
+    if (!NIL_P(line_term)) {
         StringValue(line_term);
         old_line_term = g_io_channel_get_line_term(_SELF(self), &old_line_term_len);
 
-        g_io_channel_set_line_term(_SELF(self), RVAL2CSTR(line_term),
-                                   RSTRING_LEN(line_term));   
+        g_io_channel_set_line_term(_SELF(self),
+                                   StringValuePtr(line_term),
+                                   (gint)RSTRING_LEN(line_term));
     }
 
     status = g_io_channel_read_line(_SELF(self), &str, NULL, NULL, &err);
 
-    if (! NIL_P(line_term)){
+    if (!NIL_P(line_term)) {
         g_io_channel_set_line_term(_SELF(self), old_line_term, old_line_term_len);
-    }   
+    }
 
     ioc_error(status, err);
 
@@ -282,19 +283,20 @@ rg_gets(gint argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "01", &line_term);
 
-    if (! NIL_P(line_term)){
+    if (!NIL_P(line_term)) {
         StringValue(line_term);
 
         old_line_term = g_io_channel_get_line_term(_SELF(self), &old_line_term_len);
-        g_io_channel_set_line_term(_SELF(self), RVAL2CSTR(line_term),
-                                   RSTRING_LEN(line_term));   
+        g_io_channel_set_line_term(_SELF(self),
+                                   StringValuePtr(line_term),
+                                   (gint)RSTRING_LEN(line_term));
     }
 
     status = g_io_channel_read_line(_SELF(self), &str, NULL, NULL, &err);
 
-    if (! NIL_P(line_term)){
+    if (! NIL_P(line_term)) {
         g_io_channel_set_line_term(_SELF(self), old_line_term, old_line_term_len);
-    }   
+    }
 
     if (status == G_IO_STATUS_EOF){
         ret = Qnil;
@@ -317,8 +319,9 @@ ioc_set_line_term(VALUE args)
 
     if (doit == Qtrue){
         StringValue(line_term);
-        g_io_channel_set_line_term(_SELF(self), RVAL2CSTR(line_term),
-                                   RSTRING_LEN(line_term));  
+        g_io_channel_set_line_term(_SELF(self),
+                                   StringValuePtr(line_term),
+                                   (gint)RSTRING_LEN(line_term));
     }
     return self;
 }
@@ -345,8 +348,9 @@ rg_each(gint argc, VALUE *argv, VALUE self)
         StringValue(line_term);
 
         old_line_term = g_io_channel_get_line_term(channel, &old_line_term_len);
-        g_io_channel_set_line_term(channel, RVAL2CSTR(line_term),
-                                   RSTRING_LEN(line_term));
+        g_io_channel_set_line_term(channel,
+                                   StringValuePtr(line_term),
+                                   (gint)RSTRING_LEN(line_term));
     }
 
     while (TRUE) {

data/ext/glib2/rbglib_pollfd.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -63,7 +63,7 @@ rg_initialize(VALUE self, VALUE fd, VALUE events, VALUE revents)
 static VALUE
 rg_set_fd(VALUE self, VALUE fd)
 {
-    _SELF(self)->fd = fd;
+    _SELF(self)->fd = NUM2INT(fd);
     return self;
 }
 static VALUE

data/ext/glib2/rbglib_regex.c

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-2019  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
@@ -428,7 +428,8 @@ rg_replace(gint argc, VALUE *argv, VALUE self)
 static VALUE
 rg_s_escape_string(G_GNUC_UNUSED VALUE self, VALUE string)
 {
-    return CSTR2RVAL(g_regex_escape_string(RVAL2CSTR(string), RSTRING_LEN(string)));
+    return CSTR2RVAL(g_regex_escape_string(RVAL2CSTR(string),
+                                           (gint)RSTRING_LEN(string)));
 }
 
 static VALUE

data/ext/glib2/rbglib_ucs4.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2006  Kouhei Sutou
  *
  *  This library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ rg_s_to_utf16(G_GNUC_UNUSED VALUE self, VALUE rb_ucs4)
     glong len, items_written;
     GError *error = NULL;
 
-    ucs4 = (gunichar *)StringValuePtr(rb_ucs4);
+    ucs4 = (gunichar *)(void *)StringValuePtr(rb_ucs4);
     len = RSTRING_LEN(rb_ucs4) / sizeof(*ucs4);
 
     utf16 = g_ucs4_to_utf16(ucs4, len, NULL, &items_written, &error);
@@ -56,7 +56,7 @@ rg_s_to_utf8(G_GNUC_UNUSED VALUE self, VALUE rb_ucs4)
     glong len, items_written;
     GError *error = NULL;
 
-    ucs4 = (gunichar *)StringValuePtr(rb_ucs4);
+    ucs4 = (gunichar *)(void *)StringValuePtr(rb_ucs4);
     len = RSTRING_LEN(rb_ucs4) / sizeof(*ucs4);
 
     utf8 = g_ucs4_to_utf8(ucs4, len, NULL, &items_written, &error);

data/ext/glib2/rbglib_unicode.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2006  Kouhei Sutou
  *
  *  This library is free software; you can redistribute it and/or
@@ -38,11 +38,11 @@ rg_s_canonical_ordering(G_GNUC_UNUSED VALUE self, VALUE rb_ucs4)
     VALUE normalized_ucs4;
     gchar *original_str;
     gunichar *ucs4;
-    gint len;
+    long len;
 
     original_str = StringValuePtr(rb_ucs4);
     len = RSTRING_LEN(rb_ucs4);
-    ucs4 = g_memdup(original_str, len);
+    ucs4 = g_memdup(original_str, (guint)len);
     g_unicode_canonical_ordering(ucs4, len);
     normalized_ucs4 = CSTR2RVAL_LEN_UCS4((const char *)ucs4, len);
     g_free(ucs4);

data/ext/glib2/rbglib_utf16.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2006  Kouhei Sutou
  *
  *  This library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ rg_s_to_ucs4(G_GNUC_UNUSED VALUE self, VALUE rb_utf16)
     glong len, items_written;
     GError *error = NULL;
 
-    utf16 = (gunichar2 *)StringValueCStr(rb_utf16);
+    utf16 = (gunichar2 *)(void *)StringValueCStr(rb_utf16);
     len = RSTRING_LEN(rb_utf16) / sizeof(*utf16);
 
     ucs4 = g_utf16_to_ucs4(utf16, len, NULL, &items_written, &error);
@@ -55,7 +55,7 @@ rg_s_to_utf8(G_GNUC_UNUSED VALUE self, VALUE rb_utf16)
     glong len, items_written;
     GError *error = NULL;
 
-    utf16 = (gunichar2 *)StringValueCStr(rb_utf16);
+    utf16 = (gunichar2 *)(void *)StringValueCStr(rb_utf16);
     len = RSTRING_LEN(rb_utf16) / sizeof(*utf16);
 
     utf8 = g_utf16_to_utf8(utf16, len, NULL, &items_written, &error);

data/ext/glib2/rbglib_utils.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2004  Ruby-GNOME2 Project Team
  *  Copyright (C) 2004  Pascal Terjan
  *
@@ -243,7 +243,7 @@ void        g_atexit                        (GVoidFunc func);
 static VALUE
 rg_s_parse_debug_string(G_GNUC_UNUSED VALUE self, VALUE string, VALUE keys)
 {
-    gint i, nkeys;
+    long i, nkeys;
     VALUE ary;
     GDebugKey* gkeys;
 
@@ -256,7 +256,7 @@ rg_s_parse_debug_string(G_GNUC_UNUSED VALUE self, VALUE string, VALUE keys)
         gkeys[i].value = NUM2UINT(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]);
     }
 
-    return UINT2NUM(g_parse_debug_string(RVAL2CSTR(string), gkeys, nkeys));
+    return UINT2NUM(g_parse_debug_string(RVAL2CSTR(string), gkeys, (guint)nkeys));
 }
 
 /*

data/ext/glib2/rbgobj_boxed.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -58,6 +58,7 @@ static const rb_data_type_t rg_glib_boxed_type = {
         boxed_mark,
         boxed_free,
         NULL,
+        {0},
     },
     NULL,
     NULL,

data/ext/glib2/rbgobj_enums.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2004-2006  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -78,7 +78,7 @@ rg_enum_add_constants(VALUE mod, GType enum_type, const gchar *strip_prefix)
 {
     GEnumClass *gclass;
     guint i;
-    int prefix_len = strlen(strip_prefix);
+    size_t prefix_len = strlen(strip_prefix);
 
     gclass = G_ENUM_CLASS(g_type_class_ref(enum_type));
 
@@ -120,6 +120,7 @@ static const rb_data_type_t rg_glib_enum_type = {
         NULL,
         enum_free,
         NULL,
+        {0},
     },
     NULL,
     NULL,

data/ext/glib2/rbgobj_flags.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2004-2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ rg_flags_add_constants(VALUE mod, GType flags_type, const gchar *strip_prefix)
 {
     GFlagsClass *gclass;
     guint i;
-    int prefix_len = strlen(strip_prefix);
+    size_t prefix_len = strlen(strip_prefix);
 
     gclass = G_FLAGS_CLASS(g_type_class_ref(flags_type));
 
@@ -81,6 +81,7 @@ static const rb_data_type_t rg_glib_flags_type = {
         NULL,
         flags_free,
         NULL,
+        {0},
     },
     NULL,
     NULL,
@@ -273,7 +274,7 @@ resolve_flags_value(VALUE klass, GFlagsClass *gclass, VALUE flag_or_flags)
     }
     case RUBY_T_ARRAY:
     {
-        int i, n;
+        long i, n;
         n = RARRAY_LEN(flag_or_flags);
         for (i = 0; i < n; i++) {
             value |= resolve_flags_value(klass,

data/ext/glib2/rbgobj_object.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2004  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2003  Masahiro Sakai
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
@@ -52,7 +52,9 @@ weak_notify(gpointer data, G_GNUC_UNUSED GObject *where_the_object_was)
 }
 
 static void
-holder_relatives_mark(gpointer key, gpointer value, gpointer user_data)
+holder_relatives_mark(G_GNUC_UNUSED gpointer key,
+                      gpointer value,
+                      G_GNUC_UNUSED gpointer user_data)
 {
     VALUE rb_relative = (VALUE)value;
     rb_gc_mark(rb_relative);
@@ -99,6 +101,7 @@ static const rb_data_type_t rg_glib_object_type = {
         holder_mark,
         holder_free,
         NULL,
+        {0},
     },
     NULL,
     NULL,
@@ -135,7 +138,7 @@ rbgobj_object_remove_relative(VALUE rb_gobject, VALUE rb_relative)
 }
 
 static gboolean
-rbgobj_object_remove_relatives_body(gpointer key,
+rbgobj_object_remove_relatives_body(G_GNUC_UNUSED gpointer key,
                                     gpointer value,
                                     gpointer user_data)
 {
@@ -381,10 +384,10 @@ rbgobj_gobject_new(GType gtype, VALUE params_hash)
     if (NIL_P(params_hash)) {
         result = g_object_newv(gtype, 0, NULL);
     } else {
-        size_t param_size;
+        guint param_size;
         struct param_setup_arg arg;
 
-        param_size = NUM2INT(rb_funcall(params_hash, rb_intern("length"), 0));
+        param_size = NUM2UINT(rb_funcall(params_hash, rb_intern("length"), 0));
 
         arg.param_size = param_size;
         arg.gclass = G_OBJECT_CLASS(g_type_class_ref(gtype));

data/ext/glib2/rbgobj_param.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -59,6 +59,7 @@ static const rb_data_type_t rg_glib_param_type = {
         pspec_mark,
         pspec_free,
         NULL,
+        {0},
     },
     NULL,
     NULL,

data/ext/glib2/rbgobj_signal.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2004  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -37,6 +37,7 @@ static const rb_data_type_t rg_glib_signal_type = {
         NULL,
         NULL,
         NULL,
+        {0},
     },
     NULL,
     NULL,
@@ -252,7 +253,7 @@ gobj_s_define_signal(int argc, VALUE* argv, VALUE self)
                            NIL_P(accumulator) ? NULL : (gpointer)accumulator,
                            NULL, /* c_marshaller */
                            return_type,
-                           n_params,
+                           (guint)n_params,
                            param_types);
 
     g_free(param_types);
@@ -833,7 +834,7 @@ g_signal_add_emission_hook_closure (guint     signal_id,
                                     GQuark    detail,
                                     GClosure* closure)
 {
-    guint hook_id;
+    gulong hook_id;
     g_closure_ref(closure);
     g_closure_sink(closure);
     hook_id = g_signal_add_emission_hook(signal_id, detail,
@@ -847,7 +848,7 @@ rg_add_emission_hook(int argc, VALUE* argv, VALUE self)
 {
     GSignalQuery *query;
     VALUE proc;
-    guint hook_id;
+    gulong hook_id;
     GQuark detail = 0;
     GClosure* closure;