glib2 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63162f607225357f5000148a30b78d4e856108fc
-  data.tar.gz: af52e69e8ebb8b838c515ce7c6120d744b2b2089
+  metadata.gz: 43029cc37df23718705b4017163ce8da2714a8d2
+  data.tar.gz: ff1491847df688d57cfc727a6cf3058c541aefb1
 SHA512:
-  metadata.gz: 65c30286f254b6ca93c5fbcbb05d024f6f0c80045c0787dcdf7009829089d8d7b16a9034ea20ad1c3aff4c27237616f775ad88c736f0013cae742d2b41ab02c0
-  data.tar.gz: 8acb18d55e8b8aefb14a5a7b8f89fd01fa93e90b8767d82c79a1d930c4741a4ca359bf5a02fa94d76a1931e7a8f7f4167837dd896e5372d8a91a385187d91022
+  metadata.gz: fb12725ee5ab2adf157cfbd8cc1b2f4d1e5395c72fec9bd099567fa5f0166208f534147e153ee4b8fc5934da25b90523e77863fcf7c2baae0f5a52738e73fabc
+  data.tar.gz: 29195c331c0f750bbce6aa9a83710c360c089444acd770956d75de7f8d43720d900aea4d85fd4f5363c04ff7c1127f8f5b6c64ac29d154819fecb75f4d7db124

data/Rakefile

@@ -88,13 +88,12 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.52.1",
+      :version => "2.52.3",
       :compression_method => "xz",
       :windows => {
         :need_autoreconf => true,
         :patches => [
           "glib-2.48.0-add-missing-exeext.diff",
-          "glib-2.52.1-fix-build-error.diff",
         ],
         :built_file => "bin/libglib-2.0-0.dll",
       },
@@ -127,7 +126,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "libtasn1",
       :download_site => :gnu,
       :label => "Libtasn1",
-      :version => "4.10",
+      :version => "4.12",
       :windows => {
         :built_file => "bin/libtasn1-6.dll",
       },

data/ext/glib2/rbglib-bytes.c

@@ -63,6 +63,27 @@ rg_to_s(VALUE self)
 #  endif
     return rb_data;
 }
+
+static VALUE
+rg_size(VALUE self)
+{
+    GBytes *bytes;
+
+    bytes = _SELF(self);
+    return ULONG2NUM(g_bytes_get_size(bytes));
+}
+
+static VALUE
+rg_pointer(VALUE self)
+{
+    GBytes *bytes;
+    gconstpointer data;
+
+    bytes = _SELF(self);
+    data = g_bytes_get_data(bytes, NULL);
+
+    return ULONG2NUM((guintptr)data);
+}
 #endif
 
 void
@@ -74,5 +95,8 @@ Init_glib_bytes(void)
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_METHOD(to_s, 0);
     RG_DEF_ALIAS("to_str", "to_s");
+    RG_DEF_METHOD(size, 0);
+    RG_DEF_ALIAS("length", "size");
+    RG_DEF_METHOD(pointer, 0);
 #endif
 }

data/ext/glib2/rbglib.c

@@ -1162,6 +1162,7 @@ union       GDoubleIEEE754;
     Init_gobject();
 
     /* Require GBoxed/GObject */
+    Init_glib_error_conversions();
     Init_glib_utils();
     Init_glib_spawn();
     Init_glib_spawnerror();

data/ext/glib2/rbglib.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 1
-#define RBGLIB_MICRO_VERSION 6
+#define RBGLIB_MICRO_VERSION 7
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbglib_error.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2004  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -146,6 +146,14 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
     return error_class;
 }
 
+static VALUE
+rbg_error_to_ruby(const GValue *from)
+{
+    GError *error;
+    error = g_value_get_boxed(from);
+    return GERROR2RVAL(error);
+}
+
 void
 Init_glib_error(void)
 {
@@ -162,3 +170,9 @@ Init_glib_error(void)
     generic_error = rb_define_class_under(mGLib, "Error", rb_eRuntimeError);
     rb_include_module(generic_error, error_info);
 }
+
+void
+Init_glib_error_conversions(void)
+{
+    rbgobj_register_g2r_func(G_TYPE_ERROR, rbg_error_to_ruby);
+}

data/ext/glib2/rbgprivate.h

@@ -118,6 +118,7 @@ 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);
 G_GNUC_INTERNAL void Init_glib_convert(void);
 G_GNUC_INTERNAL void Init_glib_messages(void);

data/lib/glib-mkenums.rb

@@ -158,7 +158,7 @@ GType #{@enum_name}_get_type (void);
       @target_filename = target_filename
       @include_files = include_files
       @targets = []
-      files.each do |path|
+      files.sort.each do |path|
         data = ""
         File.open(path) do |i|
           data = i.read

data/lib/glib2.rb

@@ -107,10 +107,10 @@ module GLib
     begin
       require "ruby_installer/runtime"
     rescue LoadError
-      prepend_path_to_environment_variable(path, "PATH")
     else
       RubyInstaller::Runtime.add_dll_directory(path.to_s)
     end
+    prepend_path_to_environment_variable(path, "PATH")
   end
 end
 

data/lib/mkmf-gnome2.rb

@@ -151,7 +151,8 @@ def setup_homebrew_libffi
   platform = NativePackageInstaller::Platform.detect
   return unless platform.is_a?(NativePackageInstaller::Platform::Homebrew)
 
-  PKGConfig.add_path("/usr/local/opt/libffi/lib/pkgconfig")
+  libffi_prefix = `brew --prefix libffi`
+  PKGConfig.add_path("#{libffi_prefix}/lib/pkgconfig")
 end
 
 #add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config