[jhbuild] modulesets: Fix validation error after supporting ninjaargs

[Ting-Wei Lan <lantw src gnome org>]

commit a8c7dcd088558563211c513ab2ab54611446704a
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Sat Apr 21 12:14:59 2018 +0800

    modulesets: Fix validation error after supporting ninjaargs
    
    The commit which added support for ninjaargs did attempt to keep
    modulesets validated, but it looks like those changes were not tested
    with xmllint and trang before being committed.

 modulesets/moduleset.dtd |    9 ++++++---
 modulesets/moduleset.rnc |    6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/moduleset.dtd b/modulesets/moduleset.dtd
index ee8c88e..b8cd30d 100644
--- a/modulesets/moduleset.dtd
+++ b/modulesets/moduleset.dtd
@@ -106,20 +106,23 @@
        python3 CDATA   #FIXED "1"
        supports-non-srcdir-builds (yes|no) "yes">
 
+<!ELEMENT ninjaargs EMPTY>
+<!ATTLIST ninjaargs value CDATA #REQUIRED>
+
 <!ELEMENT cmake (if*,cmakeargs*,makeargs*,ninjaargs*,pkg-config?,branch?,dependencies?,suggests?,after?)>
 <!ATTLIST cmake
        id              CDATA   #REQUIRED
        cmakeargs       CDATA   #IMPLIED
        makeargs        CDATA   #IMPLIED
-        ninjaargs       CDATA   #IMPLIED
-        use-ninja (yes|no) "yes"
+       ninjaargs       CDATA   #IMPLIED
+       use-ninja (yes|no) "yes"
        supports-non-srcdir-builds (yes|no) "yes"
        force-non-srcdir-builds (yes|no) "no">
 
 <!ELEMENT cmakeargs EMPTY>
 <!ATTLIST cmakeargs value CDATA #REQUIRED>
 
-<!ELEMENT meson (if*,mesonargs*,makeargs*,pkg-config?,branch?,dependencies?,suggests?,after?)>
+<!ELEMENT meson (if*,mesonargs*,ninjaargs*,pkg-config?,branch?,dependencies?,suggests?,after?)>
 <!ATTLIST meson
        id              CDATA   #REQUIRED
        mesonargs       CDATA   #IMPLIED
diff --git a/modulesets/moduleset.rnc b/modulesets/moduleset.rnc
index 040da24..4522d55 100644
--- a/modulesets/moduleset.rnc
+++ b/modulesets/moduleset.rnc
@@ -151,7 +151,7 @@ attlist.distutils &=
   attribute python3 { "1" }?,
   attribute supports-non-srcdir-builds { "yes" | "no" }?
 cmakeargsif = element if { attlist.if & cmakeargsif* & cmakeargs* & makeargs* & ninjaargs* }
-cmake = element cmake { attlist.cmake, cmakeargsif*, cmakeargs*, makeargs*, pkg-config?, branch?, 
dependencieselements }
+cmake = element cmake { attlist.cmake, cmakeargsif*, cmakeargs*, makeargs*, ninjaargs*, pkg-config?, 
branch?, dependencieselements }
 attlist.cmake &=
   attribute id { text },
   attribute cmakeargs { text }?,
@@ -162,8 +162,10 @@ attlist.cmake &=
   attribute force-non-srcdir-builds { "yes" | "no" }?
 cmakeargs = element cmakeargs { attlist.cmakeargs }
 attlist.cmakeargs &= attribute value { text }
+ninjaargs = element ninjaargs { attlist.ninjaargs }
+attlist.ninjaargs &= attribute value { text }
 mesonargsif = element if { attlist.if & mesonargsif* & mesonargs* & ninjaargs* }
-meson = element meson { attlist.meson, mesonargsif*, mesonargs*, makeargs*, pkg-config?, branch?, 
dependencieselements }
+meson = element meson { attlist.meson, mesonargsif*, mesonargs*, ninjaargs*, pkg-config?, branch?, 
dependencieselements }
 attlist.meson &=
   attribute id { text },
   attribute mesonargs { text }?,