glib2 4.0.2 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7d1eb0a21b97c5152d4f792de24a5fc4c12074f1f38e1c0eb220d63e68c1adf
-  data.tar.gz: 792084386504df0ca97a1a8dcd0f5c5fae4cc0909ae93daf0699225d1a9bb52a
+  metadata.gz: f7926c6f46ecefebbd076553fd03848564c70d5674206bc00d636b8ba776790e
+  data.tar.gz: 6715f80c40625e14d63c9423057395c3bda87ea758db05cc2291ebf477e51836
 SHA512:
-  metadata.gz: 68b6c0da8fac487e6267dfcf77b5695b838a8244702c241032f6a21a180cb7b9e403c642353efbec236d0fd5a2a9ffd6b6d241d85123fcc50038432b95599456
-  data.tar.gz: 7f369ff1a891dc192546b6c690ac819ad36610f13c3a69d68897607c41af214fb84d77312229c9c74c7777e9419c0ec06297d1c63939874c7d3e1deef015cf2c
+  metadata.gz: d65c4f2210c78150e61295a4d5bc24a8ef3d07745dc9a5dafd94863e2cdd871f22b0750a40fce61510c88eb79db713860c1c1294036ea7990a78842dca664029
+  data.tar.gz: 8c20a8cbe5c7ac23ee1eaaae3d38f478f5d30968394e80ce348332ad85db5ed9d30ecdbd187a050c99c4999f5a8af85c1f0623d27a32fc90698fde0d83dd55a7

data/ext/glib2/rbglib.h

@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 #define RBGLIB_MAJOR_VERSION 4
 #define RBGLIB_MINOR_VERSION 0
-#define RBGLIB_MICRO_VERSION 2
+#define RBGLIB_MICRO_VERSION 4
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbglib_spawn.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2011-2022  Ruby-GNOME Project Team
  *  Copyright (C) 2004  Masao Mutoh
  *  Copyright (C) 2004  Kazuhiro NISHIYAMA
  *
@@ -230,11 +230,45 @@ Init_glib_spawn(void)
     RG_DEF_SMETHOD(command_line_async, 1);
     RG_DEF_SMETHOD(close_pid, 1);
 
-    rb_define_const(RG_TARGET_NAMESPACE, "LEAVE_DESCRIPTORS_OPEN", INT2NUM(G_SPAWN_LEAVE_DESCRIPTORS_OPEN));
-    rb_define_const(RG_TARGET_NAMESPACE, "DO_NOT_REAP_CHILD", INT2NUM(G_SPAWN_DO_NOT_REAP_CHILD));
-    rb_define_const(RG_TARGET_NAMESPACE, "SEARCH_PATH", INT2NUM(G_SPAWN_SEARCH_PATH));
-    rb_define_const(RG_TARGET_NAMESPACE, "STDOUT_TO_DEV_NULL", INT2NUM(G_SPAWN_STDOUT_TO_DEV_NULL));
-    rb_define_const(RG_TARGET_NAMESPACE, "STDERR_TO_DEV_NULL", INT2NUM(G_SPAWN_STDERR_TO_DEV_NULL));
-    rb_define_const(RG_TARGET_NAMESPACE, "CHILD_INHERITS_STDIN", INT2NUM(G_SPAWN_CHILD_INHERITS_STDIN));
-    rb_define_const(RG_TARGET_NAMESPACE, "FILE_AND_ARGV_ZERO", INT2NUM(G_SPAWN_FILE_AND_ARGV_ZERO));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "DEFAULT",
+                    INT2NUM(G_SPAWN_DEFAULT));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "LEAVE_DESCRIPTORS_OPEN",
+                    INT2NUM(G_SPAWN_LEAVE_DESCRIPTORS_OPEN));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "DO_NOT_REAP_CHILD",
+                    INT2NUM(G_SPAWN_DO_NOT_REAP_CHILD));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "SEARCH_PATH",
+                    INT2NUM(G_SPAWN_SEARCH_PATH));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "STDOUT_TO_DEV_NULL",
+                    INT2NUM(G_SPAWN_STDOUT_TO_DEV_NULL));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "STDERR_TO_DEV_NULL",
+                    INT2NUM(G_SPAWN_STDERR_TO_DEV_NULL));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "CHILD_INHERITS_STDIN",
+                    INT2NUM(G_SPAWN_CHILD_INHERITS_STDIN));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "FILE_AND_ARGV_ZERO",
+                    INT2NUM(G_SPAWN_FILE_AND_ARGV_ZERO));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "SEARCH_PATH_FROM_ENVP",
+                    INT2NUM(G_SPAWN_SEARCH_PATH_FROM_ENVP));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "CLOEXEC_PIPES",
+                    INT2NUM(G_SPAWN_CLOEXEC_PIPES));
+#if GLIB_CHECK_VERSION(2, 74, 0)
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "CHILD_INHERITS_STDOUT",
+                    INT2NUM(G_SPAWN_CHILD_INHERITS_STDOUT));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "CHILD_INHERITS_STDERR",
+                    INT2NUM(G_SPAWN_CHILD_INHERITS_STDERR));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "STDIN_FROM_DEV_NULL",
+                    INT2NUM(G_SPAWN_STDIN_FROM_DEV_NULL));
+#endif
 }

