glib2 2.2.3-x86-mingw32 → 2.2.4-x86-mingw32

data/test/test_file_utils.rb

@@ -12,4 +12,42 @@ class TestGLibFileUtils < Test::Unit::TestCase
     assert_equal("1.5 MB", GLib.format_size_for_display(1024 * 1024 * 1.5))
     assert_equal("1.0 GB", GLib.format_size_for_display(1024 * 1024 * 1024))
   end
+
+  sub_test_case "#format_size" do
+    def setup
+      only_glib_version(2, 30, 0)
+    end
+
+    def test_kb
+      assert_equal("1.0 kB", GLib.format_size(1000))
+    end
+
+    def test_mb
+      assert_equal("1.0 MB", GLib.format_size(1000 * 1000))
+    end
+
+    def test_gb
+      assert_equal("1.0 GB", GLib.format_size(1000 * 1000 * 1000))
+    end
+
+    sub_test_case "flags" do
+      sub_test_case ":iec_units" do
+        def format_size(size)
+          GLib.format_size(size, :flags => :iec_units)
+        end
+
+        def test_kib
+          assert_equal("1.0 KiB", format_size(1024))
+        end
+
+        def test_mib
+          assert_equal("1.0 MiB", format_size(1024 * 1024))
+        end
+
+        def test_gib
+          assert_equal("1.0 GiB", format_size(1024 * 1024 * 1024))
+        end
+      end
+    end
+  end
 end

data/test/test_source.rb

@@ -22,8 +22,42 @@ class TestGLibSource < Test::Unit::TestCase
   def test_time
     context = GLib::MainContext.default
     source = GLib::Idle.source_new
-    source.attach(context)
-    time = source.time
-    assert_operator(0, :<, time)
+    id = source.attach(context)
+    begin
+      time = source.time
+      assert_operator(0, :<, time)
+    ensure
+      GLib::Source.remove(id)
+    end
+  end
+
+  def test_destroy
+    context = GLib::MainContext.new
+    source = GLib::Idle.source_new
+    id = source.attach(context)
+    assert_not_nil(context.find_source(id))
+    source.destroy
+    assert_nil(context.find_source(id))
+  end
+
+  def test_name
+    only_glib_version(2, 26, 0)
+
+    source = GLib::Idle.source_new
+    assert_nil(source.name)
+
+    source_name = "glib source"
+    source.name = source_name
+    assert_equal(source_name, source.name)
+  end
+
+  def test_ready_time
+    only_glib_version(2, 36, 0)
+
+    source = GLib::Idle.source_new
+
+    ready_time = 5
+    source.ready_time = 5
+    assert_equal(ready_time, source.ready_time)
   end
 end

data/vendor/local/bin/gdbus-codegen

@@ -31,7 +31,7 @@ elif os.name == 'nt':
     # Makes gdbus-codegen 'relocatable' at runtime on Windows.
     path = os.path.join(os.path.dirname(__file__), '..', 'share', 'glib-2.0')
 else:
-    path = os.path.join('/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/share', 'glib-2.0')
+    path = os.path.join('/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share', 'glib-2.0')
 
 sys.path.insert(0, os.path.abspath(path))
 from codegen import codegen_main

data/vendor/local/bin/glib-gettextize

@@ -37,11 +37,11 @@ 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.42.0
+version=2.42.1
 try_ln_s=:
 
 # Directory where the sources are stored.
-prefix=/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local
+prefix=/home/vagrant/ruby-gnome2.win32/glib2/vendor/local
 case `uname` in
 MINGW32*)
     prefix="`dirname $0`/.."

data/vendor/local/bin/glib-mkenums

