glib2 4.2.2 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b563bb7a7fbbf025f7adff7f364a2aadf65f3699ddfce16188c91899c840b7d
-  data.tar.gz: ed5e98fee96ef1aa521a66a1cc076ed6fe9c840bee3c2148bdb1ec6513643b9b
+  metadata.gz: 75f66210f00c8c877df17742b6e6e0648bce06d88b427b59671a7953d5c90bc0
+  data.tar.gz: 9485c80fd6515568f1f7e3eca427b940c23308e1998875d9475d4f9e6877a466
 SHA512:
-  metadata.gz: d8b48c4d83df2e02af8cef030b4b3c6b94ce03be7d3626bcc075c38ddee2c711f51a61e5efabfce4be421a1b66e5e99c01c063e341db934a0247e90d41718b8c
-  data.tar.gz: bd24a6e77f2b3bd515f1e0b28a4571cc0851922fd8afc4b4ca29f00ab9ba851b37de5d75f2f57722187b2fcf5a0384b1e2a78bf6ba423816e64214a1a98abfd1
+  metadata.gz: 334279af523347fca47aa14d0e7a68e0159994eec798135c0fa383815a8e206aeb6c07c149bc51c63b5c446b6791a060890ff1a77ec6d254360986e85d9d75c8
+  data.tar.gz: ce13e24f8b66e55ccc47639494c97aac8c5dd2b9d8fc28a385bca7f2bd39acfae349375ba75d146bb0849efd41c165febaf6697fefa87586a4ff6cf0bb8ee378

data/README.md

@@ -24,4 +24,4 @@ the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1.
 
 ## Project Website
 
-https://ruby-gnome2.osdn.jp/
+https://ruby-gnome.github.io/

data/ext/glib2/rbglib-option.c

@@ -0,0 +1,28 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2024  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
+ */
+
+#include "rbgprivate.h"
+
+void
+Init_glib_option(void)
+{
+    G_DEF_CLASS(G_TYPE_OPTION_ARG, "OptionArg", rbg_mGLib());
+    G_DEF_CLASS(G_TYPE_OPTION_FLAGS, "OptionFlags", rbg_mGLib());
+}

data/ext/glib2/rbglib-variant-dict.c

@@ -0,0 +1,84 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2024  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
+ */
+
+#include "rbgprivate.h"
+
+#define RG_TARGET_NAMESPACE cVariantDict
+
+#define _SELF(s) (RVAL2GVARIANTDICT(s))
+
+static VALUE RG_TARGET_NAMESPACE;
+
+static VALUE
+rg_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE rb_variant;
+    rb_scan_args(argc, argv, "01", &rb_variant);
+    GVariant *variant = NULL;
+    if (!RB_NIL_P(rb_variant)) {
+        variant = RVAL2GVARIANT(rb_variant);
+    }
+    GVariantDict *dict = g_variant_dict_new(variant);
+    G_INITIALIZE(self, dict);
+
+    return Qnil;
+}
+
+static VALUE
+rg_insert(VALUE self, VALUE rb_key, VALUE rb_value)
+{
+    GVariantDict *dict = _SELF(self);
+    const gchar *key = RVAL2CSTR(rb_key);
+    GVariant *value = RVAL2GVARIANT(rb_value);
+    g_variant_dict_insert_value(dict, key, value);
+    return Qnil;
+}
+
+static VALUE
+rg_lookup(VALUE self, VALUE rb_key, VALUE rb_expected_type)
+{
+    GVariantDict *dict = _SELF(self);
+    const gchar *key = RVAL2CSTR(rb_key);
+    const GVariantType *expected_type = RVAL2GVARIANTTYPE(rb_expected_type);
+    GVariant *value = g_variant_dict_lookup_value(dict, key, expected_type);
+    return GVARIANT2RVAL(value);
+}
+
+static VALUE
+rg_contains_p(VALUE self, VALUE rb_key)
+{
+    GVariantDict *dict = _SELF(self);
+    const gchar *key = RVAL2CSTR(rb_key);
+    gboolean contains = g_variant_dict_contains(dict, key);
+    return CBOOL2RVAL(contains);
+}
+
+void
+Init_glib_variant_dict(void)
+{
+    RG_TARGET_NAMESPACE =
+        G_DEF_CLASS(G_TYPE_VARIANT_DICT, "VariantDict", rbg_mGLib());
+
+    RG_DEF_METHOD(initialize, -1);
+
+    RG_DEF_METHOD(insert, 2);
+    RG_DEF_METHOD(lookup, 2);
+    RG_DEF_METHOD_P(contains, 1);
+}