data/ext/glib2/rbgobj_paramspecs.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2004-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2004-2022  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -19,6 +19,10 @@
  *  MA  02110-1301  USA
  */
 
+/* This is for suppressing warnings for GValueArray.
+ * We support GValueArray because GStreamer still uses it. */
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_30
+
 #include "rbgprivate.h"
 
 #define DEF_NUMERIC_PSPEC_METHODS_FUNC(pspec_type, typename, from_ruby, to_ruby, pspec_cast) \
@@ -198,6 +202,20 @@ pointer_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb, VALUE flags)
     return Qnil;
 }
 
+static VALUE
+value_array_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
+                       VALUE element_spec, VALUE flags)
+{
+    GParamSpec *pspec;
+    pspec = g_param_spec_value_array(StringValuePtr(name),
+                                     StringValuePtr(nick),
+                                     StringValuePtr(blurb),
+                                     RVAL2GOBJ(element_spec),
+                                     NUM2UINT(flags));
+    rbgobj_param_spec_initialize(self, pspec);
+    return Qnil;
+}
+
 static VALUE
 object_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
                   VALUE object_type, VALUE flags)
@@ -288,6 +306,9 @@ Init_gobject_gparamspecs(void)
     c = G_DEF_CLASS(G_TYPE_PARAM_POINTER, "Pointer", cParamSpec);
     rbg_define_method(c, "initialize", pointer_initialize, 4);
 
+    c = G_DEF_CLASS(G_TYPE_PARAM_VALUE_ARRAY, "ValueArray", cParamSpec);
+    rbg_define_method(c, "initialize", value_array_initialize, 5);
+
     c = G_DEF_CLASS(G_TYPE_PARAM_OBJECT, "Object", cParamSpec);
     rbg_define_method(c, "initialize", object_initialize, 5);
 }

data/ext/glib2/rbgobj_signal.c