@@ -129,7 +129,7 @@ sub parse_entries {
 }
 
 sub version {
-    print "glib-mkenums version glib-2.42.0\n";
+    print "glib-mkenums version glib-2.42.1\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/bin/libgnutls-openssl-28.def

@@ -195,35 +195,33 @@ EXPORTS
     rpl_dup2 @194
     rpl_fd_isset @195
     rpl_fstat @196
-    rpl_gai_strerror @197
-    rpl_getline @198
-    rpl_getpeername @199
-    rpl_gettimeofday @200
-    rpl_gmtime @201
+    rpl_ftell @197
+    rpl_ftello @198
+    rpl_gai_strerror @199
+    rpl_getline @200
+    rpl_getpeername @201
     rpl_listen @202
-    rpl_localtime @203
-    rpl_lseek @204
-    rpl_malloc @205
-    rpl_memchr @206
-    rpl_realloc @207
-    rpl_recv @208
-    rpl_recvfrom @209
-    rpl_select @210
-    rpl_send @211
-    rpl_sendto @212
-    rpl_setsockopt @213
-    rpl_shutdown @214
-    rpl_snprintf @215
-    rpl_socket @216
-    rpl_strdup @217
-    rpl_strerror @218
-    rpl_vsnprintf @219
-    strerror_override @220
-    strndup @221
-    strverscmp @222
-    unregister_fd_hook @223
-    vasnprintf @224
-    xmax @225
-    xsum @226
-    xsum3 @227
-    xsum4 @228
+    rpl_lseek @203
+    rpl_malloc @204
+    rpl_realloc @205
+    rpl_recv @206
+    rpl_recvfrom @207
+    rpl_select @208
+    rpl_send @209
+    rpl_sendto @210
+    rpl_setsockopt @211
+    rpl_shutdown @212
+    rpl_snprintf @213
+    rpl_socket @214
+    rpl_strdup @215
+    rpl_strerror @216
+    rpl_vsnprintf @217
+    strerror_override @218
+    strndup @219
+    strverscmp @220
+    unregister_fd_hook @221
+    vasnprintf @222
+    xmax @223
+    xsum @224
+    xsum3 @225
+    xsum4 @226

data/vendor/local/include/glib-2.0/gio/gioenums.h

@@ -1364,9 +1364,9 @@ typedef enum
  * @G_CREDENTIALS_TYPE_INVALID: Indicates an invalid native credential type.
  * @G_CREDENTIALS_TYPE_LINUX_UCRED: The native credentials type is a <type>struct ucred</type>.
  * @G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED: The native credentials type is a <type>struct cmsgcred</type>.
- * @G_CREDENTIALS_TYPE_NETBSD_UNPCBID: The native credentials type is a <type>struct unpcbid</type>.
  * @G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED: The native credentials type is a <type>struct sockpeercred</type>. Added in 2.30.
  * @G_CREDENTIALS_TYPE_SOLARIS_UCRED: The native credentials type is a <type>ucred_t</type>. Added in 2.40.
+ * @G_CREDENTIALS_TYPE_NETBSD_UNPCBID: The native credentials type is a <type>struct unpcbid</type>.
  *
  * Enumeration describing different kinds of native credential types.
  *
@@ -1377,9 +1377,9 @@ typedef enum
   G_CREDENTIALS_TYPE_INVALID,
   G_CREDENTIALS_TYPE_LINUX_UCRED,
   G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
-  G_CREDENTIALS_TYPE_NETBSD_UNPCBID,
   G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
-  G_CREDENTIALS_TYPE_SOLARIS_UCRED
+  G_CREDENTIALS_TYPE_SOLARIS_UCRED,
+  G_CREDENTIALS_TYPE_NETBSD_UNPCBID
 } GCredentialsType;
 
 /**

data/vendor/local/include/gnutls/gnutls.h

@@ -54,13 +54,13 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-#define GNUTLS_VERSION "3.2.18"
+#define GNUTLS_VERSION "3.2.21"
 
 #define GNUTLS_VERSION_MAJOR 3
 #define GNUTLS_VERSION_MINOR 2
-#define GNUTLS_VERSION_PATCH 18
+#define GNUTLS_VERSION_PATCH 21
 
-#define GNUTLS_VERSION_NUMBER 0x030212
+#define GNUTLS_VERSION_NUMBER 0x030215
 
 #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC

data/vendor/local/lib/gio/modules/libgiognutls.la

@@ -17,7 +17,7 @@ old_library='libgiognutls.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib -R/home/kou/work/ruby/rcairo.win32/vendor/local/lib -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libgio-2.0.la -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/../lib /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libgobject-2.0.la /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/../lib/libffi.la /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libglib-2.0.la -lole32 -lwinmm -lshlwapi /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libgnutls.la -lz -lws2_32 -lnettle -lhogweed /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libgmp.la -lcrypt32 /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libintl.la /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.la -lpthread'
+dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -R/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgio-2.0.la -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/../lib /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/../lib/libffi.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libglib-2.0.la -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgnutls.la -lz -lws2_32 -lnettle -lhogweed /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgmp.la -lcrypt32 /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.la -lpthread'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/gio/modules'
+libdir='/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/gio/modules'

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

@@ -94,7 +94,7 @@ typedef unsigned int guintptr;
 
 #define GLIB_MAJOR_VERSION 2
 #define GLIB_MINOR_VERSION 42
-#define GLIB_MICRO_VERSION 0
+#define GLIB_MICRO_VERSION 1
 
 #define G_OS_WIN32
 #define G_PLATFORM_WIN32

data/vendor/local/lib/libasprintf.la

@@ -17,7 +17,7 @@ old_library='libasprintf.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib'
+dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib'
+libdir='/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib'

data/vendor/local/lib/libcharset.la

@@ -17,7 +17,7 @@ old_library='libcharset.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib'
+dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib'
+libdir='/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib'

data/vendor/local/lib/{libffi-3.1 → libffi-3.2.1}/include/ffi.h

@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------*-C-*-
-   libffi 3.1 - Copyright (c) 2011 Anthony Green
+   libffi 3.2.1 - Copyright (c) 2011, 2014 Anthony Green
                     - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person
@@ -68,7 +68,7 @@ extern "C" {
 
 #ifndef LIBFFI_ASM
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #define __attribute__(X)
 #endif
 
@@ -199,6 +199,16 @@ FFI_EXTERN ffi_type ffi_type_longdouble;
 #else
 #define ffi_type_longdouble ffi_type_double
 #endif
+
+#ifdef FFI_TARGET_HAS_COMPLEX_TYPE
+FFI_EXTERN ffi_type ffi_type_complex_float;
+FFI_EXTERN ffi_type ffi_type_complex_double;
+#if 1
+FFI_EXTERN ffi_type ffi_type_complex_longdouble;
+#else
+#define ffi_type_complex_longdouble ffi_type_complex_double
+#endif
+#endif
 #endif /* LIBFFI_HIDE_BASIC_TYPES */
 
 typedef enum {
@@ -221,10 +231,10 @@ typedef struct {
 #endif
 } ffi_cif;
 
-#if HAVE_LONG_DOUBLE_VARIANT
+#if 0
 /* Used to adjust size/alignment of ffi types.  */
 void ffi_prep_types (ffi_abi abi);
-# endif
+#endif
 
 /* Used internally, but overridden by some architectures */
 ffi_status ffi_prep_cif_core(ffi_cif *cif,
@@ -465,9 +475,10 @@ void ffi_call(ffi_cif *cif,
 #define FFI_TYPE_SINT64     12
 #define FFI_TYPE_STRUCT     13
 #define FFI_TYPE_POINTER    14
+#define FFI_TYPE_COMPLEX    15
 
 /* This should always refer to the last type code (for sanity checks) */
-#define FFI_TYPE_LAST       FFI_TYPE_POINTER
+#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
 
 #ifdef __cplusplus
 }