glib2 4.3.7 → 4.3.8

data/ext/glib2/rbglib_maincontext.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2025  Ruby-GNOME Project Team
+ *  Copyright (C) 2011-2026  Ruby-GNOME Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -21,10 +21,6 @@
 
 #include "rbgprivate.h"
 
-#ifdef HAVE_RUBY_THREAD_H
-#  include <ruby/thread.h>
-#endif
-
 GPrivate rg_polling_key = G_PRIVATE_INIT(NULL);
 
 /*
@@ -59,7 +55,6 @@ rg_poll_in_blocking_raw(PollInfo *info)
     info->result = default_poll_func(info->ufds, info->nfsd, info->timeout);
 }
 
-#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
 static void *
 rg_poll_in_blocking(void *data)
 {
@@ -67,15 +62,6 @@ rg_poll_in_blocking(void *data)
     rg_poll_in_blocking_raw(info);
     return NULL;
 }
-#else
-static VALUE
-rg_poll_in_blocking(void *data)
-{
-    PollInfo *info = data;
-    rg_poll_in_blocking_raw(info);
-    return Qnil;
-}
-#endif
 
 static gint
 rg_poll(GPollFD *ufds, guint nfsd, gint timeout)
@@ -89,13 +75,8 @@ rg_poll(GPollFD *ufds, guint nfsd, gint timeout)
 
     g_private_set(&rg_polling_key, GINT_TO_POINTER(TRUE));
     if (g_thread_self() == main_thread) {
-#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
         rb_thread_call_without_gvl(rg_poll_in_blocking, &info,
                                    RUBY_UBF_IO, NULL);
-#else
-        rb_thread_blocking_region(rg_poll_in_blocking, &info,
-                                  RUBY_UBF_IO, NULL);
-#endif
     } else {
         rg_poll_in_blocking_raw(&info);
     }

data/ext/glib2/rbgobject.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2003-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2003-2026  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *  Copyright (C) 1998-2000  Yukihiro Matsumoto,
  *                           Daisuke Kanda,
@@ -25,6 +25,10 @@
 #include "rbgprivate.h"
 #include <ctype.h>
 
+#ifdef HAVE_GIREPOSITORY
+#  include "rbgi-private.h"
+#endif
+
 static ID id_relatives;
 static ID id_delete;
 static ID id_module_eval;

data/ext/glib2/rbgobject.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2003-2025  Ruby-GNOME Project Team
+ *  Copyright (C) 2003-2026  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -23,6 +23,7 @@
 
 #include <glib-object.h>
 #include <ruby.h>
+#include <ruby/thread.h>
 #include "rbglib.h"
 #include "rbgutil.h"
 

data/ext/glib2/rbgutil.h

@@ -117,6 +117,7 @@ extern void rbgutil_set_properties(VALUE self, VALUE hash);
 extern VALUE rbgutil_protect(VALUE (*proc) (VALUE), VALUE data);
 extern void rbgutil_on_callback_error(VALUE error);
 extern VALUE rbgutil_invoke_callback(VALUE (*func)(VALUE), VALUE arg);
+extern void rbgutil_invoke_callback_async(VALUE (*func)(VALUE), VALUE arg);
 extern void rbgutil_start_callback_dispatch_thread(void);
 extern void rbgutil_stop_callback_dispatch_thread(void);
 

data/ext/glib2/rbgutil_callback.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2007-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2007-2026  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
@@ -33,10 +33,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifndef HAVE_RUBY_NATIVE_THREAD_P
-#  define ruby_native_thread_p() is_ruby_native_thread()
-#endif
-
 static VALUE rbgutil_eGLibCallbackNotInitializedError;
 static ID id_exit_application;
 
@@ -61,12 +57,14 @@ rbgutil_on_callback_error(VALUE error)
 
 /**********************************************************************/
 
-#ifdef HAVE_NATIVETHREAD
-
 typedef struct _CallbackRequest {
     VALUE (*function)(VALUE);
     VALUE argument;
     VALUE result;
+    /* An async request is heap-allocated by the requester, doesn't
+     * report its result and is freed by the dispatch thread. done_mutex
+     * and done_cond are unused for it. */
+    gboolean async;
     GMutex done_mutex;
     GCond done_cond;
 } CallbackRequest;
@@ -79,6 +77,25 @@ static gint callback_pipe_fds[2] = {-1, -1};
 #define CALLBACK_PIPE_READY_MESSAGE "R"
 #define CALLBACK_PIPE_READY_MESSAGE_SIZE 1
 