data/ext/glib2/rbglib.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2011-2024  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -1284,9 +1284,11 @@ union       GDoubleIEEE754;
     Init_glib_bookmark_file();
     Init_glib_variant_type();
     Init_glib_variant();
+    Init_glib_variant_dict();
     Init_glib_regex();
     Init_glib_matchinfo();
     Init_glib_date_time();
     Init_glib_time_zone();
     Init_glib_bytes();
+    Init_glib_option();
 }

data/ext/glib2/rbglib.h

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

data/ext/glib2/rbglib2conversions.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2024  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
@@ -43,6 +43,10 @@
 #define GVALUE2RVAL(o)                     (BOXED2RVAL(o, G_TYPE_VALUE))
 #define RVAL2GVARIANTTYPE(o)               (rbg_variant_type_from_ruby(o))
 #define GVARIANTTYPE2RVAL(o)               (BOXED2RVAL(o, G_TYPE_VARIANT_TYPE))
+#define RVAL2GVARIANT(o)                   (rbg_variant_from_ruby(o))
+#define GVARIANT2RVAL(o)                   (rbg_variant_to_ruby(o))
+#define RVAL2GVARIANTDICT(o)               ((GVariantDict *)RVAL2BOXED(o, G_TYPE_VARIANT_DICT))
+#define GVARIANTDICT2RVAL(o)               (BOXED2RVAL(o, G_TYPE_VARIANT_DICT))
 
 #define RVAL2GIOCONDITION(o)               (RVAL2GFLAGS(o, G_TYPE_IO_CONDITION))
 #define GIOCONDITION2RVAL(o)               (GFLAGS2RVAL(o, G_TYPE_IO_CONDITION))

data/ext/glib2/rbglib_utils.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2004-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2004-2024  Ruby-GNOME Project Team
  *  Copyright (C) 2004  Pascal Terjan
  *
  *  This library is free software; you can redistribute it and/or
@@ -279,6 +279,20 @@ rg_s_check_version_p(G_GNUC_UNUSED VALUE self, VALUE major, VALUE minor, VALUE m
                        glib_micro_version >= NUM2UINT(micro)));
 }
 
