[gtk-osx] Move ragel to gtk-osx-bootstrap.modules and add it to modulesets-stable.

[John Ralls <jralls src gnome org>]

commit 354a96db69dc53f52898772c05524f34a4fec752
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 1 09:57:14 2016 -0800

    Move ragel to gtk-osx-bootstrap.modules and add it to modulesets-stable.
    
    It's a dependency of harfbuzz which is in gtk-osx-bootstrap.modules with the rest of 
meta-gtk-osx-freetype.

 modulesets-stable/gtk-osx-bootstrap.modules   |    9 +++++++++
 modulesets-unstable/gtk-osx-bootstrap.modules |   10 ++++++++++
 modulesets-unstable/gtk-osx.modules           |   10 +---------
 modulesets/gtk-osx-bootstrap.modules          |    9 +++++++++
 modulesets/gtk-osx.modules                    |    9 ---------
 5 files changed, 29 insertions(+), 18 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 822ec36..5726c5c 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -27,6 +27,8 @@
   <repository type="tarball" name="itstool" href="http://files.itstool.org/"/>
   <repository type="tarball" name="icu"
               href="http://download.icu-project.org/files/"/>
+  <repository type="tarball" name="ragel"
+              href="http://www.colm.net/files/ragel/"/>
 
   <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
     <branch version="1.6.17" module="libpng/libpng-1.6.17.tar.xz"
@@ -128,6 +130,12 @@
             module="icu4c/55.1/icu4c-55_1-src.tgz"/>
   </autotools>
 
+  <autotools id="ragel" autogen-sh='autoreconf'>
+    <branch repo="ragel" module="ragel-6.9.tar.gz" version="6.9">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/ragel-6.9-setiosflags.patch"; strip="1"/>
+    </branch>
+  </autotools>
+
   <autotools id="harfbuzz" autogen-sh="configure"
              autogenargs="--with-coretext --with-freetype --with-icu">
     <branch repo="harfbuzz" module="harfbuzz-0.9.40.tar.bz2" version="0.9.40">
@@ -135,6 +143,7 @@
     </branch>
     <dependencies>
       <dep package="freetype-no-harfbuzz"/>
+      <dep package="ragel"/>
       <dep package="glib"/>
       <dep package="icu"/>
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 5c51a72..60b9583 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -30,6 +30,9 @@
               href="http://download.icu-project.org/files/"/>
   <repository type="tarball" name="pypi"
               href="https://pypi.python.org/packages/source/"/>
+  <repository type="tarball" name="ragel"
+              href="http://www.colm.net/files/ragel/"/>
+
   <autotools id='readline' autogen-sh="configure">
     <branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
            version="6.3">
@@ -139,6 +142,13 @@
             module="icu4c/55.1/icu4c-55_1-src.tgz"/>
   </autotools>
 
+  <!-- Ragel, like Vala, isn't bootstrappable from git, so we might as well just use the tarball. -->
+  <autotools id="ragel" autogen-sh='autoreconf'>
+    <branch repo="ragel" module="ragel-6.9.tar.gz" version="6.9">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/ragel-6.9-setiosflags.patch"; strip="1"/>
+    </branch>
+  </autotools>
+
   <autotools id="harfbuzz" autogenargs="--with-coretext --with-icu">
     <branch repo="freedesktop" module="harfbuzz"/>
     <dependencies>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 3534525..2c1af94 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -7,8 +7,7 @@
   <repository type="git" name="github" href="git://github.com/"/>
   <repository type="git" name="freedesktop"
               href="git://anongit.freedesktop.org/git/"/>
-  <repository type="tarball" name="ragel"
-              href="http://www.colm.net/files/ragel/"/>
+
   <!-- This module set works a bit differently than for example the
        GNOME ones do. It's split up in seperate pieces:
 
@@ -205,13 +204,6 @@
     </after>
   </autotools>
 
-<!-- Ragel, like Vala, isn't bootstrappable from git, so we might as well just use the tarball. -->
-  <autotools id="ragel" autogen-sh='autoreconf'>
-    <branch repo="ragel" module="ragel-6.9.tar.gz" version="6.9">
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/ragel-6.9-setiosflags.patch"; strip="1"/>
-    </branch>
-  </autotools>
-
   <autotools id="gtk-mac-integration" autogenargs="--disable-python">
     <branch/>
     <after>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index f6f60e7..79a7fe2 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -27,6 +27,8 @@
   <repository type="git" name="github" href="https://github.com/"/>
   <repository type="tarball" name="icu"
               href="http://download.icu-project.org/files/"/>
+  <repository type="tarball" name="ragel"
+              href="http://www.colm.net/files/ragel/"/>
 
   <autotools id='readline' autogen-sh="configure">
     <branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
@@ -130,6 +132,13 @@
             module="icu4c/55.1/icu4c-55_1-src.tgz"/>
   </autotools>
 
+  <!-- Ragel, like Vala, isn't bootstrappable from git, so we might as well just use the tarball. -->
+  <autotools id="ragel" autogen-sh='autoreconf'>
+    <branch repo="ragel" module="ragel-6.9.tar.gz" version="6.9">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/ragel-6.9-setiosflags.patch"; strip="1"/>
+    </branch>
+  </autotools>
+
   <autotools id="harfbuzz"
              autogenargs="--with-coretext --with-freetype --with-icu">
     <branch repo="freedesktop" tag="0.9.40"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 0276202..1d0c431 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -7,8 +7,6 @@
   <repository type="git" name="github" href="git://github.com/"/>
   <repository type="git" name="freedesktop"
               href="git://anongit.freedesktop.org/git/"/>
-  <repository type="tarball" name="ragel"
-              href="http://www.colm.net/files/ragel/"/>
 
   <!-- This module set works a bit differently than for example the
        GNOME ones do. It's split up in seperate pieces:
@@ -194,13 +192,6 @@
     </after>
   </autotools>
 
-  <!-- Ragel, like Vala, isn't bootstrappable from git, so we might as well just use the tarball. -->
-  <autotools id="ragel" autogen-sh='autoreconf'>
-    <branch repo="ragel" module="ragel-6.9.tar.gz" version="6.9">
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/ragel-6.9-setiosflags.patch"; strip="1"/>
-    </branch>
-  </autotools>
-
   <autotools id="gtk-mac-integration" autogenargs="--disable-python">
 <!--gtk-mac-integration releases from master"-->
     <branch />