glib2 3.1.1-x86-mingw32 → 3.1.2-x86-mingw32

data/vendor/local/include/glib-2.0/gobject/gsignal.h

@@ -469,7 +469,7 @@ void   g_signal_chain_from_overridden_handler (gpointer           instance,
  * See [memory management of signal handlers][signal-memory-management] for
  * details on how to handle the return value and memory management of @data.
  * 
- * Returns: the handler id (always greater than 0 for successful connections)
+ * Returns: the handler ID, of type #gulong (always greater than 0 for successful connections)
  */
 #define g_signal_connect(instance, detailed_signal, c_handler, data) \
     g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, (GConnectFlags) 0)
@@ -484,7 +484,7 @@ void   g_signal_chain_from_overridden_handler (gpointer           instance,
  * 
  * The handler will be called after the default handler of the signal.
  * 
- * Returns: the handler id (always greater than 0 for successful connections)
+ * Returns: the handler ID, of type #gulong (always greater than 0 for successful connections)
  */
 #define g_signal_connect_after(instance, detailed_signal, c_handler, data) \
     g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_AFTER)
@@ -522,7 +522,7 @@ void   g_signal_chain_from_overridden_handler (gpointer           instance,
  *                   (GCallback) button_clicked_cb, other_widget);
  * ]|
  * 
- * Returns: the handler ID (always greater than 0 for successful connections)
+ * Returns: the handler ID, of type #gulong (always greater than 0 for successful connections)
  */
 #define g_signal_connect_swapped(instance, detailed_signal, c_handler, data) \
     g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_SWAPPED)

data/vendor/local/include/glib-2.0/gobject/gtype.h

@@ -457,7 +457,8 @@ struct _GTypeQuery
  * @instance: Location of a #GTypeInstance structure
  * 
  * Checks if @instance is a valid #GTypeInstance structure,
- * otherwise issues a warning and returns %FALSE.
+ * otherwise issues a warning and returns %FALSE. %NULL is not a valid
+ * #GTypeInstance.
  * 
  * This macro should only be used in type implementations.
  *
