glib2 3.4.3 → 3.4.4

data/ext/glib2/rbgobj_value.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2011-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -69,7 +69,7 @@ rbgobj_gvalue_to_rvalue(const GValue* value)
       case G_TYPE_NONE:
         return Qnil;
       case G_TYPE_CHAR:
-        return CHR2FIX(g_value_get_char(value));
+        return CHR2FIX(g_value_get_schar(value));
       case G_TYPE_UCHAR:
         return INT2FIX(g_value_get_uchar(value));
       case G_TYPE_BOOLEAN:
@@ -130,14 +130,12 @@ rbgobj_gvalue_to_rvalue(const GValue* value)
                 return func(value);
             }
         }
-#if GLIB_CHECK_VERSION(2, 26, 0)
       case G_TYPE_VARIANT:
         {
             GVariant *variant = g_value_peek_pointer(value);
             rvalue = rbg_variant_to_ruby(variant);
             return rvalue;
         }
-#endif
       default:
         if (!rbgobj_convert_gvalue2rvalue(fundamental_type, value, &rvalue)) {
             GValueToRValueFunc func;
@@ -248,7 +246,7 @@ rbgobj_rvalue_to_gvalue(VALUE val, GValue* result)
       case G_TYPE_NONE:
         return;
       case G_TYPE_CHAR:
-        g_value_set_char(result, NUM2INT(val));
+        g_value_set_schar(result, NUM2INT(val));
         return;
       case G_TYPE_UCHAR:
         g_value_set_uchar(result, NUM2UINT(val));
@@ -318,11 +316,9 @@ rbgobj_rvalue_to_gvalue(VALUE val, GValue* result)
                 return;
             }
         }
-#if GLIB_CHECK_VERSION(2, 26, 0)
       case G_TYPE_VARIANT:
         g_value_set_variant(result, rbg_variant_from_ruby(val));
         break;
