glib2 4.2.4 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f66210f00c8c877df17742b6e6e0648bce06d88b427b59671a7953d5c90bc0
-  data.tar.gz: 9485c80fd6515568f1f7e3eca427b940c23308e1998875d9475d4f9e6877a466
+  metadata.gz: 1ce8e0b69eabe0515d6f899e3811fa77ac794481531500e84fdea9fb33b28fec
+  data.tar.gz: 4ab29fea64953b54d7d903bef16ec0572276b4f892312f475b37af8eb70ef246
 SHA512:
-  metadata.gz: 334279af523347fca47aa14d0e7a68e0159994eec798135c0fa383815a8e206aeb6c07c149bc51c63b5c446b6791a060890ff1a77ec6d254360986e85d9d75c8
-  data.tar.gz: ce13e24f8b66e55ccc47639494c97aac8c5dd2b9d8fc28a385bca7f2bd39acfae349375ba75d146bb0849efd41c165febaf6697fefa87586a4ff6cf0bb8ee378
+  metadata.gz: 1af9b09699eeeff8fbce562c64be5c19514b4ce0d59a9d0ff7798b5c675215e54a853a7d6546b1f21aac122150256ed48714f2cd9b883f564a1a2d775367dce2
+  data.tar.gz: '079135b962c74881c9a24e110dae2de86792281817321ff42ee96dfabe34741b1a815e386043de63c8b647c110cb5718a7a5a3268e65ca7af06ceca6daa3a346'

data/Rakefile

@@ -19,10 +19,10 @@
 base_dir = __dir__
 
 $LOAD_PATH.unshift(File.join(base_dir, "lib"))
-require "gnome2/rake/package-task"
+require "gnome/rake/package-task"
 
 package_name = File.basename(base_dir)
 spec = Gem::Specification.load(File.join(base_dir, "#{package_name}.gemspec"))
 
-GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
+GNOME::Rake::PackageTask.define(spec, __dir__) do |package|
 end

data/ext/glib2/glib2.def

@@ -175,7 +175,6 @@ EXPORTS
 	rbglib_num_to_uint64
 	rbglib_uint64_to_num
 	rbglib_num_to_int64
-	rbglib_int64_to_num
 	rbg_variant_to_ruby
 	rbg_variant_from_ruby
 	rbg_variant_type_from_ruby

data/ext/glib2/rbglib.c

@@ -1248,7 +1248,6 @@ union       GDoubleIEEE754;
     Init_gutil_callback();
 
     Init_glib_gettext();
-    Init_glib_int64();
     Init_glib_error();
     Init_glib_threads();
     Init_glib_convert();

data/ext/glib2/rbglib.h

@@ -33,49 +33,14 @@ G_BEGIN_DECLS
 
 #define RBGLIB_MAJOR_VERSION 4
 #define RBGLIB_MINOR_VERSION 2
-#define RBGLIB_MICRO_VERSION 4
+#define RBGLIB_MICRO_VERSION 5
 
-#ifndef RB_ZALLOC
-#  ifdef ZALLOC
-#    define RB_ZALLOC(type) ZALLOC(type)
-#  else
-#    define RB_ZALLOC(type) rbg_memzero(ALLOC(type), sizeof(type))
-#  endif
+/* For Ruby < 3.0 */
+#ifndef RB_LL2NUM
+#  define RB_LL2NUM LL2NUM
 #endif
-
-#ifndef RB_ALLOC
-#  define RB_ALLOC(type) ALLOC(type)
-#endif
-
-#ifndef RB_ALLOC_N
-#  define RB_ALLOC_N(type, n) ALLOC_N(type, n)
-#endif
-
-/* For Ruby < 2.3 */
-#ifndef RB_OBJ_FROZEN
-#  define RB_OBJ_FROZEN(obj) OBJ_FROZEN(obj)
-#endif
-
-#ifndef RSTRING_PTR
-#  define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#  define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-
-#ifndef RARRAY_PTR
-#  define RARRAY_PTR(a) (RARRAY(a)->ptr)
-#  define RARRAY_LEN(a) (RARRAY(a)->len)
-#endif
-
-#ifndef RARRAY_CONST_PTR
-#  define RARRAY_CONST_PTR(a) RARRAY_PTR(a)
-#endif
-
-#ifndef DBL2NUM
-#  define DBL2NUM(v)      (rb_float_new(v))
-#endif
-
-#ifndef RBASIC_CLASS
-#  define RBASIC_CLASS(obj) (RBASIC(obj)->klass)
+#ifndef RB_ULL2NUM
+#  define RB_ULL2NUM ULL2NUM
 #endif
 
 #ifndef G_SOURCE_REMOVE
@@ -143,11 +108,11 @@ G_BEGIN_DECLS
 #define POINTER2RVAL(pointer) ((VALUE)(pointer))
 
 #if SIZEOF_VOIDP == SIZEOF_LONG
-#  define NUM2POINTER(number) ((gpointer)NUM2ULONG(number))
-#  define POINTER2NUM(pointer) ULONG2NUM((unsigned long)pointer)
+#  define NUM2POINTER(number) ((gpointer)RB_NUM2ULONG(number))
+#  define POINTER2NUM(pointer) RB_ULONG2NUM((unsigned long)pointer)
 #else