@@ -466,23 +467,26 @@ struct _GTypeQuery
 #define G_TYPE_CHECK_INSTANCE(instance)				(_G_TYPE_CHI ((GTypeInstance*) (instance)))
 /**
  * G_TYPE_CHECK_INSTANCE_CAST:
- * @instance: Location of a #GTypeInstance structure
+ * @instance: (nullable): Location of a #GTypeInstance structure
  * @g_type: The type to be returned
  * @c_type: The corresponding C type of @g_type
  * 
  * Checks that @instance is an instance of the type identified by @g_type
  * and issues a warning if this is not the case. Returns @instance casted 
  * to a pointer to @c_type.
+ *
+ * No warning will be issued if @instance is %NULL, and %NULL will be returned.
  * 
  * This macro should only be used in type implementations.
  */
 #define G_TYPE_CHECK_INSTANCE_CAST(instance, g_type, c_type)    (_G_TYPE_CIC ((instance), (g_type), c_type))
 /**
  * G_TYPE_CHECK_INSTANCE_TYPE:
- * @instance: Location of a #GTypeInstance structure.
+ * @instance: (nullable): Location of a #GTypeInstance structure.
  * @g_type: The type to be checked
  * 
- * Checks if @instance is an instance of the type identified by @g_type.
+ * Checks if @instance is an instance of the type identified by @g_type. If
+ * @instance is %NULL, %FALSE will be returned.
  * 
  * This macro should only be used in type implementations.
  *
@@ -491,10 +495,11 @@ struct _GTypeQuery
 #define G_TYPE_CHECK_INSTANCE_TYPE(instance, g_type)            (_G_TYPE_CIT ((instance), (g_type)))
 /**
  * G_TYPE_CHECK_INSTANCE_FUNDAMENTAL_TYPE:
- * @instance: Location of a #GTypeInstance structure.
+ * @instance: (nullable): Location of a #GTypeInstance structure.
  * @g_type: The fundamental type to be checked
  *
  * Checks if @instance is an instance of the fundamental type identified by @g_type.
+ * If @instance is %NULL, %FALSE will be returned.
  *
  * This macro should only be used in type implementations.
  *
@@ -539,18 +544,18 @@ struct _GTypeQuery
  * 
  * Checks that @g_class is a class structure of the type identified by @g_type
  * and issues a warning if this is not the case. Returns @g_class casted 
- * to a pointer to @c_type.
+ * to a pointer to @c_type. %NULL is not a valid class structure.
  * 
  * This macro should only be used in type implementations.
  */
 #define G_TYPE_CHECK_CLASS_CAST(g_class, g_type, c_type)        (_G_TYPE_CCC ((g_class), (g_type), c_type))
 /**
  * G_TYPE_CHECK_CLASS_TYPE:
- * @g_class: Location of a #GTypeClass structure
+ * @g_class: (nullable): Location of a #GTypeClass structure
  * @g_type: The type to be checked
  * 
  * Checks if @g_class is a class structure of the type identified by 
- * @g_type.
+ * @g_type. If @g_class is %NULL, %FALSE will be returned.
  * 
  * This macro should only be used in type implementations.
  *

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

@@ -95,8 +95,8 @@ typedef unsigned int guintptr;
 #endif
 
 #define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 50
-#define GLIB_MICRO_VERSION 2
+#define GLIB_MINOR_VERSION 52
+#define GLIB_MICRO_VERSION 1
 
 #define G_OS_WIN32
 #define G_PLATFORM_WIN32

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

@@ -23,9 +23,9 @@ dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/ho
 weak_library_names=''
 
 # Version information for libgio-2.0.
-current=5000
-age=5000
-revision=2
+current=5200
+age=5200
+revision=1
 
 # Is this an already installed library?
 installed=yes

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

@@ -23,9 +23,9 @@ dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/ho
 weak_library_names=''
 
 # Version information for libglib-2.0.
-current=5000
-age=5000
-revision=2
+current=5200
+age=5200
+revision=1
 
 # Is this an already installed library?
 installed=yes

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

@@ -23,9 +23,9 @@ dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/ho
 weak_library_names=''
 
 # Version information for libgmodule-2.0.
-current=5000
-age=5000
-revision=2
+current=5200
+age=5200
+revision=1
 
 # Is this an already installed library?
 installed=yes

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

@@ -23,9 +23,9 @@ dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/ho
 weak_library_names=''
 
 # Version information for libgobject-2.0.
-current=5000
-age=5000
-revision=2
+current=5200
+age=5200
+revision=1
 
 # Is this an already installed library?
 installed=yes

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

@@ -23,9 +23,9 @@ dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/ho
 weak_library_names=''
 
 # Version information for libgthread-2.0.
-current=5000
-age=5000
-revision=2
+current=5200
+age=5200
+revision=1
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/pkgconfig/gio-2.0.pc

@@ -10,9 +10,9 @@ gdbus_codegen=gdbus-codegen
 
 Name: GIO
 Description: glib I/O library
-Version: 2.50.2
+Version: 2.52.1
 Requires: glib-2.0 gobject-2.0
 Requires.private: gmodule-no-export-2.0
 Libs: -L${libdir} -lgio-2.0
-Libs.private: -L/home/vagrant/rcairo.win32/vendor/local/lib -lz    
+Libs.private: -L/home/vagrant/rcairo.win32/vendor/local/lib -lz     
 Cflags:

data/vendor/local/lib/pkgconfig/gio-windows-2.0.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: GIO Windows specific APIs
 Description: Windows specific headers for glib I/O library
-Version: 2.50.2
+Version: 2.52.1
 Requires: gobject-2.0,gmodule-no-export-2.0,gio-2.0
 Libs: -L${libdir} -lgio-2.0
 Cflags: -I${includedir}/gio-win32-2.0/

data/vendor/local/lib/pkgconfig/glib-2.0.pc

@@ -9,8 +9,8 @@ glib_mkenums=glib-mkenums
 
 Name: GLib
 Description: C Utility Library
-Version: 2.50.2
+Version: 2.52.1
 Requires.private: libpcre
-Libs: -L${libdir} -lglib-2.0 -lintl 
-Libs.private:  -lws2_32 -lole32 -lwinmm -lshlwapi -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -lpcre -lintl    
+Libs: -L${libdir} -lglib-2.0 -lintl  
+Libs.private:  -lws2_32 -lole32 -lwinmm -lshlwapi -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -lpcre -lintl     
 Cflags: -I${includedir} -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -mms-bitfields

data/vendor/local/lib/pkgconfig/gmodule-2.0.pc

@@ -8,7 +8,7 @@ gmodule_supported=true
 Name: GModule
 Description: Dynamic module loader for GLib
 Requires: glib-2.0
-Version: 2.50.2
+Version: 2.52.1
 Libs: -L${libdir}  -lgmodule-2.0 
 Libs.private: 
 Cflags: 

data/vendor/local/lib/pkgconfig/gmodule-export-2.0.pc

@@ -8,7 +8,7 @@ gmodule_supported=true
 Name: GModule
 Description: Dynamic module loader for GLib
 Requires: glib-2.0
-Version: 2.50.2
+Version: 2.52.1
 Libs: -L${libdir}  -lgmodule-2.0 
 Libs.private: 
 Cflags: 

data/vendor/local/lib/pkgconfig/gmodule-no-export-2.0.pc

@@ -8,7 +8,7 @@ gmodule_supported=true
 Name: GModule
 Description: Dynamic module loader for GLib
 Requires: glib-2.0
-Version: 2.50.2
+Version: 2.52.1
 Libs: -L${libdir} -lgmodule-2.0 
 Libs.private: 
 Cflags: 

data/vendor/local/lib/pkgconfig/gobject-2.0.pc

@@ -6,7 +6,7 @@ includedir=${prefix}/include
 Name: GObject
 Description: GLib Type, Object, Parameter and Signal Library
 Requires: glib-2.0
-Version: 2.50.2
+Version: 2.52.1
 Libs: -L${libdir} -lgobject-2.0
 Libs.private: -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/../lib -lffi
 Cflags:

data/vendor/local/lib/pkgconfig/gthread-2.0.pc

@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: GThread
 Description: Thread support for GLib
 Requires: glib-2.0
-Version: 2.50.2
+Version: 2.52.1
 Libs: -L${libdir} -lgthread-2.0 
 Cflags: 

data/vendor/local/share/aclocal/glib-gettext.m4

@@ -97,6 +97,51 @@ fi
 AC_SUBST($1)dnl
 ])
 
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+dnl
+dnl Copied from intlmacosx.m4 in gettext, GPL.
+dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+glib_DEFUN([glib_gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in Mac OS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    [gt_cv_func_CFPreferencesCopyAppValue],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <CoreFoundation/CFPreferences.h>]],
+          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in Mac OS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <CoreFoundation/CFLocale.h>]],
+          [[CFLocaleCopyCurrent();]])],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+      [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
+
 # GLIB_WITH_NLS
 #-----------------
 glib_DEFUN([GLIB_WITH_NLS],
@@ -110,6 +155,8 @@ glib_DEFUN([GLIB_WITH_NLS],
     XGETTEXT=:
     INTLLIBS=
 
+    glib_gt_INTL_MACOSX
+
     AC_CHECK_HEADER(libintl.h,
      [gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
@@ -193,7 +240,7 @@ glib_DEFUN([GLIB_WITH_NLS],
       fi
   
       if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
+        INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS"
       fi
   
       if test "$gt_cv_have_gettext" = "yes"; then

data/vendor/local/share/glib-2.0/codegen/codegen.py

@@ -28,13 +28,15 @@ from . import dbustypes
 # ----------------------------------------------------------------------------------------------------
 
 class CodeGenerator:
-    def __init__(self, ifaces, namespace, interface_prefix, generate_objmanager, generate_autocleanup, docbook_gen, h, c):
+    def __init__(self, ifaces, namespace, interface_prefix, generate_objmanager,
+                 generate_autocleanup, docbook_gen, h, c, header_name):
         self.docbook_gen = docbook_gen
         self.generate_objmanager = generate_objmanager
         self.generate_autocleanup = generate_autocleanup
         self.ifaces = ifaces
         self.h = h
         self.c = c
+        self.header_name = header_name
         self.namespace = namespace
         if len(namespace) > 0:
             if utils.is_ugly_case(namespace):
@@ -48,7 +50,7 @@ class CodeGenerator:
             self.ns_upper = ''
             self.ns_lower = ''
         self.interface_prefix = interface_prefix
-        self.header_guard = self.h.name.upper().replace('.', '_').replace('-', '_').replace('/', '_')
+        self.header_guard = header_name.upper().replace('.', '_').replace('-', '_').replace('/', '_')
 
     # ----------------------------------------------------------------------------------------------------
 
@@ -67,7 +69,7 @@ class CodeGenerator:
                      '#include "%s"\n'
                      '\n'
                      '#include <string.h>\n'
-                     %(self.h.name))
+                     %(self.header_name))
 
         self.c.write('#ifdef G_OS_UNIX\n'
                      '#  include <gio/gunixfdlist.h>\n'
@@ -1710,8 +1712,8 @@ class CodeGenerator:
                      '  GVariantIter iter;\n'
                      '  GVariant *child;\n'
                      '  GValue *paramv;\n'
-                     '  guint num_params;\n'
-                     '  guint n;\n'
+                     '  gsize num_params;\n'
+                     '  gsize n;\n'
                      '  guint signal_id;\n');
         # Note: info could be NULL if we are talking to a newer version of the interface
         self.c.write('  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_%s_interface_info.parent_struct, signal_name);\n'
@@ -2130,9 +2132,9 @@ class CodeGenerator:
                      '  GVariantIter iter;\n'
                      '  GVariant *child;\n'
                      '  GValue *paramv;\n'
-                     '  guint num_params;\n'
+                     '  gsize num_params;\n'
                      '  guint num_extra;\n'
-                     '  guint n;\n'
+                     '  gsize n;\n'
                      '  guint signal_id;\n'
                      '  GValue return_value = G_VALUE_INIT;\n'
                      %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))