gobject-introspection 2.2.5-x86-mingw32 → 3.0.0-x86-mingw32

data/vendor/local/lib/gobject-introspection/giscanner/girparser.py

@@ -24,6 +24,7 @@ from xml.etree.cElementTree import parse
 
 from . import ast
 from .girwriter import COMPATIBLE_GIR_VERSION
+from .collections import OrderedDict
 
 CORE_NS = "http://www.gtk.org/introspection/core/1.0"
 C_NS = "http://www.gtk.org/introspection/c/1.0"
@@ -165,9 +166,18 @@ class GIRParser(object):
 
     def _parse_generic_attribs(self, node, obj):
         assert isinstance(obj, ast.Annotated)
+        skip = node.attrib.get('skip')
+        if skip:
+            try:
+                obj.skip = int(skip) > 0
+            except ValueError:
+                obj.skip = False
         introspectable = node.attrib.get('introspectable')
         if introspectable:
-            obj.introspectable = int(introspectable) > 0
+            try:
+                obj.introspectable = int(introspectable) > 0
+            except ValueError:
+                obj.introspectable = False
         if self._types_only:
             return
         doc = node.find(_corens('doc'))
@@ -195,6 +205,14 @@ class GIRParser(object):
         if stability_doc is not None:
             if stability_doc.text:
                 obj.stability_doc = stability_doc.text
+        attributes = node.findall(_corens('attribute'))
+        if attributes:
+            attributes_ = OrderedDict()
+            for attribute in attributes:
+                name = attribute.attrib.get('name')
+                value = attribute.attrib.get('value')
+                attributes_[name] = value
+            obj.attributes = attributes_
 
     def _parse_object_interface(self, node):
         parent = node.attrib.get('parent')

data/vendor/local/lib/gobject-introspection/giscanner/maintransformer.py

@@ -386,10 +386,14 @@ class MainTransformer(object):
         array_options = annotations.get(ANN_ARRAY)
         container_type = ast.Array(array_type, element_type_node, ctype=node.type.ctype,
                                    is_const=node.type.is_const)
-        if OPT_ARRAY_ZERO_TERMINATED in array_options:
-            container_type.zeroterminated = array_options.get(OPT_ARRAY_ZERO_TERMINATED) == '1'
-        else:
+        if array_options.get(OPT_ARRAY_ZERO_TERMINATED, '0') == '0':
             container_type.zeroterminated = False
+        else:
+            if (OPT_ARRAY_ZERO_TERMINATED in array_options
+            or array_options.get(OPT_ARRAY_ZERO_TERMINATED) == '1'):
+                container_type.zeroterminated = True
+            else:
+                container_type.zeroterminated = False
 
         length = array_options.get(OPT_ARRAY_LENGTH)
         if length:

data/vendor/local/lib/gobject-introspection/giscanner/scannermain.py

@@ -280,7 +280,7 @@ def process_options(output, allowed_flags):
 
 
 def process_packages(options, packages):
-    args = ['pkg-config', '--cflags']
+    args = [os.environ.get('PKG_CONFIG', 'pkg-config'), '--cflags']
     args.extend(packages)
     output = subprocess.Popen(args,
                               stdout=subprocess.PIPE).communicate()[0]

data/vendor/local/lib/gobject-introspection/giscanner/sourcescanner.py

@@ -294,6 +294,14 @@ class SourceScanner(object):
         cpp_args += ['-E', '-C', '-I.', '-']
         cpp_args += self._cpp_options
 
+        # We expect the preprocessor to remove macros. If debugging is turned
+        # up high enough that won't happen, so strip these out. Bug #720504
+        for flag in ['-g3', '-ggdb3', '-gstabs3', '-gcoff3', '-gxcoff3', '-gvms3']:
+            try:
+                cpp_args.remove(flag)
+            except ValueError:
+                pass
+
         proc = subprocess.Popen(cpp_args,
                                 stdin=subprocess.PIPE,
                                 stdout=subprocess.PIPE)