-#  define NUM2POINTER(number) ((gpointer)NUM2ULL(number))
-#  define POINTER2NUM(pointer) ULL2NUM((unsigned LONG_LONG)pointer)
+#  define NUM2POINTER(number) ((gpointer)RB_NUM2ULL(number))
+#  define POINTER2NUM(pointer) RB_ULL2NUM((unsigned LONG_LONG)pointer)
 #endif
 
 #define GINTS2RVAL(ary, n) rbg_gints2rval(ary, n)
@@ -245,6 +210,8 @@ extern GQuark rbgerr_ruby_error_quark(void);
 extern VALUE rbgerr_gerror2exception(GError *error);
 extern VALUE rbgerr_define_gerror(GQuark domain, const gchar* name, VALUE module, VALUE parent, GType gtype);
 
+/* Deprecated. Use RB_LL2NUM()/RB_ULL2NUM()/RB_NUM2LL()/RB_NUM2ULL()
+ * directly. */
 extern VALUE rbglib_int64_to_num(guint64 val);
 extern VALUE rbglib_uint64_to_num(guint64 val);
 extern gint64 rbglib_num_to_int64(VALUE val);

data/ext/glib2/rbglib_int64.c

@@ -1,9 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2003  Masahiro Sakai
- *  Copyright (C) 2002  Masahiro Sakai
- *                      Kenichi Komiya
+ *  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
@@ -23,143 +20,30 @@
 
 #include "rbgprivate.h"
 
-static ID id_and;
-static ID id_rshift;
-static ID id_lshift;
-static ID id_lt;
-static ID id_plus;
-static ID id_uminus;
-static ID id_abs;
-static VALUE max_PRUint32;
-
-typedef guint64 PRUint64;
-typedef gint64 PRInt64;
-
-#define LL_ZERO G_GINT64_CONSTANT(0)
-#define LL_UI2L(lhs,rhs) ((lhs)=(rhs))
-#define LL_L2UI(lhs,rhs) ((lhs)=(guint32)(rhs))
-#define LL_SHL(lhs,v1,v2) ((lhs)=(v1)<<(v2))
-#define LL_SHR(lhs,v1,v2) ((lhs)=(v1)>>(v2))
-#define LL_ADD(lhs,v1,v2) ((lhs)=(v1)+(v2))
-#define LL_NEG(lhs,rhs) ((lhs)=-(rhs))
-#define LL_CMP(v1,op,v2) ((v1) op (v2))
-
-/**********************************************************************/
-/*
-   following is ripped from rbXPCOM-0.0.3
-   http://www.ruby-lang.org/en/raa-list.rhtml?name=rbXPCOM
-   Copyright (C) 2001 Kenichi Komiya <kom@mail1.accsnet.ne.jp>
-*/ 
-
-static PRUint64
-RubyTo64BitInt(VALUE aRuby)
-{
-    VALUE bitMask = max_PRUint32;
-    VALUE lo = rb_funcall(aRuby, id_and, 1, bitMask);
-    VALUE hi = rb_funcall(aRuby, id_rshift, 1, INT2FIX(32));
-    PRUint64 result, hi64, lo64;
-    LL_UI2L(hi64, NUM2UINT(hi));
-    LL_UI2L(lo64, NUM2UINT(lo));
-    LL_SHL(result, hi64, 32);
-    LL_ADD(result, result, lo64);
-    return result;
-}
-
-
-static inline PRUint64
-RubyToPRUint64(VALUE aRuby) 
-{
-    return RubyTo64BitInt(aRuby);
-}
-
-
-static PRInt64
-RubyToPRInt64(VALUE aRuby) 
-{
-    if(RVAL2CBOOL(rb_funcall(aRuby, id_lt, 1, INT2FIX(0))))
-    {
-        VALUE absRuby = rb_funcall(aRuby, id_abs, 0);
-        PRInt64 result;
-        LL_NEG(result, RubyTo64BitInt(absRuby));
-        return result;
-    } else
-        return (PRInt64)RubyTo64BitInt(aRuby);
-
-}
-
-static VALUE
-RubyFrom64BitInt(PRUint64 aNative)
-{
-    PRUint64 lo64, hi64;
-    LL_L2UI(lo64, aNative);
-    LL_SHR(hi64, aNative, 32);
-    {
-    VALUE lo = UINT2NUM(lo64);
-    VALUE hi = UINT2NUM(hi64);
-    VALUE hiRuby = rb_funcall(hi, id_lshift, 1, INT2FIX(32));
-    return rb_funcall(hiRuby, id_plus, 1, lo);
-    }
-}
-
-static inline VALUE
-PRUint64ToRuby(PRUint64 aNative) 
-{
-    return RubyFrom64BitInt(aNative);
-}
-
-static VALUE
-PRInt64ToRuby(PRInt64 aNative) 
-{
-    if(LL_CMP(aNative, <, LL_ZERO))
-    {        
-        PRUint64 abs64;
-        LL_NEG(abs64, aNative);
-        return rb_funcall(RubyFrom64BitInt(abs64), id_uminus, 0);
-    }
-    else
-        return RubyFrom64BitInt((PRUint64)aNative);
-}
-
-/* end of ripping */
-/**********************************************************************/
-
+/* Deprecated. Use RB_LL2NUM() directly. */
 VALUE
 rbglib_int64_to_num(guint64 val)
 {
-    return PRInt64ToRuby(val);
+    return RB_LL2NUM(val);
 }
 
