metadata: Fix move node expressions into custom classes (bgo#761326)
authorStephan Sundermann <ssundermann@gnome.org>
Wed, 27 Apr 2016 13:59:04 +0000 (15:59 +0200)
committerStephan Sundermann <ssundermann@gnome.org>
Wed, 27 Apr 2016 13:59:04 +0000 (15:59 +0200)
XPath matching seems to have changed somewhere between mono 3.2.3 and
4.x. This patch makes sure that all Global object tags are properly
visited when moving methods from the global class into custom ones.

sources/gstreamer-sharp.metadata

index 158d66bdbc9b9ceedbed835192837e978beeddbb..25957b7b0a3c59eeff4599a7900831d6ca99548b 100644 (file)
@@ -86,36 +86,36 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
        <add-node path="/api/namespace[@name='Gst']">
                <class name="Parse" cname="GstParse" disable_void_ctor="1"/>
        </add-node>
-       <move-node path="/api/namespace/object[@name='Global']//method[starts-with(@cname, 'gst_parse')]">/api/namespace/class[@name='Parse']</move-node>
+       <move-node path="/api/namespace//object[@name='Global']//method[starts-with(@cname, 'gst_parse')]">/api/namespace/class[@name='Parse']</move-node>
 
        <add-node path="/api/namespace[@name='Gst']">
                <class name="Debug" cname="GstDebug" disable_void_ctor="1"/>
        </add-node>
-       <move-node path="/api/namespace/object[@name='Global']//method[starts-with(@cname, 'gst_debug')]">/api/namespace/class[@cname='GstDebug']</move-node>
+       <move-node path="/api/namespace//object[@name='Global']//method[starts-with(@cname, 'gst_debug')]">/api/namespace/class[@cname='GstDebug']</move-node>
 
        <add-node path="/api/namespace[@name='Gst']">
                <class name="Application" cname="GstApplication" disable_void_ctor="1"/>
        </add-node>
-       <move-node path="/api/namespace/object[@name='Global']//method[contains(@cname, 'init') or starts-with(@cname, 'gst_version')]">/api/namespace/class[@cname='GstApplication']</move-node>
+       <move-node path="/api/namespace//object[@name='Global']//method[contains(@cname, 'init') or starts-with(@cname, 'gst_version')]">/api/namespace/class[@cname='GstApplication']</move-node>
 
        <add-node path="/api/namespace[@name='Gst']">
                <class name="Value" cname="GstValue" disable_void_ctor="1"/>
        </add-node>
-       <move-node path="/api/namespace/object[@name='Global']//method[starts-with(@cname, 'gst_value')]">/api/namespace/class[@cname='GstValue']</move-node>
+       <move-node path="/api/namespace//object[@name='Global']//method[starts-with(@cname, 'gst_value')]">/api/namespace/class[@cname='GstValue']</move-node>
 
        <add-node path="/api/namespace[@name='Gst']">
                <class name="Tag" cname="GstTag" disable_void_ctor="1"/>
        </add-node>
-       <move-node path="/api/namespace/object[@name='Global']//method[starts-with(@cname, 'gst_tag')]">/api/namespace/class[@cname='GstTag']</move-node>
+       <move-node path="/api/namespace//object[@name='Global']//method[starts-with(@cname, 'gst_tag')]">/api/namespace/class[@cname='GstTag']</move-node>
 
        <add-node path="/api/namespace[@name='Gst']">
                <class name="Util" cname="GstUtil" disable_void_ctor="1"/>
        </add-node>
-       <move-node path="/api/namespace/object[@name='Global']//method[starts-with(@cname, 'gst_format') or starts-with(@cname, 'gst_uri') or starts-with(@cname, 'gst_util') or @cname='gst_filename_to_uri']">/api/namespace/class[@cname='GstUtil']</move-node>
+       <move-node path="/api/namespace//object[@name='Global']//method[starts-with(@cname, 'gst_format') or starts-with(@cname, 'gst_uri') or starts-with(@cname, 'gst_util') or @cname='gst_filename_to_uri']">/api/namespace/class[@cname='GstUtil']</move-node>
 
-       <move-node path="/api/namespace/object[@name='Global']//method[contains(@cname, 'registry')]">/api/namespace/object[@cname='GstRegistry']</move-node>
-       <move-node path="/api/namespace/object[@name='Global']//method[starts-with(@cname, 'gst_poll')]">/api/namespace/struct[@cname='GstPoll']</move-node>
-       <move-node path="/api/namespace/object[@name='Global']//method[starts-with(@cname, 'gst_pad')]">/api/namespace/object[@cname='GstPad']</move-node>
+       <move-node path="/api/namespace//object[@name='Global']//method[contains(@cname, 'registry')]">/api/namespace/object[@cname='GstRegistry']</move-node>
+       <move-node path="/api/namespace//object[@name='Global']//method[starts-with(@cname, 'gst_poll')]">/api/namespace/struct[@cname='GstPoll']</move-node>
+       <move-node path="/api/namespace//object[@name='Global']//method[starts-with(@cname, 'gst_pad')]">/api/namespace/object[@cname='GstPad']</move-node>
 
        <!-- Things implemented on our own -->
        <attr path="/api/namespace/boxed[@cname='GstMessage']/method[@cname='gst_message_parse_error']" name="hidden">true</attr>