+#if GLIB_CHECK_VERSION(2, 64, 0)
+static VALUE
+rg_s_get_os_info(G_GNUC_UNUSED VALUE self, VALUE rb_key)
+{
+    if (RB_SYMBOL_P(rb_key)) {
+        VALUE mOSInfoKey = rb_const_get(rbg_mGLib(), rb_intern("OSInfoKey"));
+        VALUE rb_KEY = rb_funcall(rb_sym2str(rb_key), rb_intern("upcase"), 0);
+        rb_key = rb_const_get(mOSInfoKey, rb_intern_str(rb_KEY));
+    }
+    return CSTR2RVAL_FREE(g_get_os_info(RVAL2CSTR(rb_key)));
+}
+#endif
+
+
 void
 Init_glib_utils(void)
 {
@@ -323,4 +337,26 @@ Init_glib_utils(void)
     RG_DEF_SMETHOD(parse_debug_string, 2);
     RG_DEF_SMETHOD_P(check_version, 3);
 
+#if GLIB_CHECK_VERSION(2, 64, 0)
+    RG_DEF_SMETHOD(get_os_info, 1);
+
+    VALUE mOSInfoKey = rb_define_module_under(RG_TARGET_NAMESPACE, "OSInfoKey");
+#  define RG_DEF_OS_INFO_KEY(NAME)                      \
+    rb_define_const(mOSInfoKey,                         \
+                    G_STRINGIFY(NAME),                  \
+                    CSTR2RVAL(G_OS_INFO_KEY_ ## NAME))
+
+    RG_DEF_OS_INFO_KEY(NAME);
+    RG_DEF_OS_INFO_KEY(PRETTY_NAME);
+    RG_DEF_OS_INFO_KEY(VERSION);
+    RG_DEF_OS_INFO_KEY(VERSION_CODENAME);
+    RG_DEF_OS_INFO_KEY(VERSION_ID);
+    RG_DEF_OS_INFO_KEY(ID);
+    RG_DEF_OS_INFO_KEY(HOME_URL);
+    RG_DEF_OS_INFO_KEY(DOCUMENTATION_URL);
+    RG_DEF_OS_INFO_KEY(SUPPORT_URL);
+    RG_DEF_OS_INFO_KEY(BUG_REPORT_URL);
+    RG_DEF_OS_INFO_KEY(PRIVACY_POLICY_URL);
+#  undef RG_DEF_OS_INFO_KEY
+#endif
 }

data/ext/glib2/rbgobj_object.c

@@ -987,7 +987,6 @@ void
 rbgobj_register_type(VALUE klass, VALUE type_name, GClassInitFunc class_init)
 {
     GType parent_type;
-    GTypeInfo *info;
 
     {
         const RGObjClassInfo *cinfo = rbgobj_lookup_class(klass);
@@ -1025,26 +1024,13 @@ rbgobj_register_type(VALUE klass, VALUE type_name, GClassInitFunc class_init)
         GTypeQuery query;
         g_type_query(parent_type, &query);
 
-        /* TODO: Why new?  g_type_register_static() doesn’t retain a copy, so
-         * this should be allocated on the stack. */
-        info = g_new0(GTypeInfo, 1);
-        info->class_size     = query.class_size;
-        info->base_init      = NULL;
-        info->base_finalize  = NULL;
-        info->class_init     = class_init;
-        info->class_finalize = NULL;
-        info->class_data     = NULL;
-        info->instance_size  = query.instance_size;
-        info->n_preallocs    = 0;
-        info->instance_init  = NULL;
-        info->value_table    = NULL;
-    }
-
-    {
-        GType type = g_type_register_static(parent_type,
-                                            StringValueCStr(type_name),
-                                            info,
-                                            0);
+        GType type = g_type_register_static_simple(parent_type,
+                                                   StringValueCStr(type_name),
+                                                   query.class_size,
+                                                   class_init,
+                                                   query.instance_size,
+                                                   NULL,
+                                                   0);
         if (type == G_TYPE_INVALID) {
             rb_raise(rb_eArgError,
                      "failed to register type: <%s>",

data/ext/glib2/rbgobj_paramspecs.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2004-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2004-2024  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -25,6 +25,49 @@
 
 #include "rbgprivate.h"
 
+static GParamFlags
+resolve_flags(VALUE rb_flags)
+{
+    GParamFlags flags = 0;
+
+    switch (rb_type(rb_flags)) {
+      case RUBY_T_NIL:
+        flags = 0;
+        break;
+      case RUBY_T_FIXNUM:
+      case RUBY_T_BIGNUM:
+        flags = NUM2UINT(rb_flags);
+        break;
+      case RUBY_T_SYMBOL:
+        rb_flags = rb_sym2str(rb_flags);
+        /* fallthrough */
+      case RUBY_T_STRING:
+        {
+            VALUE rb_FLAGS = rb_funcall(rb_flags, rb_intern("upcase"), 0);
+            VALUE mGLibParam = rb_const_get(rbg_mGLib(), rb_intern("Param"));
+            flags = NUM2UINT(rb_const_get(mGLibParam, rb_intern_str(rb_FLAGS)));
+        }
+        break;
+      case RUBY_T_ARRAY:
+        {
+            long i, n;
+            n = RARRAY_LEN(rb_flags);
+            for (i = 0; i < n; i++) {
+                flags |= resolve_flags(RARRAY_PTR(rb_flags)[i]);
+            }
+            break;
+        }
+      default:
+        rb_raise(rb_eArgError,
+                 "flag value must be one of "
+                 "nil, Integer, String, Symbol or Array of them: %s",
+                 RBG_INSPECT(rb_flags));
+        break;
+    }
+
+    return flags;
+}
+
 #define DEF_NUMERIC_PSPEC_METHODS_FUNC(pspec_type, typename, from_ruby, to_ruby, pspec_cast) \
 static VALUE                                                            \
 typename##_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,  \
@@ -32,13 +75,13 @@ typename##_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,  \
                       VALUE flags)                                      \
 {                                                                       \
     GParamSpec* pspec;                                                  \
-    pspec = g_param_spec_##typename(StringValuePtr(name),               \
-                                    StringValuePtr(nick),               \
-                                    StringValuePtr(blurb),              \
+    pspec = g_param_spec_##typename(RVAL2CSTR(name),                    \
+                                    RVAL2CSTR_ACCEPT_NIL(nick),         \
+                                    RVAL2CSTR_ACCEPT_NIL(blurb),        \
                                     from_ruby(minimum),                 \
                                     from_ruby(maximum),                 \
                                     from_ruby(default_value),           \
-                                    NUM2UINT(flags));                   \
+                                    resolve_flags(flags));              \
     rbgobj_param_spec_initialize(self, pspec);                          \
     return Qnil;                                                        \
 }                                                                       \
@@ -91,11 +134,11 @@ boolean_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
                    VALUE default_value, VALUE flags)
 {
     GParamSpec* pspec;
-    pspec = g_param_spec_boolean(StringValuePtr(name),
-                                 StringValuePtr(nick),
-                                 StringValuePtr(blurb),
+    pspec = g_param_spec_boolean(RVAL2CSTR(name),
+                                 RVAL2CSTR_ACCEPT_NIL(nick),
+                                 RVAL2CSTR_ACCEPT_NIL(blurb),
                                  RVAL2CBOOL(default_value),
-                                 NUM2UINT(flags));
+                                 resolve_flags(flags));
     rbgobj_param_spec_initialize(self, pspec);
     return Qnil;
 }
@@ -105,11 +148,11 @@ unichar_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
                    VALUE default_value, VALUE flags)
 {
     GParamSpec* pspec;
-    pspec = g_param_spec_unichar(StringValuePtr(name),
-                                 StringValuePtr(nick),
-                                 StringValuePtr(blurb),
+    pspec = g_param_spec_unichar(RVAL2CSTR(name),
+                                 RVAL2CSTR_ACCEPT_NIL(nick),
+                                 RVAL2CSTR_ACCEPT_NIL(blurb),
                                  NUM2UINT(default_value),
-                                 NUM2UINT(flags));
+                                 resolve_flags(flags));
     rbgobj_param_spec_initialize(self, pspec);
     return Qnil;
 }
@@ -121,12 +164,12 @@ enum_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
     GParamSpec* pspec;
     GType gtype = rbgobj_gtype_from_ruby(enum_type);
 
-    pspec = g_param_spec_enum(StringValuePtr(name),
-                              StringValuePtr(nick),
-                              StringValuePtr(blurb),
+    pspec = g_param_spec_enum(RVAL2CSTR(name),
+                              RVAL2CSTR_ACCEPT_NIL(nick),
+                              RVAL2CSTR_ACCEPT_NIL(blurb),
                               gtype,
                               RVAL2GENUM(default_value, gtype),
-                              NUM2UINT(flags));
+                              resolve_flags(flags));
     rbgobj_param_spec_initialize(self, pspec);
     return Qnil;
 }