-#endif
       default:
         if (!rbgobj_convert_rvalue2gvalue(fundamental_type, val, result)) {
             RValueToGValueFunc func =

data/ext/glib2/rbgobj_valuetypes.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2020  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -65,63 +65,23 @@ Init_gtype_pointer(void)
 
 /**********************************************************************/
 
-static GHashTable* boxed_ruby_value_table;
-static VALUE boxed_ruby_value_table_wrapper;
-
-typedef struct {
-    VALUE obj;
-    guint ref_count;
-} boxed_ruby_value_counter;
-
-static void
-boxed_ruby_value_counter_mark(G_GNUC_UNUSED gpointer key,
-                              gpointer value,
-                              G_GNUC_UNUSED gpointer user_data)
-{
-    boxed_ruby_value_counter* counter = value;
-    if (counter->ref_count)
-        rb_gc_mark(counter->obj);
-}
-
-static void
-boxed_ruby_value_table_mark(GHashTable* table)
+static gpointer
+boxed_ruby_value_ref(gpointer boxed)
 {
-    g_hash_table_foreach(table, boxed_ruby_value_counter_mark, NULL);
-}
-
-static VALUE
-boxed_ruby_value_ref(VALUE val)
-{
-    if (!SPECIAL_CONST_P(val)){
-        boxed_ruby_value_counter* counter;
-
-        counter = g_hash_table_lookup(boxed_ruby_value_table, (gpointer)val);
-
-        if (!counter){
-            counter = g_new(boxed_ruby_value_counter, 1);
-            counter->obj       = val;
-            counter->ref_count = 1;
-            g_hash_table_insert(boxed_ruby_value_table, (gpointer)val,
-                                counter);
-        } else {
-            counter->ref_count += 1;
-        }
+    VALUE value = POINTER2RVAL(boxed);
+    if (!SPECIAL_CONST_P(value)) {
+        rbg_gc_guard(boxed, value);
     }
-    return val;
+    return boxed;
 }
 
 static void
-boxed_ruby_value_unref(VALUE val)
+boxed_ruby_value_unref(gpointer boxed)
 {
-    if (!SPECIAL_CONST_P(val)){
-        boxed_ruby_value_counter* counter;
-
-        counter = g_hash_table_lookup(boxed_ruby_value_table, (gpointer)val);
-        counter->ref_count -= 1;
-
-        if (!counter->ref_count)
-            g_hash_table_remove(boxed_ruby_value_table, (gpointer)val);
-    }
+    VALUE value = POINTER2RVAL(boxed);
+    if (SPECIAL_CONST_P(value))
+        return;
+    rbg_gc_unguard(boxed);
 }
 
 struct transform_arg {
@@ -203,13 +163,13 @@ rbgobj_ruby_value_get_type(void)
 VALUE
 g_value_get_ruby_value(const GValue* value)
 {
-    return (VALUE)g_value_get_boxed(value);
+    return POINTER2RVAL(g_value_get_boxed(value));
 }
 
 void
 g_value_set_ruby_value(GValue* value, VALUE ruby)
 {
-    g_value_set_boxed(value, (gconstpointer)ruby);
+    g_value_set_boxed(value, RVAL2POINTER(ruby));
 }
 
 static void
@@ -221,14 +181,6 @@ ruby_value_r2g(VALUE from, GValue* to)
 static void
 Init_boxed_ruby_value(void)
 {
-    boxed_ruby_value_table = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free);
-
-    boxed_ruby_value_table_wrapper =
-      Data_Wrap_Struct(rb_cData,
-                       boxed_ruby_value_table_mark, NULL,
-                       boxed_ruby_value_table);
-    rb_global_variable(&boxed_ruby_value_table_wrapper);
-
     rbgobj_register_g2r_func(RBGOBJ_TYPE_RUBY_VALUE, g_value_get_ruby_value);
     rbgobj_register_r2g_func(RBGOBJ_TYPE_RUBY_VALUE, ruby_value_r2g);
 }

data/ext/glib2/rbgobject.c

@@ -1,11 +1,10 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
- *  Copyright (C) 2003-2006  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
- *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
- *                          Daisuke Kanda,
- *                          Hiroshi Igarashi
+ *  Copyright (C) 1998-2000  Yukihiro Matsumoto,
+ *                           Daisuke Kanda,
+ *                           Hiroshi Igarashi
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -405,7 +404,6 @@ Init_gobject(void)
     Init_gobject_gvaluetypes();
     Init_gobject_gboxed();
     Init_gobject_gstrv();
-    Init_gobject_value_array();
     Init_gobject_genumflags();
     Init_gobject_gparam();
     Init_gobject_gparamspecs();

data/ext/glib2/rbgobject.h

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
- *  Copyright (C) 2003,2006  Ruby-GNOME Project Team
+ *  Copyright (C) 2003-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -206,6 +205,7 @@ extern void rbgobj_register_mark_func(GType gtype, RGMarkFunc mark);
 extern void rbgobj_register_free_func(GType gtype, RGFreeFunc free);
 extern VALUE rbgobj_cType;
 extern VALUE rbgobj_gtype_new(GType gtype);
+/* Deprecated. Use rbgobj_gtype_from_ruby() instead. */
 extern GType rbgobj_gtype_get(VALUE obj);
 
 /* rbgobj_signal.c */
@@ -292,31 +292,6 @@ extern VALUE rbgobj_enum_alloc_func(VALUE klass);
 extern VALUE rbgobj_flags_alloc_func(VALUE klass);
 
 
-/* rbglib_mainloop.c */
-#if !GLIB_CHECK_VERSION(2,30,0)
-  #define G_TYPE_MAIN_LOOP (g_main_loop_get_type())
-  extern GType g_main_loop_get_type(void);
-#endif
-
-/* rbglib_maincontext.c */
-#if !GLIB_CHECK_VERSION(2,30,0)
-  #define G_TYPE_MAIN_CONTEXT (g_main_context_get_type())
-  #define G_TYPE_SOURCE (g_source_get_type())
-  extern GType g_main_context_get_type(void);
-  extern GType g_source_get_type(void);
-#endif
-
-#if !GLIB_CHECK_VERSION(2, 36, 0)
-  #define G_TYPE_POLLFD (g_pollfd_get_type())
-  extern GType g_pollfd_get_type(void);
-#endif
-
-/* rbglib_keyfile.c */
-#if !GLIB_CHECK_VERSION(2,31,2)
-  #define G_TYPE_KEY_FILE (g_key_file_get_type())
-  extern GType g_key_file_get_type(void);
-#endif
-
 /* rbgobj_convert.c */
 typedef struct {
     GType type;

data/ext/glib2/rbgprivate.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2007-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2007-2021  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
@@ -21,12 +21,13 @@
 #pragma once
 
 /*
- * CentOS 6: GLib 2.28
  * CentOS 7: GLib 2.50
+ * CentOS 8: GLib 2.56
  * Ubuntu 16.04: GLib 2.48
- * Ubuntu 18.04: GLib 2.54
+ * Ubuntu 18.04: GLib 2.56
+ * Ubuntu 20.04: GLib 2.64
  */
-#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_28
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48
 
 #include "rbgobject.h"
 
@@ -58,7 +59,7 @@ typedef struct {
     GType type;
 } boxed_holder;
 
-G_GNUC_INTERNAL extern GStaticPrivate rg_polling_key;
+G_GNUC_INTERNAL extern GPrivate rg_polling_key;
 G_GNUC_INTERNAL extern rb_encoding *rbg_filename_encoding;
 
 extern VALUE rbgobj_cEnum;
@@ -181,7 +182,6 @@ G_GNUC_INTERNAL void Init_gobject_gvalue(void);
 G_GNUC_INTERNAL void Init_gobject_gvaluetypes(void);
 G_GNUC_INTERNAL void Init_gobject_gboxed(void);
 G_GNUC_INTERNAL void Init_gobject_gstrv(void);
-G_GNUC_INTERNAL void Init_gobject_value_array(void);
 G_GNUC_INTERNAL void Init_gobject_genumflags(void);
 G_GNUC_INTERNAL void Init_gobject_genums(void);
 G_GNUC_INTERNAL void Init_gobject_gflags(void);

data/ext/glib2/rbgutil_callback.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2007-2019  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007-2021  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
@@ -61,11 +61,11 @@ typedef struct _CallbackRequest {
     VALUE (*function)(VALUE);
     VALUE argument;
     VALUE result;
-    GMutex *done_mutex;
-    GCond *done_cond;
+    GMutex done_mutex;
+    GCond done_cond;
 } CallbackRequest;
 
-static GMutex *callback_dispatch_thread_mutex = NULL;
+static GMutex callback_dispatch_thread_mutex;
 static GAsyncQueue *callback_request_queue = NULL;
 static ID id_callback_dispatch_thread;
 static gint callback_pipe_fds[2] = {-1, -1};
@@ -84,10 +84,10 @@ static VALUE
 process_request(void *user_data)
 {
     CallbackRequest *request = user_data;
-    g_mutex_lock(request->done_mutex);
+    g_mutex_lock(&(request->done_mutex));
     request->result = rbgutil_protect(exec_callback, (VALUE)request);
-    g_cond_signal(request->done_cond);
-    g_mutex_unlock(request->done_mutex);
+    g_cond_signal(&(request->done_cond));
+    g_mutex_unlock(&(request->done_mutex));
 
     return Qnil;
 }
@@ -146,30 +146,30 @@ invoke_callback_in_ruby_thread(VALUE (*func)(VALUE), VALUE arg)
 {
     CallbackRequest request;
 
-    g_mutex_lock(callback_dispatch_thread_mutex);
+    g_mutex_lock(&callback_dispatch_thread_mutex);
     if (callback_pipe_fds[0] == -1) {
         g_error("Please call rbgutil_start_callback_dispatch_thread() "
                 "to dispatch a callback from non-ruby thread before "
                 "callbacks are requested from non-ruby thread.");
-        g_mutex_unlock(callback_dispatch_thread_mutex);
+        g_mutex_unlock(&callback_dispatch_thread_mutex);
         return Qnil;
     }
 
     request.function = func;
     request.argument = arg;
     request.result = Qnil;
-    request.done_mutex = g_mutex_new();
-    request.done_cond = g_cond_new();
+    g_mutex_init(&(request.done_mutex));
+    g_cond_init(&(request.done_cond));
 
-    g_mutex_lock(request.done_mutex);
+    g_mutex_lock(&(request.done_mutex));
     queue_callback_request(&request);
-    g_mutex_unlock(callback_dispatch_thread_mutex);
+    g_mutex_unlock(&callback_dispatch_thread_mutex);
 
-    g_cond_wait(request.done_cond, request.done_mutex);
-    g_mutex_unlock(request.done_mutex);
+    g_cond_wait(&(request.done_cond), &(request.done_mutex));
+    g_mutex_unlock(&(request.done_mutex));
 
-    g_cond_free(request.done_cond);
-    g_mutex_free(request.done_mutex);
+    g_cond_clear(&(request.done_cond));
+    g_mutex_clear(&(request.done_mutex));
 
 
     return request.result;
@@ -195,7 +195,7 @@ rbgutil_invoke_callback(VALUE (*func)(VALUE), VALUE arg)
 {
 #ifdef HAVE_NATIVETHREAD
     if (ruby_native_thread_p()) {
-        if (!GPOINTER_TO_INT(g_static_private_get(&rg_polling_key))) {
+        if (!GPOINTER_TO_INT(g_private_get(&rg_polling_key))) {
             return rbgutil_protect(func, arg);
         }
 #  ifdef HAVE_RB_THREAD_CALL_WITH_GVL
@@ -221,7 +221,7 @@ rbgutil_start_callback_dispatch_thread(void)
 #ifdef HAVE_NATIVETHREAD
     VALUE callback_dispatch_thread;
 
-    g_mutex_lock(callback_dispatch_thread_mutex);
+    g_mutex_lock(&callback_dispatch_thread_mutex);
     callback_dispatch_thread = rb_ivar_get(mGLib, id_callback_dispatch_thread);
     if (NIL_P(callback_dispatch_thread)) {
         if (pipe(callback_pipe_fds) == -1)
@@ -231,7 +231,7 @@ rbgutil_start_callback_dispatch_thread(void)
         rb_ivar_set(mGLib, id_callback_dispatch_thread,
                     callback_dispatch_thread);
     }
-    g_mutex_unlock(callback_dispatch_thread_mutex);
+    g_mutex_unlock(&callback_dispatch_thread_mutex);
 #endif
 }
 
@@ -241,13 +241,13 @@ rbgutil_stop_callback_dispatch_thread(void)
 #ifdef HAVE_NATIVETHREAD
     VALUE callback_dispatch_thread;
 
-    g_mutex_lock(callback_dispatch_thread_mutex);
+    g_mutex_lock(&callback_dispatch_thread_mutex);
     callback_dispatch_thread = rb_ivar_get(mGLib, id_callback_dispatch_thread);
     if (!NIL_P(callback_dispatch_thread)) {
         queue_callback_request(NULL);
         rb_ivar_set(mGLib, id_callback_dispatch_thread, Qnil);
     }
-    g_mutex_unlock(callback_dispatch_thread_mutex);
+    g_mutex_unlock(&callback_dispatch_thread_mutex);
 #endif
 }
 
@@ -260,13 +260,10 @@ Init_gutil_callback(void)
                               rb_eRuntimeError);
 
 #ifdef HAVE_NATIVETHREAD
-    if (!g_thread_supported())
-        g_thread_init(NULL);
-
     id_callback_dispatch_thread = rb_intern("callback_dispatch_thread");
     rb_ivar_set(mGLib, id_callback_dispatch_thread, Qnil);
 
     callback_request_queue = g_async_queue_new();
-    callback_dispatch_thread_mutex = g_mutex_new();
+    g_mutex_init(&callback_dispatch_thread_mutex);
 #endif
 }

data/lib/glib2/deprecated.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019  Ruby-GNOME Project Team
+# Copyright (C) 2018-2021  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
@@ -26,4 +26,25 @@ module GLib
     define_deprecated_const(:PRIVATE, :STATIC_NAME)
     define_deprecated_method(:private?, :static_name?)
   end
+
+  class SpawnError
+    extend GLib::Deprecatable
+    define_deprecated_const(:E2BIG, :TOO_BIG)
+  end
+
+  module Unicode
+    extend GLib::Deprecatable
+    define_deprecated_singleton_method(
+      :canonical_decomposition,
+      warn: "Use 'GLib::UniChar.decompose(char)'.") do |_, char|
+      UniChar.decompose(char)
+    end
+  end
+
+  extend GLib::Deprecatable
+  define_deprecated_singleton_method(
+    :format_size_for_display,
+    warn: "Use 'GLib.format_size(size, flags: :iec_units)'.") do |_, size|
+    format_size(size, flags: :iec_units)
+  end
 end

data/lib/mkmf-gnome.rb

@@ -28,7 +28,7 @@ end
 
 def disable_optimization_build_flag(flags)
   if gcc?
-    RbConfig.expand(flags.dup).gsub(/(^|\s)?-O\d(\s|$)?/, '\\1-O0\\2')
+    RbConfig.expand(flags.dup).gsub(/(^|\s)?-O\d(\s|$)?/, '\\1-Og\\2')
   else
     flags
   end
@@ -37,11 +37,11 @@ end
 def enable_debug_build_flag(flags)
   if gcc?
     expanded_flags = RbConfig.expand(flags.dup)
-    debug_option_pattern = /(^|\s)-g\d?(\s|$)/
+    debug_option_pattern = /(^|\s)-g(?:gdb)?\d?(\s|$)/
     if debug_option_pattern =~ expanded_flags
-      expanded_flags.gsub(debug_option_pattern, '\\1-g3\\2')
+      expanded_flags.gsub(debug_option_pattern, '\\1-ggdb3\\2')
     else
-      flags + " -g3"
+      flags + " -ggdb3"
     end
   else
     flags
@@ -198,7 +198,7 @@ def add_depend_package_path(target_name, target_source_dir, target_build_dir)
     $INCFLAGS = "-I#{target_build_dir} #{$INCFLAGS}"
   end
 
-  library_base_name = target_name.gsub(/-/, "_")
+  library_base_name = File.basename(target_source_dir).gsub(/-/, "_")
   case RUBY_PLATFORM
   when /cygwin|mingw/
     $libs << " " << File.join(target_build_dir, "#{library_base_name}.so")