data/vendor/local/lib/libgirepository-1.0.la

@@ -1,5 +1,5 @@
 # libgirepository-1.0.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -14,10 +14,10 @@ library_names='libgirepository-1.0.dll.a'
 old_library='libgirepository-1.0.a'
 
 # Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
+inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/gobject-introspection/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/../lib /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgio-2.0.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi -lz /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 -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.la -lpthread /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/../lib/libffi.la'
+dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/gobject-introspection/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/../lib /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgio-2.0.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi -lz /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 -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/../lib/libffi.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/pkgconfig/gobject-introspection-1.0.pc

@@ -23,4 +23,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.42.0
+Version: 1.44.0

data/vendor/local/lib/pkgconfig/gobject-introspection-no-export-1.0.pc

@@ -20,4 +20,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.42.0
+Version: 1.44.0

data/vendor/local/share/gir-1.0/GIRepository-2.0.gir

@@ -882,9 +882,45 @@ such as g_irepository_require() before calling this function.</doc>
 &lt;code&gt;namespace-version&lt;/code&gt;.
 
 Note: @namespace_ must have already been loaded using a function
-such as g_irepository_require() before calling this function.</doc>
+such as g_irepository_require() before calling this function.
+
+To get only the immediate dependencies for @namespace_, use
+g_irepository_get_immediate_dependencies().</doc>
+        <return-value transfer-ownership="full">
+          <doc xml:space="preserve">Zero-terminated string array of all versioned
+  dependencies</doc>
+          <array c:type="gchar**">
+            <type name="utf8"/>
+          </array>
+        </return-value>
+        <parameters>
+          <instance-parameter name="repository"
+                              transfer-ownership="none"
+                              nullable="1"
+                              allow-none="1">
+            <doc xml:space="preserve">A #GIRepository or %NULL for the singleton
+  process-global default #GIRepository</doc>
+            <type name="Repository" c:type="GIRepository*"/>
+          </instance-parameter>
+          <parameter name="namespace_" transfer-ownership="none">
+            <doc xml:space="preserve">Namespace of interest</doc>
+            <type name="utf8" c:type="const gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_immediate_dependencies"
+              c:identifier="g_irepository_get_immediate_dependencies"
+              version="1.44">
+        <doc xml:space="preserve">Return an array of the immediate versioned dependencies for @namespace_.
+Returned strings are of the form &lt;code&gt;namespace-version&lt;/code&gt;.
+
+Note: @namespace_ must have already been loaded using a function
+such as g_irepository_require() before calling this function.
+
+To get the transitive closure of dependencies for @namespace_, use
+g_irepository_get_dependencies().</doc>
         <return-value transfer-ownership="full">
-          <doc xml:space="preserve">Zero-terminated string array of versioned
+          <doc xml:space="preserve">Zero-terminated string array of immediate versioned
   dependencies</doc>
           <array c:type="gchar**">
             <type name="utf8"/>
@@ -979,15 +1015,16 @@ already been loaded before calling this function.</doc>
       </method>
       <method name="get_shared_library"
               c:identifier="g_irepository_get_shared_library">
-        <doc xml:space="preserve">This function returns the full path to the shared C library
-associated with the given namespace @namespace_. There may be no
-shared library path associated, in which case this function will
-return %NULL.
+        <doc xml:space="preserve">This function returns a comma-separated list of paths to the
+shared C libraries associated with the given namespace @namespace_.
+There may be no shared library path associated, in which case this
+function will return %NULL.
 
 Note: The namespace must have already been loaded using a function
 such as g_irepository_require() before calling this function.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:space="preserve">Full path to shared library, or %NULL if none associated</doc>
+          <doc xml:space="preserve">Comma-separated list of paths to shared libraries,
+  or %NULL if none are associated</doc>
           <type name="utf8" c:type="const gchar*"/>
         </return-value>
         <parameters>