@@ -138,12 +181,12 @@ flags_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
     GParamSpec* pspec;
     GType gtype = rbgobj_gtype_from_ruby(flags_type);
 
-    pspec = g_param_spec_flags(StringValuePtr(name),
-                              StringValuePtr(nick),
-                              StringValuePtr(blurb),
-                              gtype,
-                              RVAL2GFLAGS(default_value, gtype),
-                              NUM2UINT(flags));
+    pspec = g_param_spec_flags(RVAL2CSTR(name),
+                               RVAL2CSTR_ACCEPT_NIL(nick),
+                               RVAL2CSTR_ACCEPT_NIL(blurb),
+                               gtype,
+                               RVAL2GFLAGS(default_value, gtype),
+                               resolve_flags(flags));
     rbgobj_param_spec_initialize(self, pspec);
     return Qnil;
 }
@@ -153,11 +196,11 @@ string_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
                   VALUE default_value, VALUE flags)
 {
     GParamSpec* pspec;
-    pspec = g_param_spec_string(StringValuePtr(name),
-                                StringValuePtr(nick),
-                                StringValuePtr(blurb),
-                                NIL_P(default_value) ? NULL : StringValuePtr(default_value),
-                                NUM2UINT(flags));
+    pspec = g_param_spec_string(RVAL2CSTR(name),
+                                RVAL2CSTR_ACCEPT_NIL(nick),
+                                RVAL2CSTR_ACCEPT_NIL(blurb),
+                                RVAL2CSTR_ACCEPT_NIL(default_value),
+                                resolve_flags(flags));
     rbgobj_param_spec_initialize(self, pspec);
     return Qnil;
 }