+static CallbackRequest *
+callback_request_new_async(VALUE (*func)(VALUE), VALUE arg)
+{
+    CallbackRequest *request;
+
+    request = g_new0(CallbackRequest, 1);
+    request->function = func;
+    request->argument = arg;
+    request->result = Qnil;
+    request->async = TRUE;
+    return request;
+}
+
+static void
+callback_request_free(CallbackRequest *request)
+{
+    g_free(request);
+}
+
 static VALUE
 exec_callback(VALUE data)
 {
@@ -119,7 +136,14 @@ mainloop(G_GNUC_UNUSED void *user_data)
         if (!request)
             break;
 
-        rb_thread_create(process_request, request);
+        if (request->async) {
+            /* Async callbacks must be fast because they block the
+             * dispatch thread. */
+            rbgutil_protect(exec_callback, (VALUE)request);
+            callback_request_free(request);
+        } else {
+            rb_thread_create(process_request, request);
+        }
     }
 
     close(callback_pipe_fds[0]);
@@ -155,8 +179,8 @@ invoke_callback_in_ruby_thread(VALUE (*func)(VALUE), VALUE arg)
     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.");
+                "to dispatch a callback from non-Ruby thread before "
+                "callbacks are requested from non-Ruby thread.");
         g_mutex_unlock(&callback_dispatch_thread_mutex);
         return Qnil;
     }
@@ -164,6 +188,7 @@ invoke_callback_in_ruby_thread(VALUE (*func)(VALUE), VALUE arg)
     request.function = func;
     request.argument = arg;
     request.result = Qnil;
+    request.async = FALSE;
     g_mutex_init(&(request.done_mutex));
     g_cond_init(&(request.done_cond));
 
@@ -181,8 +206,21 @@ invoke_callback_in_ruby_thread(VALUE (*func)(VALUE), VALUE arg)
     return request.result;
 }
 
-#ifdef HAVE_RB_THREAD_CALL_WITH_GVL
-extern void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
+static void
+invoke_callback_async_in_ruby_thread(VALUE (*func)(VALUE), VALUE arg)
+{
+    g_mutex_lock(&callback_dispatch_thread_mutex);
+    if (callback_pipe_fds[0] == -1) {
+        g_mutex_unlock(&callback_dispatch_thread_mutex);
+        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.");
+        return;
+    }
+
+    queue_callback_request(callback_request_new_async(func, arg));
+    g_mutex_unlock(&callback_dispatch_thread_mutex);
+}
 
 static void *
 invoke_callback_with_gvl(void *arg)
@@ -190,33 +228,50 @@ invoke_callback_with_gvl(void *arg)
     CallbackRequest *req = (CallbackRequest*)arg;
     return (void *)rbgutil_protect(req->function, req->argument);
 }
-#endif
-
-#endif
 
 /**********************************************************************/
 
 VALUE
 rbgutil_invoke_callback(VALUE (*func)(VALUE), VALUE arg)
 {
-#ifdef HAVE_NATIVETHREAD
     if (ruby_native_thread_p()) {
-        if (!GPOINTER_TO_INT(g_private_get(&rg_polling_key))) {
-            return rbgutil_protect(func, arg);
-        }
-#  ifdef HAVE_RB_THREAD_CALL_WITH_GVL
-        {
+        if (GPOINTER_TO_INT(g_private_get(&rg_polling_key))) {
             CallbackRequest req;
             req.function = func;
             req.argument = arg;
             return (VALUE)rb_thread_call_with_gvl(invoke_callback_with_gvl, &req);
+        } else {
+            return rbgutil_protect(func, arg);
         }
-#  endif
     } else {
         return invoke_callback_in_ruby_thread(func, arg);
     }
-#endif
-    return rbgutil_protect(func, arg);
+}
+
+/*
+ * Fire-and-forget variant of rbgutil_invoke_callback().
+ *
+ * When this is called from a non-Ruby thread, this doesn't wait for
+ * the callback result; the callback is run later in the callback
+ * dispatch thread. Use this for callbacks that are invoked frequently
+ * from non-Ruby threads and don't need to report a result, such as
+ * GDestroyNotify. See also rbgutil_invoke_callback().
+ */
+void
+rbgutil_invoke_callback_async(VALUE (*func)(VALUE), VALUE arg)
+{
+    if (ruby_native_thread_p()) {
+        if (GPOINTER_TO_INT(g_private_get(&rg_polling_key))) {
+            CallbackRequest request;
+            request.function = func;
+            request.argument = arg;
+            rb_thread_call_with_gvl(invoke_callback_with_gvl, &request);
+        } else {
+            rbgutil_protect(func, arg);
+        }
+    } else {
+      invoke_callback_async_in_ruby_thread(func, arg);
+    }
 }
 
 /**********************************************************************/
@@ -224,7 +279,6 @@ rbgutil_invoke_callback(VALUE (*func)(VALUE), VALUE arg)
 void
 rbgutil_start_callback_dispatch_thread(void)
 {
-#ifdef HAVE_NATIVETHREAD
     VALUE callback_dispatch_thread;
 
     g_mutex_lock(&callback_dispatch_thread_mutex);
@@ -238,13 +292,11 @@ rbgutil_start_callback_dispatch_thread(void)
                     callback_dispatch_thread);
     }
     g_mutex_unlock(&callback_dispatch_thread_mutex);
