glib2 3.1.6-x86-mingw32 → 3.1.7-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29965a2f028abd6a77fd929157d5ad38ae23e9ef
-  data.tar.gz: 05c0e01cf2f87aeff0f197d02cbcb1a3bda9d4d4
+  metadata.gz: a12fbccbc1d044f75922fc157b364d55cf5ceb7a
+  data.tar.gz: 22584023255e1e45ee09b615bedbbc51f90f01ea
 SHA512:
-  metadata.gz: 6b36d7b8cb5219007de483f2dbb71c8713381c2dbcc4c4156119370aa1b8e220431f4f88cd64245872abbeeb183d442957d81ad14d9b30a35729b2e8a2d64195
-  data.tar.gz: 812d67a4770eaf0fc6a4597ca81727b19e0f4d07aad37f663280d6a72e9a9f0665e770b4b72a9058caa9cda58bd67ac626366393a9a3f37b417674a22fa2d755
+  metadata.gz: 3405f1b141c3adaaaca75e4587f27a11b34838676a606943b2918b9d9fcdf101cbe11529662a6995d7216251817b121f680dc0ba65b563398207c95bc98819e1
+  data.tar.gz: 4577b0a6b024f119c35fedc77fa92b14336803aaf335be2798a7d05cd1a250831d6eba15826192daed5a500326ca1d613468008e51d102e380a073f9ca442b66

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")

data/vendor/local/bin/glib-gettextize

@@ -37,7 +37,7 @@ Usage: glib-gettextize [OPTION]... [package-dir]
   -f, --force          force writing of new files even if old exist
 Report bugs to http://bugzilla.gnome.org/."
 package=glib
-version=2.52.1
+version=2.52.3
 try_ln_s=:
 
 # Directory where the sources are stored.

data/vendor/local/bin/glib-mkenums

@@ -134,7 +134,7 @@ sub parse_entries {
 }
 
 sub version {
-    print "glib-mkenums version glib-2.52.1\n";
+    print "glib-mkenums version glib-2.52.3\n";
     print "glib-mkenums comes with ABSOLUTELY NO WARRANTY.\n";
     print "You may redistribute copies of glib-mkenums under the terms of\n";
     print "the GNU General Public License which can be found in the\n";

data/vendor/local/include/glib-2.0/glib/gmain.h

@@ -104,7 +104,10 @@ typedef struct _GSourceCallbackFuncs    GSourceCallbackFuncs;
  *     are needed for this type of event source. The return value of the
  *     @dispatch function should be #G_SOURCE_REMOVE if the source should be
  *     removed or #G_SOURCE_CONTINUE to keep it.
- * @finalize: Called when the source is finalized.
+ * @finalize: Called when the source is finalized. At this point, the source
+ *     will have been destroyed, had its callback cleared, and have been removed
+ *     from its #GMainContext, but it will still have its final reference count;
+ *     so methods can be called on it from within this function.
  *
  * The `GSourceFuncs` struct contains a table of
  * functions used to handle event sources in a generic manner.

data/vendor/local/include/libtasn1.h

@@ -44,7 +44,7 @@ extern "C"
 {
 #endif
 
-#define ASN1_VERSION "4.10"
+#define ASN1_VERSION "4.12"
 
 #if defined(__GNUC__) && !defined(ASN1_INTERNAL_BUILD)
 # define _ASN1_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
@@ -78,6 +78,7 @@ extern "C"
 #define ASN1_NAME_TOO_LONG		15
 #define ASN1_ARRAY_ERROR		16
 #define ASN1_ELEMENT_NOT_EMPTY		17
+#define ASN1_TIME_ENCODING_ERROR	18
 
   /*************************************/
   /* Constants used in asn1_visit_tree */
@@ -190,6 +191,8 @@ extern "C"
 #define ASN1_DECODE_FLAG_ALLOW_PADDING 1
 /* This flag would ensure that no BER decoding takes place */
 #define ASN1_DECODE_FLAG_STRICT_DER (1<<1)
+/* This flag will tolerate Time encoding errors when in strict DER */
+#define ASN1_DECODE_FLAG_ALLOW_INCORRECT_TIME (1<<2)
 
 
   struct asn1_data_node_st

data/vendor/local/lib/glib-2.0/include/glibconfig.h

@@ -96,7 +96,7 @@ typedef unsigned int guintptr;
 
 #define GLIB_MAJOR_VERSION 2
 #define GLIB_MINOR_VERSION 52
-#define GLIB_MICRO_VERSION 1
+#define GLIB_MICRO_VERSION 3
 
 #define G_OS_WIN32
 #define G_PLATFORM_WIN32

data/vendor/local/lib/libgio-2.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libgio-2.0.
 current=5200
 age=5200
-revision=1
+revision=3
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libglib-2.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libglib-2.0.
 current=5200
 age=5200
-revision=1
+revision=3
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libgmodule-2.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libgmodule-2.0.
 current=5200
 age=5200
-revision=1
+revision=3
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libgobject-2.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libgobject-2.0.
 current=5200
 age=5200
-revision=1
+revision=3
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libgthread-2.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libgthread-2.0.
 current=5200
 age=5200
-revision=1
+revision=3
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libtasn1.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libtasn1.
 current=11
 age=5
-revision=3
+revision=4
 
 # Is this an already installed library?
 installed=yes