glib2 3.0.9-x86-mingw32 → 3.1.0-x86-mingw32

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.48.1
+Version: 2.50.2
 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.48.1
+Version: 2.50.2
 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.48.1
+Version: 2.50.2
 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.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.48.1
+Version: 2.50.2
 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.48.1
+Version: 2.50.2
 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.48.1
+Version: 2.50.2
 Libs: -L${libdir} -lgmodule-2.0 
 Libs.private: 
 Cflags: 

data/vendor/local/lib/pkgconfig/gnutls.pc

@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
 URL: http://www.gnutls.org/
 Version: 3.4.10
 Libs: -L${libdir} -lgnutls
-Libs.private: /home/vagrant/rcairo.win32/vendor/local/lib/libz.dll.a -L/home/vagrant/rcairo.win32/vendor/local/lib /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libintl.dll.a /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.dll.a -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -lws2_32  /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.dll.a -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -lp11-kit  -lws2_32  -lgmp
+Libs.private: /home/vagrant/rcairo.win32/vendor/local/lib/libz.dll.a -L/home/vagrant/rcairo.win32/vendor/local/lib /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libintl.dll.a /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.dll.a -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -lws2_32  /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.dll.a -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -lp11-kit -lws2_32  -lgmp
 Requires.private: nettle, hogweed, libtasn1, libidn, p11-kit-1, zlib
 Cflags: -I${includedir}

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.48.1
+Version: 2.50.2
 Libs: -L${libdir} -lgobject-2.0
-Libs.private: -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/../lib -lffi 
+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.48.1
+Version: 2.50.2
 Libs: -L${libdir} -lgthread-2.0 
 Cflags: 

data/vendor/local/share/bash-completion/completions/gsettings

@@ -21,7 +21,7 @@ __gsettings() {
 
   case "$((${COMP_CWORD}-$coffset))" in
     1)
-      choices=$'--schemadir\n--version\nhelp \nlist-schemas\nlist-relocatable-schemas\nlist-keys \nlist-children \nlist-recursively \nget \nrange \nset \nreset \nreset-recursively \nwritable \nmonitor'
+      choices=$'--schemadir\n--version\nhelp \nlist-schemas\nlist-relocatable-schemas\nlist-keys \nlist-children \nlist-recursively \nget \nrange \nset \nreset \nreset-recursively \nwritable \nmonitor \ndescribe '
       ;;
 
     2)
@@ -38,7 +38,7 @@ __gsettings() {
           choices="$(gsettings $schemadir list-schemas)"$'\n'"$(gsettings $schemadir list-relocatable-schemas | sed -e 's.$.:/.')"
           ;;
 
-        get|range|set|reset|writable|monitor)
+        get|range|set|reset|writable|monitor|describe)
           choices="$(gsettings $schemadir list-schemas | sed -e 's.$. .')"$'\n'"$(gsettings $schemadir list-relocatable-schemas | sed -e 's.$.:/.')"
           ;;
       esac
@@ -50,7 +50,7 @@ __gsettings() {
           choices="$(gsettings $schemadir list-keys ${COMP_WORDS[$(($coffset+2))]} 2> /dev/null | sed -e 's.$. .')"
           ;;
 
-        get|range|reset|writable|monitor)
+        get|range|reset|writable|monitor|describe)
           choices="$(gsettings $schemadir list-keys ${COMP_WORDS[$(($coffset+2))]} 2> /dev/null)"
           ;;
       esac

data/vendor/local/share/gdb/auto-load/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/{libglib-2.0.so.0.4800.1-gdb.py → libglib-2.0.so.0.5000.2-gdb.py}

@@ -6,5 +6,5 @@ dir_ = '/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/glib-2.0/gdb'
 if not dir_ in sys.path:
     sys.path.insert(0, dir_)
 
-from glib import register
+from glib_gdb import register
 register (gdb.current_objfile ())

data/vendor/local/share/gdb/auto-load/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/{libgobject-2.0.so.0.4800.1-gdb.py → libgobject-2.0.so.0.5000.2-gdb.py}