-#endif
 }
 
 void
 rbgutil_stop_callback_dispatch_thread(void)
 {
-#ifdef HAVE_NATIVETHREAD
     VALUE callback_dispatch_thread;
 
     g_mutex_lock(&callback_dispatch_thread_mutex);
@@ -254,7 +306,6 @@ rbgutil_stop_callback_dispatch_thread(void)
         rb_ivar_set(rbg_mGLib(), id_callback_dispatch_thread, Qnil);
     }
     g_mutex_unlock(&callback_dispatch_thread_mutex);
-#endif
 }
 
 void
@@ -265,11 +316,9 @@ Init_gutil_callback(void)
         rb_define_class_under(rbg_mGLib(), "CallbackNotInitializedError",
                               rb_eRuntimeError);
 
-#ifdef HAVE_NATIVETHREAD
     id_callback_dispatch_thread = rb_intern("callback_dispatch_thread");
     rb_ivar_set(rbg_mGLib(), id_callback_dispatch_thread, Qnil);
 
     callback_request_queue = g_async_queue_new();
     g_mutex_init(&callback_dispatch_thread_mutex);
-#endif
 }

data/lib/glib-mkenums.rb

@@ -3,9 +3,9 @@
 #
 # C language enum description generation library like as glib-mkenums tool.
 #
-# Copyright(C) 2006-2015 Ruby-GNOME2 Project.
+# Copyright (C) 2006-2026 Ruby-GNOME Project Team
 #
-# This program is licenced under the same license of Ruby-GNOME2.
+# This program is licensed under the same license of Ruby-GNOME.
 #
 
 module GLib
@@ -92,7 +92,13 @@ GType #{@enum_name}_get_type (void);
 
     private
     def to_snail_case(name)
-      prefix_processed_name = name.sub(/^[A-Z]/) do |prefix|
+      id_prefix = @options[:id_prefix]
+      if id_prefix
+        id_prefix_pattern = /\A#{Regexp.escape(id_prefix)}/
+      else
+        id_prefix_pattern = /\A[A-Z]/
+      end
+      prefix_processed_name = name.sub(id_prefix_pattern) do |prefix|
         prefix.downcase
       end
       snail_cased_name = prefix_processed_name.gsub(/[A-Z]+/) do |upper_case|
@@ -118,7 +124,7 @@ GType #{@enum_name}_get_type (void);
                 # GLIB_DEPRECATED_TYPE_IN_2_38_FOR(GTestSubprocessFlags)
                 (?:\s+[\w()\s]+)?
                 ;/mx) do |force_flags, constants, name|
-        enum_options = {}
+        enum_options = {id_prefix: options[:id_prefix]}
         enum_options[:force_flags] = !force_flags.nil?
         force_flags_patterns = [(options[:force_flags] || [])].flatten
         if force_flags_patterns.any? {|pattern| pattern === name}

data/lib/glib2/callable-info.rb

