glib2 3.2.9 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bab9617d429bbf93a1a4f64aeda187505f1e92cc91771a22c1d5cf5ab9bcbbd
-  data.tar.gz: 41746bd6918b289a5bf7076d2d104252cfc634e3bd839ef1af112eb01069d265
+  metadata.gz: 42560ee70c7312fba3da7de85a532df79ee25bf3e5b4349cd1fedffab6456b4d
+  data.tar.gz: 0641f51f740794a4e5e766b4984b2cd2b7fdd614443c144b1515f6319f52065f
 SHA512:
-  metadata.gz: c9c083a3e5303382faac039b198265622c222928f8012efb6bb3370529dbb7dba1d2a8e176397d83a362ae7c97fe9ac25a5587e0893eaab80e1d349104cc6bac
-  data.tar.gz: 6543568bef9d5aeef2e88d9557d202fa828b807d7a464247c7fc06b19a9e45bedba6acd94e82c4997a720e8ebaf09337db3bb7d989e46a01aa6db3cee178d28c
+  metadata.gz: 1e17958d37d49057439955c13049dd29b5b1ba935ec413f507de857fcb4c0696c0fef6dbfcd8577f7906b9647ba49f9016b95fcaf87b66f6bc42d90cfa64c737
+  data.tar.gz: 4b13605e314b55f1319c76bc641a5299ffc596eb1dbbe5d8d5d28bee5c5226e1478406e54b6999007b62c882f84b3d31bf49dc32cdee33f81c217aae96215f0b

data/Rakefile

@@ -85,13 +85,9 @@ package_task = GNOME2::Rake::PackageTask.new(spec, __dir__) do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.56.1",
+      :version => "2.58.1",
       :compression_method => "xz",
       :windows => {
-        :need_autoreconf => true,
-        :patches => [
-          "glib-2.54.1-add-missing-exeext.diff",
-        ],
         :built_file => "bin/libglib-2.0-0.dll",
       },
     },
@@ -142,7 +138,7 @@ package_task = GNOME2::Rake::PackageTask.new(spec, __dir__) do |package|
       :name => "p11-glue/p11-kit",
       :download_site => :github,
       :label => "p11-kit",
-      :version => "0.23.12",
+      :version => "0.23.14",
       :windows => {
         :built_file => "bin/libp11-kit-0.dll",
       },