@@ -418,8 +418,10 @@ gobj_sig_connect_impl(gboolean after, int argc, VALUE *argv, VALUE self)
                                                 rclosure, after);
     VALUE rb_handler_id = ULONG2NUM(handler_id);
     if (handler_id != 0) {
-        VALUE rb_connected_closures = rb_ivar_get(self, id_connected_closures);
-        if (NIL_P(rb_connected_closures)) {
+        VALUE rb_connected_closures;
+        if (RVAL2CBOOL(rb_ivar_defined(self, id_connected_closures))) {
+            rb_connected_closures = rb_ivar_get(self, id_connected_closures);
+        } else {
             rb_connected_closures = rb_hash_new();
             rb_ivar_set(self, id_connected_closures, rb_connected_closures);
         }

data/ext/glib2/rbgobj_type.c

@@ -66,8 +66,10 @@ static void
 cinfo_free(void *data)
 {
     RGObjClassInfo *cinfo = data;
+    g_hash_table_remove(gtype_to_cinfo, GUINT_TO_POINTER(cinfo->gtype));
     xfree(cinfo->name);
     xfree(cinfo->data_type);
+    xfree(cinfo);
 }
 
 static RGObjClassInfo *
@@ -106,6 +108,7 @@ rbgobj_class_info_create_data_type(VALUE klass)
     rb_data_type_t *data_type;
 
     data_type = RB_ZALLOC(rb_data_type_t);
+    data_type->wrap_struct_name = "RGObjClassInfo";
     data_type->function.dmark = cinfo_mark;
     data_type->function.dfree = cinfo_free;
     if (RB_TYPE_P(klass, RUBY_T_CLASS) && klass != rb_cObject) {

data/ext/glib2/rbgobj_valuearray.c

@@ -0,0 +1,104 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2006  Sjoerd Simons
+ *
+ *  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
+ */
+
+/* This is for suppressing warnings for GValueArray.
+ * We support GValueArray because GStreamer still uses it. */
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_30
+
+#include "rbgprivate.h"
+
+static VALUE
+value_array_to_ruby(const GValue *from)
+{
+    VALUE ary;
+    guint i;
+
+    GValueArray *array = (GValueArray *)g_value_get_boxed(from);
+    if (array == NULL)
+        return Qnil;
+
+    ary = rb_ary_new();
+    for (i = 0; i < array->n_values; i++)
+        rb_ary_push(ary, GVAL2RVAL(g_value_array_get_nth(array, i)));
+
+    return ary;
+}
+
+struct value_array_from_ruby_args {
+    VALUE ary;
+    long n;
+    GValueArray *result;
+};
+
+static VALUE
+value_array_from_ruby_body(VALUE value)
+{
+    long i;
+    struct value_array_from_ruby_args *args = (struct value_array_from_ruby_args *)value;
+
+    for (i = 0; i < args->n; i++) {
+        GValue v = G_VALUE_INIT;
+
+        g_value_init(&v, RVAL2GTYPE(RARRAY_PTR(args->ary)[i]));
+        rbgobj_rvalue_to_gvalue(RARRAY_PTR(args->ary)[i], &v);
+
+        g_value_array_append(args->result, &v);
+    }
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+value_array_from_ruby_rescue(VALUE value, VALUE error)
+{
+    g_value_array_free(((struct value_array_from_ruby_args *)value)->result);
+
+    rb_exc_raise(error);
+}
+
+static void
+value_array_from_ruby(const VALUE from, GValue *to)
+{
+    struct value_array_from_ruby_args args;
+
+    if (NIL_P(from)) {
+        g_value_set_boxed(to, NULL);
+
+        return;
+    }
+
+    args.ary = rb_ary_to_ary(from);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_value_array_new((guint)args.n);
+
+    rb_rescue(value_array_from_ruby_body, (VALUE)&args,
+              value_array_from_ruby_rescue, (VALUE)&args);
+
+    g_value_set_boxed(to, args.result);
+}
+
+void
+Init_gobject_value_array(void)
+{
+    /* ValueArray is treated as Array */
+    rbgobj_register_g2r_func(G_TYPE_VALUE_ARRAY, value_array_to_ruby);
+    rbgobj_register_r2g_func(G_TYPE_VALUE_ARRAY, value_array_from_ruby);
+}

data/ext/glib2/rbgobj_valuetypes.c

@@ -23,7 +23,7 @@
 #include "rbgobject.h"
 
 static const rb_data_type_t rbg_pointer_type = {
-    "GLib::Poitner",
+    "GLib::Pointer",
     {
         NULL,
         NULL,
@@ -43,9 +43,9 @@ gpointer
 rbgobj_ptr2cptr(VALUE ptr)
 {
     gpointer dest;
-    if (rb_obj_is_kind_of(ptr, GTYPE2CLASS(G_TYPE_POINTER))){
+    if (RVAL2CBOOL(rb_obj_is_kind_of(ptr, GTYPE2CLASS(G_TYPE_POINTER)))) {
         TypedData_Get_Struct(ptr, void, &rbg_pointer_type, dest);
-    } else if (rb_obj_is_kind_of(ptr, rb_cObject)){
+    } else if (RVAL2CBOOL(rb_obj_is_kind_of(ptr, rb_cObject))) {
         dest = (gpointer)ptr;
     } else{
         rb_raise(rb_eTypeError, "not a pointer object");
@@ -53,24 +53,51 @@ rbgobj_ptr2cptr(VALUE ptr)
     return dest;
 }
 
+static VALUE
+ptr_alloc(VALUE klass)
+{
+    gpointer pointer;
+    return TypedData_Make_Struct(klass,
+                                 gpointer,
+                                 &rbg_pointer_type,
+                                 pointer);
+}
+
+
 static VALUE
 ptr_s_gtype(VALUE klass)
 {
     return rbgobj_gtype_new(rbgobj_lookup_class(klass)->gtype);
 }
 
+static VALUE
+ptr_initialize(VALUE self, VALUE address)
+{
+    RTYPEDDATA_DATA(self) = NUM2POINTER(address);
+    return RUBY_Qnil;
+}
+
 static VALUE
 ptr_gtype(VALUE self)
 {
     return ptr_s_gtype(CLASS_OF(self));
 }
 
+static VALUE
+ptr_to_i(VALUE self)
+{
+    return POINTER2NUM(rbgobj_ptr2cptr(self));
+}
+
 static void
 Init_gtype_pointer(void)
 {
     VALUE cPtr = G_DEF_CLASS(G_TYPE_POINTER, "Pointer", rbg_mGLib());
-    rbg_define_singleton_method(cPtr, "gtype", ptr_s_gtype, 1);
-    rbg_define_method(cPtr, "gtype", ptr_gtype, 1);
+    rb_define_alloc_func(cPtr, ptr_alloc);
+    rbg_define_singleton_method(cPtr, "gtype", ptr_s_gtype, 0);
+    rbg_define_method(cPtr, "initialize", ptr_initialize, 1);
+    rbg_define_method(cPtr, "gtype", ptr_gtype, 0);
+    rbg_define_method(cPtr, "to_i", ptr_to_i, 0);
 }
 
 /**********************************************************************/

data/ext/glib2/rbgobject.c

@@ -390,6 +390,7 @@ 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/rbgprivate.h

@@ -28,7 +28,9 @@
  * Ubuntu 20.04: GLib 2.64
  * Ubuntu 22.04: GLib 2.72
  */
-#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_50
+#ifndef GLIB_VERSION_MIN_REQUIRED
+#  define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_50
+#endif
 
 #define G_LOG_DOMAIN "Ruby/GLib2"
 
@@ -189,6 +191,7 @@ 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/lib/{gnome2 → gnome}/rake/external-package.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2022  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
@@ -14,7 +14,7 @@
 # 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 GNOME2
+module GNOME
   module Rake
     class ExternalPackage < Struct.new(:name,
                                        :download_name,

data/lib/{gnome2 → gnome}/rake/native-binary-build-task.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2022  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
@@ -14,7 +14,7 @@
 # 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 GNOME2
+module GNOME
   module Rake
     class NativeBinaryBuildTask
       def initialize(package)

data/lib/gnome/rake/package-task.rb

@@ -0,0 +1,217 @@
+# Copyright(C) 2011-2022  Ruby-GNOME Project.
+#
+# 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 "find"
+require "pathname"
+
+require "rubygems"
+require "rubygems/package_task"
+require_relative "package"
+require_relative "external-package"
+require_relative "source-download-task"
+require_relative "native-binary-build-task"
+require_relative "windows-binary-download-task"
+require_relative "windows-binary-build-task"
+
+module GNOME
+  module Rake
+    class PackageTask
+      class << self
+        def define(spec, root_dir, &block)
+          new(spec, root_dir, &block).define
+        end
+      end
+
+      include ::Rake::DSL
+
+      attr_accessor :name, :summary, :description, :author, :email, :homepage, :required_ruby_version, :post_install_message
+      attr_reader :root_dir
+      def initialize(spec=nil, root_dir=nil)
+        @spec = spec
+        initialize_variables
+        initialize_configurations
+        if @spec
+          @package = Package.new(@spec.name, root_dir)
+        else
+          file, line, method = caller[1].scan(/^(.*):(\d+)(?::.*`(.*)')?\Z/).first
+          root_dir = File.dirname(file)
+          @package = Package.new(File.basename(root_dir), root_dir)
+        end
+        @packages = FileList["#{@package.root_dir.parent}/*"].map{|f| File.directory?(f) ? File.basename(f) : nil}.compact
+        @name = @package.name
+        @cross_compiling_hooks = []
+        yield(self) if block_given?
+      end
+
+      def cross_compiling(&block)
+        warn("cross compile support is dropped.")
+        @cross_compiling_hooks << block
+      end
+
+      def define
+        task :default => :build
+        define_spec
+        define_package_tasks
+      end
+
+      # Deprecated. Use #define instead.
+      def define_tasks
+        define
+      end
+
+      def ruby_gnome2_package?(name)
+        @packages.include?(name)
+      end
+
+      def dependency
+        @dependency_configuration
+      end
+
+      def package
+        @package
+      end
+
+      def windows
+        @package.windows
+      end
+
+      def native
+        @package.native
+      end
+
+      def version
+        ENV["VERSION"] || guess_version
+      end
+
+      def guess_version
+        versions = {}
+        File.open("#{@package.glib2_root_dir}/ext/glib2/rbglib.h") do |rbglib_h|
+          rbglib_h.each_line do |line|
+            if /#define\s+RBGLIB_([A-Z]+)_VERSION\s+(\d+)/ =~ line
+              versions[$1.downcase] = $2.to_i
+            end
+          end
+        end
+        ["major", "minor", "micro"].collect {|type| versions[type]}.compact.join(".")
+      end
+
+      def external_packages
+        @package.external_packages
+      end
+
+      def external_packages=(packages)
+        @package.external_packages = packages
+      end
+
+      def windows_binary_build_task
+        @windows_binary_build_task ||= WindowsBinaryBuildTask.new(@package)
+      end
+
+      private
+      def initialize_variables
+        @summary = ""
+        @description = ""
+        @author = "The Ruby-GNOME2 Project Team"
+        @email = "ruby-gnome2-devel-en@lists.sourceforge.net"
+        @homepage = "https://ruby-gnome2.osdn.jp/"
+        @external_packages = []
+      end
+
+      def initialize_configurations
+        @dependency_configuration = DependencyConfiguration.new(self)
+      end
+
+      def define_spec
+        @spec ||= Gem::Specification.new do |s|
+          warn("spec generation is deprecated. Use .gemspec instead.")
+          s.name                  = @name
+          s.summary               = @summary
+          s.description           = @description
+          s.author                = @author
+          s.email                 = @email
+          s.homepage              = @homepage
+          s.licenses              = ["LGPL-2.1+"]
+          s.version               = version
+          extensions              = FileList["ext/#{@name}/extconf.rb",
+                                             "dependency-check/Rakefile"]
+          extensions.existing!
+          s.extensions            = extensions
+          s.require_paths         = ["lib"]
+          files                   = FileList["ChangeLog", "README",
+                                             "Rakefile", "extconf.rb",
+                                             "dependency-check/Rakefile",
+                                             "lib/**/*.rb",
+                                             "ext/**/depend",
+                                             "ext/**/*.{c,h,def,rb}",
+                                             "{sample,test}/**/*"]
+          files.existing!
+          s.files                 = files
+          s.required_ruby_version = @required_ruby_version || ">= 2.1.0"
+          s.post_install_message  = @post_install_message
+          @dependency_configuration.apply(s)
+        end
+      end
+
+      def define_package_tasks
+        Gem::PackageTask.new(@spec) do |pkg|
+        end
+      end
+
+      class DependencyConfiguration
+        attr_accessor :platform, :ruby
+        def initialize(package)
+          @package = package
+          @platform = Gem::Platform::RUBY
+          @gem_configuration = GemConfiguration.new(@package)
+        end
+
+        def gem
+          @gem_configuration
+        end
+
+        def apply(spec)
+          spec.platform = @platform
+          @gem_configuration.apply(spec)
+        end
+
+        class GemConfiguration
+          attr_accessor :runtime, :development
+          def initialize(package)
+            @package = package
+            @runtime = []
+            @development = []
+          end
+
+          def apply(spec)
+            @runtime.each do |dependency|
+              spec.add_runtime_dependency(*append_version(dependency))
+            end
+
+            @development.each do |dependency|
+              spec.add_development_dependency(*append_version(dependency))
+            end
+          end
+
+          def append_version(dependency)
+            name, *ver = dependency.is_a?(Array) ? dependency : [dependency]
+            ver << "= #{@package.version}" if @package.ruby_gnome2_package?(name)
+            [name, *ver]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/{gnome2 → gnome}/rake/package.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2013-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2022  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
@@ -18,7 +18,7 @@
 
 require "pathname"
 
-module GNOME2
+module GNOME
   module Rake
     class Package
       attr_reader :name

data/lib/{gnome2 → gnome}/rake/source-download-task.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2022  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
@@ -14,7 +14,7 @@
 # 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 GNOME2
+module GNOME
   module Rake
     class SourceDownloadTask
       def initialize(package)

data/lib/gnome/rake/windows-binary-build-task.rb

@@ -0,0 +1,45 @@
+# Copyright(C) 2012-2022  Ruby-GNOME Project.
+#
+# 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 GNOME
+  module Rake
+    class WindowsBinaryBuildTask
+      def initialize(package)
+        @package = package
+      end
+
+      def define
+      end
+
+      def rcairo_binary_base_dir
+        rcairo_dir + "vendor" + "local"
+      end
+
+      def glib2_binary_base_dir
+        @package.glib2_root_dir + "vendor" + "local"
+      end
+
+      def binary_base_dir(package)
+        @package.project_root_dir + package + "vendor" + "local"
+      end
+
+      private
+      def rcairo_dir
+        @package.project_root_dir.parent + "rcairo"
+      end
+    end
+  end
+end

data/lib/gnome/rake/windows-binary-download-task.rb

@@ -0,0 +1,29 @@
+# Copyright(C) 2010-2022  Ruby-GNOME Project.
+#
+# 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 GNOME
+  module Rake
+    class WindowsBinaryDownloadTask
+      URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries"
+      def initialize(package)
+        @package = package
+      end
+
+      def define
+      end
+    end
+  end
+end

data/lib/gnome2/rake/package-task.rb

@@ -1,205 +1,25 @@
-# Copyright(C) 2011-2019 Ruby-GNOME2 Project.
+# Copyright(C) 2011-2022  Ruby-GNOME Project.
 #
+# 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
 # This program is licenced under the same license of Ruby-GNOME2.
 
-require "find"
-require "pathname"
-
-require "rubygems"
-require "rubygems/package_task"
-require "gnome2/rake/package"
-require "gnome2/rake/external-package"
-require "gnome2/rake/source-download-task"
-require "gnome2/rake/native-binary-build-task"
-require "gnome2/rake/windows-binary-download-task"
-require "gnome2/rake/windows-binary-build-task"
+# Just for backward compatibility.
+require "gnome/rake/package-task"
 
 module GNOME2
   module Rake
-    class PackageTask
-      class << self
-        def define(spec, root_dir, &block)
-          new(spec, root_dir, &block).define
-        end
-      end
-
-      include ::Rake::DSL
-
-      attr_accessor :name, :summary, :description, :author, :email, :homepage, :required_ruby_version, :post_install_message
-      attr_reader :root_dir
-      def initialize(spec=nil, root_dir=nil)
-        @spec = spec
-        initialize_variables
-        initialize_configurations
-        if @spec
-          @package = Package.new(@spec.name, root_dir)
-        else
-          file, line, method = caller[1].scan(/^(.*):(\d+)(?::.*`(.*)')?\Z/).first
-          root_dir = File.dirname(file)
-          @package = Package.new(File.basename(root_dir), root_dir)
-        end
-        @packages = FileList["#{@package.root_dir.parent}/*"].map{|f| File.directory?(f) ? File.basename(f) : nil}.compact
-        @name = @package.name
-        @cross_compiling_hooks = []
-        yield(self) if block_given?
-      end
-
-      def cross_compiling(&block)
-        warn("cross compile support is dropped.")
-        @cross_compiling_hooks << block
-      end
-
-      def define
-        task :default => :build
-        define_spec
-        define_package_tasks
-      end
-
-      # Deprecated. Use #define instead.
-      def define_tasks
-        define
-      end
-
-      def ruby_gnome2_package?(name)
-        @packages.include?(name)
-      end
-
-      def dependency
-        @dependency_configuration
-      end
-
-      def package
-        @package
-      end
-
-      def windows
-        @package.windows
-      end
-
-      def native
-        @package.native
-      end
-
-      def version
-        ENV["VERSION"] || guess_version
-      end
-
-      def guess_version
-        versions = {}
-        File.open("#{@package.glib2_root_dir}/ext/glib2/rbglib.h") do |rbglib_h|
-          rbglib_h.each_line do |line|
-            if /#define\s+RBGLIB_([A-Z]+)_VERSION\s+(\d+)/ =~ line
-              versions[$1.downcase] = $2.to_i
-            end
-          end
-        end
-        ["major", "minor", "micro"].collect {|type| versions[type]}.compact.join(".")
-      end
-
-      def external_packages
-        @package.external_packages
-      end
-
-      def external_packages=(packages)
-        @package.external_packages = packages
-      end
-
-      def windows_binary_build_task
-        @windows_binary_build_task ||= WindowsBinaryBuildTask.new(@package)
-      end
-
-      private
-      def initialize_variables
-        @summary = ""
-        @description = ""
-        @author = "The Ruby-GNOME2 Project Team"
-        @email = "ruby-gnome2-devel-en@lists.sourceforge.net"
-        @homepage = "https://ruby-gnome2.osdn.jp/"
-        @external_packages = []
-      end
-
-      def initialize_configurations
-        @dependency_configuration = DependencyConfiguration.new(self)
-      end
-
-      def define_spec
-        @spec ||= Gem::Specification.new do |s|
-          warn("spec generation is deprecated. Use .gemspec instead.")
-          s.name                  = @name
-          s.summary               = @summary
-          s.description           = @description
-          s.author                = @author
-          s.email                 = @email
-          s.homepage              = @homepage
-          s.licenses              = ["LGPL-2.1+"]
-          s.version               = version
-          extensions              = FileList["ext/#{@name}/extconf.rb",
-                                             "dependency-check/Rakefile"]
-          extensions.existing!
-          s.extensions            = extensions
-          s.require_paths         = ["lib"]
-          files                   = FileList["ChangeLog", "README",
-                                             "Rakefile", "extconf.rb",
-                                             "dependency-check/Rakefile",
-                                             "lib/**/*.rb",
-                                             "ext/**/depend",
-                                             "ext/**/*.{c,h,def,rb}",
-                                             "{sample,test}/**/*"]
-          files.existing!
-          s.files                 = files
-          s.required_ruby_version = @required_ruby_version || ">= 2.1.0"
-          s.post_install_message  = @post_install_message
-          @dependency_configuration.apply(s)
-        end
-      end
-
-      def define_package_tasks
-        Gem::PackageTask.new(@spec) do |pkg|
-        end
-      end
-
-      class DependencyConfiguration
-        attr_accessor :platform, :ruby
-        def initialize(package)
-          @package = package
-          @platform = Gem::Platform::RUBY
-          @gem_configuration = GemConfiguration.new(@package)
-        end
-
-        def gem
-          @gem_configuration
-        end
-
-        def apply(spec)
-          spec.platform = @platform
-          @gem_configuration.apply(spec)
-        end
-
-        class GemConfiguration
-          attr_accessor :runtime, :development
-          def initialize(package)
-            @package = package
-            @runtime = []
-            @development = []
-          end
-
-          def apply(spec)
-            @runtime.each do |dependency|
-              spec.add_runtime_dependency(*append_version(dependency))
-            end
-
-            @development.each do |dependency|
-              spec.add_development_dependency(*append_version(dependency))
-            end
-          end
-
-          def append_version(dependency)
-            name, *ver = dependency.is_a?(Array) ? dependency : [dependency]
-            ver << "= #{@package.version}" if @package.ruby_gnome2_package?(name)
-            [name, *ver]
-          end
-        end
-      end
-    end
+    PackageTask = GNOME::Rake::PackageTask
   end
 end

data/test/test-pointer.rb

@@ -0,0 +1,24 @@
+# Copyright (C) 2022  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
+
+class TestGLibPointer < Test::Unit::TestCase
+  include GLibTestUtils
+
+  test "#to_i" do
+    pointer = GLib::Pointer.new(0x08)
+    assert_equal(0x08, pointer.to_i)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.4
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -128,6 +128,7 @@ files:
 - ext/glib2/rbgobj_typemodule.c
 - ext/glib2/rbgobj_typeplugin.c
 - ext/glib2/rbgobj_value.c
+- ext/glib2/rbgobj_valuearray.c
 - ext/glib2/rbgobj_valuetypes.c
 - ext/glib2/rbgobject.c
 - ext/glib2/rbgobject.h
@@ -149,14 +150,15 @@ files:
 - lib/glib2/regex.rb
 - lib/glib2/variant.rb
 - lib/glib2/version.rb
+- lib/gnome/rake/external-package.rb
+- lib/gnome/rake/native-binary-build-task.rb
+- lib/gnome/rake/package-task.rb
+- lib/gnome/rake/package.rb
+- lib/gnome/rake/source-download-task.rb
+- lib/gnome/rake/windows-binary-build-task.rb
+- lib/gnome/rake/windows-binary-download-task.rb
 - lib/gnome2-raketask.rb
-- lib/gnome2/rake/external-package.rb
-- lib/gnome2/rake/native-binary-build-task.rb
 - lib/gnome2/rake/package-task.rb
-- lib/gnome2/rake/package.rb
-- lib/gnome2/rake/source-download-task.rb
-- lib/gnome2/rake/windows-binary-build-task.rb
-- lib/gnome2/rake/windows-binary-download-task.rb
 - lib/mkmf-gnome.rb
 - lib/mkmf-gnome2.rb
 - sample/bookmarkfile.rb
@@ -185,6 +187,7 @@ files:
 - test/test-key-file.rb
 - test/test-match-info.rb
 - test/test-mkenums.rb
+- test/test-pointer.rb
 - test/test-poll-fd.rb
 - test/test-regex.rb
 - test/test-signal.rb

data/lib/gnome2/rake/windows-binary-build-task.rb

@@ -1,33 +0,0 @@
-# Copyright(C) 2012-2019 Ruby-GNOME2 Project.
-#
-# This program is licenced under the same license of Ruby-GNOME2.
-
-module GNOME2
-  module Rake
-    class WindowsBinaryBuildTask
-      def initialize(package)
-        @package = package
-      end
-
-      def define
-      end
-
-      def rcairo_binary_base_dir
-        rcairo_dir + "vendor" + "local"
-      end
-
-      def glib2_binary_base_dir
-        @package.glib2_root_dir + "vendor" + "local"
-      end
-
-      def binary_base_dir(package)
-        @package.project_root_dir + package + "vendor" + "local"
-      end
-
-      private
-      def rcairo_dir
-        @package.project_root_dir.parent + "rcairo"
-      end
-    end
-  end
-end

data/lib/gnome2/rake/windows-binary-download-task.rb

@@ -1,17 +0,0 @@
-# Copyright(C) 2010-2019 Ruby-GNOME2 Project.
-#
-# This program is licenced under the same license of Ruby-GNOME2.
-
-module GNOME2
-  module Rake
-    class WindowsBinaryDownloadTask
-      URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries"
-      def initialize(package)
-        @package = package
-      end
-
-      def define
-      end
-    end
-  end
-end