@@ -0,0 +1,140 @@
+# Copyright (C) 2013-2026  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_relative "collection-reader"
+
+module GLib
+  class CallableInfo
+    extend CollectionReader
+
+    collection_reader("args")
+
+    def in_args
+      @in_args ||= compute_in_args
+    end
+
+    def required_in_args
+      @required_in_args ||= in_args.reject do |arg|
+        arg.may_be_null?
+      end
+    end
+
+    def n_in_args
+      in_args.size
+    end
+
+    def n_required_in_args
+      required_in_args.size
+    end
+
+    def require_callback?
+      (@require_callback ||= compute_require_callback) == :required
+    end
+
+    def out_args
+      @out_args ||= args.find_all do |arg|
+        case arg.direction
+        when Direction::OUT, Direction::INOUT
+          true
+        else
+          false
+        end
+      end
+    end
+
+    def n_out_args
+      out_args.size
+    end
+
+    def have_return_value?
+      return true if return_type.tag != TypeTag::VOID
+      return true if return_type.pointer?
+      not n_out_args.zero?
+    end
+
+    def description
+      signature
+    end
+
+    def signature
+      argument_signatures = args.collect(&:signature).join(", ")
+      "#{name}(#{argument_signatures}): #{return_type.description}"
+    end
+
+    def inspect
+      super.gsub(/>\z/) do
+        " signature=<#{signature}>" +
+          " name=#{name.inspect}" +
+          " arguments=#{args.inspect}" +
+          " return_type=#{return_type.inspect}" +
+          " may_return_null=#{may_return_null?.inspect}>"
+      end
+    end
+
+    private
+    def compute_in_args
+      array_length_indexes = []
+      callback_indexes = []
+      closure_indexes = []
+      destroy_indexes = []
+      args.each_with_index do |arg, i|
+        if arg.type.tag == TypeTag::ARRAY
+          array_length = arg.type.array_length
+          array_length_indexes << array_length if array_length != -1
+        end
+
+        unless arg.scope == ScopeType::INVALID
+          callback_indexes << i
+          closure_index = arg.closure
+          closure_indexes << closure_index if closure_index != -1
+          destroy_index = arg.destroy
+          destroy_indexes << destroy_index if destroy_index != -1
+        end
+      end
+
+      args.find_all.with_index do |arg, i|
+        case arg.direction
+        when Direction::IN, Direction::INOUT
+          if array_length_indexes.include?(i)
+            false
+          elsif callback_indexes.include?(i)
+            false
+          elsif closure_indexes.include?(i)
+            false
+          elsif destroy_indexes.include?(i)
+            false
+          else
+            true
+          end
+        else
+          arg.output_buffer?
+        end
+      end
+    end
+
+    def compute_require_callback
+      args.each do |arg|
+        if arg.direction == Direction::IN and
+            arg.scope != ScopeType::INVALID and
+            !arg.may_be_null?
+          return :required
+        end
+      end
+
+      :not_required
+    end
+  end
+end

data/lib/glib2/collection-reader.rb

@@ -0,0 +1,41 @@
+# Copyright (C) 2012-2026  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
+
+module GLib
+  module CollectionReader
+    def collection_reader(name)
+      n_getter = "n_#{name}"
+      if name.end_with?("ies")
+        singular = name.sub(/ies\z/, "y")
+      else
+        singular = name.sub(/s\z/, "")
+      end
+      getter = "get_#{singular}"
+      cache_name = "@#{name}"
+      define_method(name) do
+        if instance_variable_defined?(cache_name)
+          instance_variable_get(cache_name)
+        else
+          collection = send(n_getter).times.collect do |i|
+            send(getter, i)
+          end
+          instance_variable_set(cache_name, collection)
+          collection
+        end
+      end
+    end
+  end
+end

data/lib/glib2/interface-info.rb

@@ -0,0 +1,32 @@
+# Copyright (C) 2013-2026  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_relative "collection-reader"
+
+module GLib
+  class InterfaceInfo
+    extend CollectionReader
+
+    alias_method :__methods__, :methods
+
+    collection_reader("prerequisites")
+    collection_reader("properties")
+    collection_reader("methods")
+    collection_reader("signals")
+    collection_reader("vfuncs")
+    collection_reader("constants")
+  end
+end

data/lib/glib2/repository.rb

@@ -0,0 +1,47 @@
+# Copyright (C) 2012-2026  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
+
+module GLib
+  class Repository
+    class << self
+      if Repository.respond_to?(:default)
+        alias_method :default_raw, :default
+        def default
+          @@default ||= default_raw
+        end
+      else
+        def default
+          @@default ||= new
+        end
+      end
+    end
+
+    include Enumerable
+
+    def each(*namespaces)
+       return to_enum(__method__, *namespaces) unless block_given?
+
+      if namespaces.empty?
+        namespaces = loaded_namespaces
+      end
+      namespaces.each do |namespace|
+        get_n_infos(namespace).times do |i|
+          yield(get_info(namespace, i))
+        end
+      end
+    end
+  end
+end

data/lib/glib2/type-info.rb

@@ -0,0 +1,33 @@
+# Copyright (C) 2019-2026  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
+
+module GLib
+  class TypeInfo
+    def try_convert(value)
+      tag.try_convert(self, value)
+    end
+
+    def description
+      tag.description(self)
+    end
+
+    def inspect
+      super.gsub(/>\z/) do
+        " tag=#{tag.inspect}>"
+      end
+    end
+  end
+end

data/lib/glib2.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2025  Ruby-GNOME Project Team
+# Copyright (C) 2005-2026  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
@@ -345,6 +345,13 @@ require "glib2/value"
 require "glib2/variant"
 require "glib2/variant-type"
 
+if GLib.const_defined?(:Repository)
+  require_relative "glib2/callable-info"
+  require_relative "glib2/interface-info"
+  require_relative "glib2/repository"
+  require_relative "glib2/type-info"
+end
+
 =begin
 Don't we need this?
 ObjectSpace.define_finalizer(GLib) {