@@ -167,11 +210,11 @@ param_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
                  VALUE param_type, VALUE flags)
 {
     GParamSpec* pspec;
-    pspec = g_param_spec_param(StringValuePtr(name),
-                               StringValuePtr(nick),
-                               StringValuePtr(blurb),
+    pspec = g_param_spec_param(RVAL2CSTR(name),
+                               RVAL2CSTR_ACCEPT_NIL(nick),
+                               RVAL2CSTR_ACCEPT_NIL(blurb),
                                rbgobj_gtype_from_ruby(param_type),
-                               NUM2UINT(flags));
+                               resolve_flags(flags));
     rbgobj_param_spec_initialize(self, pspec);
     return Qnil;
 }
@@ -181,11 +224,11 @@ boxed_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
                  VALUE boxed_type, VALUE flags)
 {
     GParamSpec* pspec;
-    pspec = g_param_spec_boxed(StringValuePtr(name),
-                               StringValuePtr(nick),
-                               StringValuePtr(blurb),
+    pspec = g_param_spec_boxed(RVAL2CSTR(name),
+                               RVAL2CSTR_ACCEPT_NIL(nick),
+                               RVAL2CSTR_ACCEPT_NIL(blurb),
                                rbgobj_gtype_from_ruby(boxed_type),
-                               NUM2UINT(flags));
+                               resolve_flags(flags));
     rbgobj_param_spec_initialize(self, pspec);
     return Qnil;
 }
@@ -194,10 +237,10 @@ static VALUE
 pointer_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb, VALUE flags)
 {
     GParamSpec* pspec;
-    pspec = g_param_spec_pointer(StringValuePtr(name),
-                                 StringValuePtr(nick),
-                                 StringValuePtr(blurb),
-                                 NUM2UINT(flags));
+    pspec = g_param_spec_pointer(RVAL2CSTR(name),
+                                 RVAL2CSTR_ACCEPT_NIL(nick),
+                                 RVAL2CSTR_ACCEPT_NIL(blurb),
+                                 resolve_flags(flags));
     rbgobj_param_spec_initialize(self, pspec);
     return Qnil;
 }
@@ -207,11 +250,11 @@ 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),
+    pspec = g_param_spec_value_array(RVAL2CSTR(name),
+                                     RVAL2CSTR_ACCEPT_NIL(nick),
+                                     RVAL2CSTR_ACCEPT_NIL(blurb),
                                      RVAL2GOBJ(element_spec),
-                                     NUM2UINT(flags));
+                                     resolve_flags(flags));
     rbgobj_param_spec_initialize(self, pspec);
     return Qnil;
 }