@@ -169,7 +165,7 @@ package_task = GNOME2::Rake::PackageTask.new(spec, __dir__) do |package|
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.56.1",
+      :version => "2.58.0",
       :compression_method => "xz",
       :windows => {
         :meson_args => [

data/ext/glib2/rbglib.c

@@ -1055,9 +1055,9 @@ Init_glib2(void)
     rb_define_const(RG_TARGET_NAMESPACE, "MAXSHORT", INT2FIX(G_MAXSHORT));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXUSHORT", UINT2NUM(G_MAXUSHORT));
 
-    rb_define_const(RG_TARGET_NAMESPACE, "MINLONG", INT2FIX(G_MINLONG));
-    rb_define_const(RG_TARGET_NAMESPACE, "MAXLONG", INT2NUM(G_MAXLONG));
-    rb_define_const(RG_TARGET_NAMESPACE, "MAXULONG", UINT2NUM(G_MAXULONG));
+    rb_define_const(RG_TARGET_NAMESPACE, "MINLONG", LL2NUM(G_MINLONG));
+    rb_define_const(RG_TARGET_NAMESPACE, "MAXLONG", LL2NUM(G_MAXLONG));
+    rb_define_const(RG_TARGET_NAMESPACE, "MAXULONG", ULL2NUM(G_MAXULONG));
 
     rb_define_const(RG_TARGET_NAMESPACE, "MININT8", INT2FIX(G_MININT8));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXINT8", INT2FIX(G_MAXINT8));
@@ -1071,16 +1071,16 @@ Init_glib2(void)
     rb_define_const(RG_TARGET_NAMESPACE, "MAXINT32", INT2NUM(G_MAXINT32));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXUINT32", UINT2NUM(G_MAXUINT32));
 
-    rb_define_const(RG_TARGET_NAMESPACE, "MININT64", INT2FIX(G_MININT64));
+    rb_define_const(RG_TARGET_NAMESPACE, "MININT64", LL2NUM(G_MININT64));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXINT64", LL2NUM(G_MAXINT64));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXUINT64", ULL2NUM(G_MAXUINT64));
 
-    rb_define_const(RG_TARGET_NAMESPACE, "MAXSIZE", UINT2NUM(G_MAXSIZE));
+    rb_define_const(RG_TARGET_NAMESPACE, "MAXSIZE", ULL2NUM(G_MAXSIZE));
 
-    rb_define_const(RG_TARGET_NAMESPACE, "MINFLOAT", INT2FIX(G_MINFLOAT));
+    rb_define_const(RG_TARGET_NAMESPACE, "MINFLOAT", DBL2NUM(G_MINFLOAT));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXFLOAT", DBL2NUM(G_MAXFLOAT));
 
-    rb_define_const(RG_TARGET_NAMESPACE, "MINDOUBLE", INT2FIX(G_MINDOUBLE));
+    rb_define_const(RG_TARGET_NAMESPACE, "MINDOUBLE", DBL2NUM(G_MINDOUBLE));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXDOUBLE", DBL2NUM(G_MAXDOUBLE));
 
     /* Standard Macros */

data/ext/glib2/rbglib.h

@@ -35,8 +35,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define RBGLIB_MAJOR_VERSION 3
-#define RBGLIB_MINOR_VERSION 2
-#define RBGLIB_MICRO_VERSION 9
+#define RBGLIB_MINOR_VERSION 3
+#define RBGLIB_MICRO_VERSION 0
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbglib_error.c

@@ -127,12 +127,15 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
             gchar *code_class_name;
 
             code_constant_name = nick_to_constant_name(entry->value_nick);
-            rbgobj_define_const(error_class,
-                                code_constant_name,
-                                INT2NUM(entry->value));
+            code_class_name = nick_to_class_name(entry->value_nick);
+
+            if (strcmp(code_constant_name, code_class_name) != 0) {
+                rbgobj_define_const(error_class,
+                                    code_constant_name,
+                                    INT2NUM(entry->value));
+            }
             g_free(code_constant_name);
 
-            code_class_name = nick_to_class_name(entry->value_nick);
             code_class = rb_define_class_under(error_class,
                                                code_class_name,
                                                error_class);

data/ext/glib2/rbgobj_signal.c

@@ -131,7 +131,7 @@ accumulator_func(G_GNUC_UNUSED GSignalInvocationHint *ihint,
         continue_emission = RVAL2CBOOL(rb_ary_entry(tmp, 0));
         val = rb_ary_entry(tmp, 1);
     } else {
-        val = tmp;        
+        val = tmp;
     }
     rbgobj_rvalue_to_gvalue(val, return_accu);
 

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

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2013-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2018  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -90,24 +90,18 @@ module GNOME2
           package.native.patches.each do |patch|
             sh("patch -p1 < #{@package.patches_dir}/#{patch}")
           end
-          sh("./autogen.sh") if package.native.need_autogen?
-          sh("autoreconf --install") if package.native.need_autoreconf?
-          sh("./configure",
-             "PKG_CONFIG_PATH=#{pkg_config_path}",
-             "--prefix=#{dist_dir}",
-             *package.native.configure_args) or exit(false)
+          build_dir = "build"
           env = []
           env << "PKG_CONFIG_PATH=#{pkg_config_path}"
-          common_make_args = []
-          common_make_args << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
-          build_make_args = common_make_args.dup
-          install_make_args = common_make_args.dup
-          if package.native.build_concurrently?
-            make_n_jobs = ENV["MAKE_N_JOBS"]
-            build_make_args << "-j#{make_n_jobs}" if make_n_jobs
-          end
-          sh("env", *env, "nice", "make", *build_make_args) or exit(false)
-          sh("env", *env, "make", "install", *install_make_args) or exit(false)
+          env << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
+          sh("env",
+             *env,
+             "meson",
+             build_dir,
+             "--prefix=#{dist_dir}",
+             "--libdir=lib") or exit(false)
+          sh("env", *env, "nice", "ninja", "-C", build_dir) or exit(false)
+          sh("env", *env, "ninja", "-C", build_dir, "install") or exit(false)
         end
       end
 

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

@@ -118,7 +118,7 @@ module GNOME2
           # build_make_args << "V=1"
           # build_make_args << "VERBOSE=1"
           # env["GI_SCANNER_DEBUG"] = "save-temps"
-          if File.exist?("meson.build") and not File.exist?("Makefile.am")
+          if File.exist?("meson.build")
             source_dir = Dir.pwd
             build_dir = "build"
             mkdir_p(build_dir)
@@ -130,7 +130,7 @@ module GNOME2
                  "ninja", "install") or exit(false)
             end
           else
-            if File.exist?("Makefile.in")
+            if File.exist?("Makefile.am") or File.exist?("Makefile.in")
               configure(env, package)
             else
               cmake(env, package)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.3.0
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config