@@ -6,5 +6,5 @@ dir_ = '/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/glib-2.0/gdb'
 if not dir_ in sys.path:
     sys.path.insert(0, dir_)
 
-from gobject import register
+from gobject_gdb import register
 register (gdb.current_objfile ())

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

@@ -28,9 +28,10 @@ from . import dbustypes
 # ----------------------------------------------------------------------------------------------------
 
 class CodeGenerator:
-    def __init__(self, ifaces, namespace, interface_prefix, generate_objmanager, docbook_gen, h, c):
+    def __init__(self, ifaces, namespace, interface_prefix, generate_objmanager, generate_autocleanup, docbook_gen, h, c):
         self.docbook_gen = docbook_gen
         self.generate_objmanager = generate_objmanager
+        self.generate_autocleanup = generate_autocleanup
         self.ifaces = ifaces
         self.h = h
         self.c = c
@@ -307,6 +308,11 @@ class CodeGenerator:
 
             self.h.write('};\n')
             self.h.write('\n')
+            if self.generate_autocleanup == 'all':
+                self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
+                self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%s, g_object_unref)\n' % (i.camel_name))
+                self.h.write('#endif\n')
+                self.h.write('\n')
             self.h.write('GType %s_get_type (void) G_GNUC_CONST;\n'%(i.name_lower))
             self.h.write('\n')
             self.h.write('GDBusInterfaceInfo *%s_interface_info (void);\n'%(i.name_lower))
@@ -451,11 +457,11 @@ class CodeGenerator:
             self.h.write('\n')
             self.h.write('GType %s_proxy_get_type (void) G_GNUC_CONST;\n'%(i.name_lower))
             self.h.write('\n')
-            self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
-            self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%sProxy, g_object_unref)\n' % (i.camel_name))
-            self.h.write('#endif\n')
-
-            self.h.write('\n')
+            if self.generate_autocleanup in ('objects', 'all'):
+                self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
+                self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%sProxy, g_object_unref)\n' % (i.camel_name))
+                self.h.write('#endif\n')
+                self.h.write('\n')
             if i.deprecated:
                 self.h.write('G_GNUC_DEPRECATED ')
             self.h.write('void %s_proxy_new (\n'
@@ -542,10 +548,11 @@ class CodeGenerator:
             self.h.write('\n')
             self.h.write('GType %s_skeleton_get_type (void) G_GNUC_CONST;\n'%(i.name_lower))
             self.h.write('\n')
-            self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
-            self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%sSkeleton, g_object_unref)\n' % (i.camel_name))
-            self.h.write('#endif\n')
-            self.h.write('\n')
+            if self.generate_autocleanup in ('objects', 'all'):
+                self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
+                self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%sSkeleton, g_object_unref)\n' % (i.camel_name))
+                self.h.write('#endif\n')
+                self.h.write('\n')
             if i.deprecated:
                 self.h.write('G_GNUC_DEPRECATED ')
             self.h.write('%s *%s_skeleton_new (void);\n'%(i.camel_name, i.name_lower))
@@ -610,10 +617,11 @@ class CodeGenerator:
             self.h.write('\n')
             self.h.write('GType %sobject_proxy_get_type (void) G_GNUC_CONST;\n'%(self.ns_lower))
             self.h.write('\n')
-            self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
-            self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%sObjectProxy, g_object_unref)\n' % (self.namespace))
-            self.h.write('#endif\n')
-            self.h.write('\n')
+            if self.generate_autocleanup in ('objects', 'all'):
+                self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
+                self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%sObjectProxy, g_object_unref)\n' % (self.namespace))
+                self.h.write('#endif\n')
+                self.h.write('\n')
             self.h.write('%sObjectProxy *%sobject_proxy_new (GDBusConnection *connection, const gchar *object_path);\n'%(self.namespace, self.ns_lower))
             self.h.write('\n')
             self.h.write('#define %sTYPE_OBJECT_SKELETON (%sobject_skeleton_get_type ())\n'%(self.ns_upper, self.ns_lower))