@@ -221,11 +264,11 @@ object_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
                   VALUE object_type, VALUE flags)
 {
     GParamSpec* pspec;
-    pspec = g_param_spec_object(StringValuePtr(name),
-                                StringValuePtr(nick),
-                                StringValuePtr(blurb),
+    pspec = g_param_spec_object(RVAL2CSTR(name),
+                                RVAL2CSTR_ACCEPT_NIL(nick),
+                                RVAL2CSTR_ACCEPT_NIL(blurb),
                                 rbgobj_gtype_from_ruby(object_type),
-                                NUM2UINT(flags));
+                                resolve_flags(flags));
     rbgobj_param_spec_initialize(self, pspec);
     return Qnil;
 }

data/ext/glib2/rbgprivate.h

@@ -21,11 +21,11 @@
 #pragma once
 
 /*
- * CentOS 7: GLib 2.56
  * AlmaLinux 8: GLib 2.56
  * AlmaLinux 9: GLib 2.68
  * Ubuntu 20.04: GLib 2.64
  * Ubuntu 22.04: GLib 2.72
+ * Ubuntu 24.04: GLib 2.80
  */
 #ifndef GLIB_VERSION_MIN_REQUIRED
 #  define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56
@@ -179,11 +179,13 @@ G_GNUC_INTERNAL void Init_glib_keyfile(void);
 G_GNUC_INTERNAL void Init_glib_bookmark_file(void);
 G_GNUC_INTERNAL void Init_glib_variant_type(void);
 G_GNUC_INTERNAL void Init_glib_variant(void);
+G_GNUC_INTERNAL void Init_glib_variant_dict(void);
 G_GNUC_INTERNAL void Init_glib_regex(void);
 G_GNUC_INTERNAL void Init_glib_matchinfo(void);
 G_GNUC_INTERNAL void Init_glib_date_time(void);
 G_GNUC_INTERNAL void Init_glib_time_zone(void);
 G_GNUC_INTERNAL void Init_glib_bytes(void);
+G_GNUC_INTERNAL void Init_glib_option(void);
 
 G_GNUC_INTERNAL void Init_gobject_convert(void);
 G_GNUC_INTERNAL void Init_gobject_gtype(void);

data/glib2.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     "many useful utility features."
   s.author        = "The Ruby-GNOME Project Team"
   s.email         = "ruby-gnome2-devel-en@lists.sourceforge.net"
-  s.homepage      = "https://ruby-gnome2.osdn.jp/"
+  s.homepage      = "https://ruby-gnome.github.io/"
   s.licenses      = ["LGPL-2.1+"]
   s.version       = ruby_glib2_version
   s.extensions    = ["ext/#{s.name}/extconf.rb"]

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

@@ -126,7 +126,7 @@ module GNOME
         @description = ""
         @author = "The Ruby-GNOME2 Project Team"
         @email = "ruby-gnome2-devel-en@lists.sourceforge.net"
-        @homepage = "https://ruby-gnome2.osdn.jp/"
+        @homepage = "https://ruby-gnome.github.io/"
         @external_packages = []
       end
 

data/sample/bookmarkfile.rb

@@ -17,7 +17,7 @@ $KCODE = "U"
 URI = "https://ruby-gnome2.osdn.jp/"
 bf = GLib::BookmarkFile.new
 bf.set_title(URI, "Ruby-GNOME2 sample")
-bf.set_description(URI, "Ruby-GNOME2 Sampe for GLib::BookmarkFile")
+bf.set_description(URI, "Ruby-GNOME2 Sample for GLib::BookmarkFile")
 bf.set_mime_type(URI, "text/html")
 bf.set_private(URI, false)
 bf.set_icon(URI, "https://ruby-gnome2.osdn.jp/logo-gy.png", "image/png")

data/test/test-binding.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021  Ruby-GNOME Project Team
+# Copyright (C) 2015-2024  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,21 +21,19 @@ class TestGLibBinding < Test::Unit::TestCase
       type_register
 
       install_property(GLib::Param::Int.new("source", # name
-                                            "Source", # nick
-                                            "The source data", # blurb
+                                            nil, # nick
+                                            nil, # blurb
                                             0,     # min
                                             100,   # max
                                             0,     # default
-                                            GLib::Param::READABLE |
-                                            GLib::Param::WRITABLE))
+                                            [:readable, :writable]))
       install_property(GLib::Param::Int.new("target", # name
-                                            "Target", # nick
-                                            "The target data", # blurb
+                                            nil, # nick
+                                            nil, # blurb
                                             0,     # min
                                             100,   # max
                                             0,     # default
-                                            GLib::Param::READABLE |
-                                            GLib::Param::WRITABLE))
+                                            :readwrite))
 
       attr_reader :source, :target
       def initialize