+/* Deprecated. Use RB_ULL2NUM() directly. */
 VALUE
 rbglib_uint64_to_num(guint64 val)
 {
-    return PRUint64ToRuby(val);
+    return RB_ULL2NUM(val);
 }
 
+/* Deprecated. Use RB_NUM2LL() directly. */
 gint64
 rbglib_num_to_int64(VALUE val)
 {
-    return RubyToPRInt64(val);
+    return RB_NUM2LL(val);
 }
 
+/* Deprecated. Use RB_NUM2ULL() directly. */
 guint64
 rbglib_num_to_uint64(VALUE val)
 {
-    return RubyToPRUint64(val);
-}
-
-/**********************************************************************/
-
-void
-Init_glib_int64(void)
-{
-    id_and    = rb_intern("&");
-    id_rshift = rb_intern(">>");
-    id_lshift = rb_intern("<<");
-    id_lt     = rb_intern("<");
-    id_plus   = rb_intern("+");
-    id_uminus = rb_intern("-@");
-    id_abs    = rb_intern("abs");
-
-    rb_global_variable(&max_PRUint32);
-    max_PRUint32 = UINT2NUM(0xffffffffL);
+    return RB_NUM2ULL(val);
 }

data/ext/glib2/rbgobj_type.c

@@ -638,7 +638,7 @@ rg_s_try_convert(VALUE self, VALUE value)
         return value;
 
     if (RVAL2CBOOL(rb_obj_is_kind_of(value, rb_cInteger))) {
-        GType gtype = NUM2ULONG(value);
+        GType gtype = NUM2SIZET(value);
         if (!g_type_name(gtype))
             return Qnil;
         return rb_funcall(self, id_new, 1, value);
@@ -672,7 +672,7 @@ rg_s_try_convert(VALUE self, VALUE value)
             } else {
                 Data_Get_Struct(data, RGObjClassInfo, cinfo);
             }
-            return rb_funcall(self, id_new, 1, ULONG2NUM(cinfo->gtype));
+            return rb_funcall(self, id_new, 1, SIZET2NUM(cinfo->gtype));
         }
         return Qnil;
     }

data/ext/glib2/rbgobj_value.c

@@ -374,7 +374,7 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "11", &rb_gtype, &rb_value);
 
-    g_value_init(&value, NUM2ULONG(rb_to_int(rb_gtype)));
+    g_value_init(&value, NUM2SIZET(rb_to_int(rb_gtype)));
     if (argc == 2) {
         rbgobj_rvalue_to_gvalue(rb_value, &value);
     }

data/ext/glib2/rbgprivate.h

@@ -146,7 +146,6 @@ G_GNUC_INTERNAL void Init_glib_gc(void);
 G_GNUC_INTERNAL void Init_gutil(void);
 G_GNUC_INTERNAL void Init_gutil_callback(void);
 G_GNUC_INTERNAL void Init_glib_gettext(void);
-G_GNUC_INTERNAL void Init_glib_int64(void);
 G_GNUC_INTERNAL void Init_glib_error(void);
 G_GNUC_INTERNAL void Init_glib_error_conversions(void);
 G_GNUC_INTERNAL void Init_glib_threads(void);

data/test/test-glib2.rb

@@ -1,6 +1,4 @@
-# coding: ascii-8bit
-#
-# Copyright (C) 2015-2022  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
@@ -49,9 +47,12 @@ class TestGLib < Test::Unit::TestCase
   def test_convert
     assert_kind_of(String, GLib.charset)
 
-    sjis = "\202\261\202\361\202\311\202\277\202\315\220\242\212E".force_encoding("Shift_JIS")
-    euc  = "\244\263\244\363\244\313\244\301\244\317\300\244\263\246".force_encoding("EUC-JP")
-    utf8 = "\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257\344\270\226\347\225\214".force_encoding("UTF-8")
+    # U+3042 HIRAGANA LETTER A
+    # U+3044 HIRAGANA LETTER I
+    # U+3046 HIRAGANA LETTER U
+    utf8 = "\u3042\u3044\u3046"
+    sjis = utf8.encode("Shift_JIS")
+    euc  = utf8.encode("EUC-JP")
     assert_equal(utf8, GLib.convert(sjis, "UTF-8", "SHIFT_JIS"))
     assert_equal(euc, GLib.convert(sjis, "EUC-JP", "SHIFT_JIS"))
     assert_equal(sjis, GLib.convert(sjis, "SHIFT_JIS", "SHIFT_JIS"))

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5
 platform: ruby
+original_platform: ''
 authors:
 - The Ruby-GNOME Project Team
 bindir: bin
 cert_chain: []
-date: 2024-09-23 00:00:00.000000000 Z
+date: 2024-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config