@@ -641,10 +649,11 @@ class CodeGenerator:
             self.h.write('\n')
             self.h.write('GType %sobject_skeleton_get_type (void) G_GNUC_CONST;\n'%(self.ns_lower))
             self.h.write('\n')
-            self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
-            self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%sObjectSkeleton, g_object_unref)\n' % (self.namespace))
-            self.h.write('#endif\n')
-            self.h.write('\n')
+            if self.generate_autocleanup in ('objects', 'all'):
+                self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
+                self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%sObjectSkeleton, g_object_unref)\n' % (self.namespace))
+                self.h.write('#endif\n')
+                self.h.write('\n')
             self.h.write('%sObjectSkeleton *%sobject_skeleton_new (const gchar *object_path);\n'
                          %(self.namespace, self.ns_lower))
             for i in self.ifaces:
@@ -679,10 +688,11 @@ class CodeGenerator:
             self.h.write('  GDBusObjectManagerClientClass parent_class;\n')
             self.h.write('};\n')
             self.h.write('\n')
-            self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
-            self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%sObjectManagerClient, g_object_unref)\n' % (self.namespace))
-            self.h.write('#endif\n')
-            self.h.write('\n')
+            if self.generate_autocleanup in ('objects', 'all'):
+                self.h.write('#if GLIB_CHECK_VERSION(2, 44, 0)\n')
+                self.h.write('G_DEFINE_AUTOPTR_CLEANUP_FUNC (%sObjectManagerClient, g_object_unref)\n' % (self.namespace))
+                self.h.write('#endif\n')
+                self.h.write('\n')
             self.h.write('GType %sobject_manager_client_get_type (void) G_GNUC_CONST;\n'%(self.ns_lower))
             self.h.write('\n')
             self.h.write('GType %sobject_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data);\n'%(self.ns_lower))

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

@@ -156,6 +156,8 @@ def codegen_main():
                             help='Generate a GDBusObjectManagerClient subclass when generating C code')
     arg_parser.add_option('', '--generate-c-code', metavar='OUTFILES',
                           help='Generate C code in OUTFILES.[ch]')
+    arg_parser.add_option('', '--c-generate-autocleanup', type='choice', choices=['none', 'objects', 'all'], default='objects',
+                             help='Generate autocleanup support')
     arg_parser.add_option('', '--generate-docbook', metavar='OUTFILES',
                           help='Generate Docbook in OUTFILES-org.Project.IFace.xml')
     arg_parser.add_option('', '--annotate', nargs=3, action='append', metavar='WHAT KEY VALUE',
@@ -189,6 +191,7 @@ def codegen_main():
                                     opts.c_namespace,
                                     opts.interface_prefix,
                                     opts.c_generate_object_manager,
+                                    opts.c_generate_autocleanup,
                                     docbook_gen,
                                     h, c);
         ret = gen.generate()

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

@@ -22,4 +22,4 @@
 DATADIR = "${prefix}/share"
 DATADIR = DATADIR.replace(
     "${prefix}", "/home/vagrant/ruby-gnome2.win32/glib2/vendor/local")
-VERSION = "2.48.1"
+VERSION = "2.50.2"

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

@@ -156,7 +156,8 @@ class DBusXMLParser:
                     short_description = self.doc_comment_params['short_description']
                     self._cur_object.doc_string_brief = short_description
                 if 'since' in self.doc_comment_params:
-                    self._cur_object.since = self.doc_comment_params['since']
+                    self._cur_object.since = \
+                        self.doc_comment_params['since'].strip()
 
         elif self.state == DBusXMLParser.STATE_INTERFACE:
             if name == DBusXMLParser.STATE_METHOD:
@@ -186,7 +187,8 @@ class DBusXMLParser:
             if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']:
                 self._cur_object.doc_string = self.doc_comment_body
                 if 'since' in self.doc_comment_params:
-                    self._cur_object.since = self.doc_comment_params['since']
+                    self._cur_object.since = \
+                        self.doc_comment_params['since'].strip()
 
         elif self.state == DBusXMLParser.STATE_METHOD:
             if name == DBusXMLParser.STATE_ARG:
@@ -218,7 +220,8 @@ class DBusXMLParser:
                     if doc_string != None:
                         self._cur_object.doc_string = doc_string
                     if 'since' in self.doc_comment_params:
-                        self._cur_object.since = self.doc_comment_params['since']
+                        self._cur_object.since = \
+                            self.doc_comment_params['since'].strip()
 
         elif self.state == DBusXMLParser.STATE_SIGNAL:
             if name == DBusXMLParser.STATE_ARG:
@@ -244,7 +247,8 @@ class DBusXMLParser:
                     if doc_string != None:
                         self._cur_object.doc_string = doc_string
                     if 'since' in self.doc_comment_params:
-                        self._cur_object.since = self.doc_comment_params['since']
+                        self._cur_object.since = \
+                            self.doc_comment_params['since'].strip()
 
         elif self.state == DBusXMLParser.STATE_PROPERTY:
             if name == DBusXMLParser.STATE_ANNOTATION:

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

@@ -96,7 +96,13 @@ def lookup_brief_docs(annotations):
         return s
 
 def version_cmp_key(key):
-    # If the 'since' version is empty put a 0 in its place as this will
+    # If the 'since' version is 'UNRELEASED', compare higher than anything else
+    # If it is empty put a 0 in its place as this will
     # allow LooseVersion to work and will always compare lower.
-    v = key[0] if key[0] else '0'
+    if key[0] == 'UNRELEASED':
+        v = '9999'
+    elif key[0]:
+        v = str(key[0])
+    else:
+        v = '0'
     return (distutils.version.LooseVersion(v), key[1])

data/vendor/local/share/glib-2.0/gdb/{gobject.py → gobject_gdb.py}

@@ -1,6 +1,6 @@
 import os.path
 import gdb
-import glib
+import glib_gdb
 import sys
 
 if sys.version_info[0] >= 3:
@@ -37,7 +37,7 @@ def g_type_to_name (gtype):
     else:
         typenode = lookup_fundamental_type (typenode)
     if typenode != None:
-        return glib.g_quark_to_string (typenode["qname"])
+        return glib_gdb.g_quark_to_string (typenode["qname"])
     return None
 
 def is_g_type_instance (val):
@@ -161,7 +161,7 @@ class SignalFrame(FrameDecorator):
 
     def get_detailed_signal_from_frame(self, frame, signal):
         detail = self.read_var (frame, "detail")
-        detail = glib.g_quark_to_string (detail)
+        detail = glib_gdb.g_quark_to_string (detail)
         if detail is not None:
             return signal + ":" + detail
         else:

data/vendor/local/share/gtk-doc/html/gio/GAction.html

@@ -193,7 +193,7 @@
 </div>
 <div class="refsect1">
 <a name="GAction.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/home/desrt/Install/jhbuild/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a>
+<pre class="screen">    <a href="../gobject/GTypeModule.html">GInterface</a>
     <span class="lineart">╰──</span> GAction
 </pre>
 </div>

data/vendor/local/share/gtk-doc/html/gio/GActionGroup.html

@@ -210,7 +210,7 @@
 </div>
 <div class="refsect1">
 <a name="GActionGroup.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/home/desrt/Install/jhbuild/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a>
+<pre class="screen">    <a href="../gobject/GTypeModule.html">GInterface</a>
     <span class="lineart">╰──</span> GActionGroup
 </pre>
 </div>

data/vendor/local/share/gtk-doc/html/gio/GActionMap.html

@@ -102,7 +102,7 @@
 </div>
 <div class="refsect1">
 <a name="GActionMap.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/home/desrt/Install/jhbuild/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a>
+<pre class="screen">    <a href="../gobject/GTypeModule.html">GInterface</a>
     <span class="lineart">╰──</span> GActionMap
 </pre>
 </div>