@@ -106,8 +104,7 @@ class TestGLibBinding < Test::Unit::TestCase
                                                "Target", # nick
                                                "The target data", # blurb
                                                "",     # default
-                                               GLib::Param::READABLE |
-                                               GLib::Param::WRITABLE))
+                                               GLib::Param::READWRITE))
 
       attr_reader :source, :target
       def initialize

data/test/test-option.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2024  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 TestGLibOption < Test::Unit::TestCase
+  include GLibTestUtils
+
+  def test_arg
+    assert_equal(0, GLib::OptionArg::NONE.to_i)
+  end
+
+  def test_flags
+    assert_equal(0, GLib::OptionFlags::NONE.to_i)
+  end
+end

data/test/test-unicode.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021  Ruby-GNOME Project Team
+# Copyright (C) 2015-2024  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
@@ -400,10 +400,11 @@ class TestGLibUnicode < Test::Unit::TestCase
   end
 
   def binary(string)
-    if string.respond_to?(:force_encoding)
-      string.force_encoding("ascii-8bit")
+    if string.respond_to?(:b)
+      string.b
+    else
+      string
     end
-    string
   end
 
   def little_endian?

data/test/test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021  Ruby-GNOME Project Team
+# Copyright (C) 2015-2024  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
@@ -42,4 +42,14 @@ class TestGLibUtils < Test::Unit::TestCase
       GLib.get_user_special_dir(GLib::UserDirectory::DESKTOP)
     end
   end
+
+  def test_get_os_info
+    only_glib_version(2, 64, 0)
+    assert_kind_of(String, GLib.get_os_info(GLib::OSInfoKey::NAME))
+  end
+
+  def test_get_os_info_symbol
+    only_glib_version(2, 64, 0)
+    assert_kind_of(String, GLib.get_os_info(:name))
+  end
 end

data/test/test-variant-dict.rb

@@ -0,0 +1,40 @@
+# Copyright (C) 2024  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 TestGLibVariantDict < Test::Unit::TestCase
+  include GLibTestUtils
+
+  def setup
+    @dict = GLib::VariantDict.new
+    @dict.insert("hello", GLib::Variant.new("world", "s"))
+  end
+
+  def test_lookup
+    assert_equal("world", @dict.lookup("hello", "s"))
+  end
+
+  def test_contains_true
+    assert do
+      @dict.contains?("hello")
+    end
+  end
+
+  def test_contains_false
+    assert do
+      not @dict.contains?("nonexistent")
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.4
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 bindir: bin
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -68,6 +68,8 @@ files:
 - ext/glib2/rbgcompat.h
 - ext/glib2/rbglib-bytes.c
 - ext/glib2/rbglib-gc.c
+- ext/glib2/rbglib-option.c
+- ext/glib2/rbglib-variant-dict.c
 - ext/glib2/rbglib-variant-type.c
 - ext/glib2/rbglib-variant.c
 - ext/glib2/rbglib.c
@@ -187,6 +189,7 @@ files:
 - test/test-key-file.rb
 - test/test-match-info.rb
 - test/test-mkenums.rb
+- test/test-option.rb
 - test/test-pointer.rb
 - test/test-poll-fd.rb
 - test/test-regex.rb
@@ -200,12 +203,13 @@ files:
 - test/test-unicode.rb
 - test/test-utils.rb
 - test/test-value.rb
+- test/test-variant-dict.rb
 - test/test-variant-type.rb
 - test/test-variant.rb
 - test/test-version.rb
 - test/test-win32.rb
 - version.rb
-homepage: https://ruby-gnome2.osdn.jp/
+homepage: https://ruby-gnome.github.io/
 licenses:
 - LGPL-2.1+
 metadata: