[gtk-osx] Update the jhbuild version to recent master.

[John Ralls <jralls src gnome org>]

commit 50fba0a201b2f7101c2472d047ff52897785ada0
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sun Feb 21 13:28:11 2016 -0800

    Update the jhbuild version to recent master.
    
    * Remove the autoreconf patch which is already upstream
    * Update the bootstrap module to work with the newer jhbuild
    * set disable_Werror to False, it breaks zlib's build.

 gtk-osx-build-setup.sh                             |    1 -
 jhbuild-revision                                   |    2 +-
 jhbuildrc-gtk-osx                                  |    1 +
 modulesets-stable/bootstrap.modules                |   42 ++++--
 ...autoreconf-i-fails-in-cases-of-ltmain.sh-.patch |  168 --------------------
 5 files changed, 33 insertions(+), 181 deletions(-)
---
diff --git a/gtk-osx-build-setup.sh b/gtk-osx-build-setup.sh
index 9dff699..24a4a29 100755
--- a/gtk-osx-build-setup.sh
+++ b/gtk-osx-build-setup.sh
@@ -80,7 +80,6 @@ else
        do_exit "Update of jhbuild failed";
     mv modulesets/bootstrap.modules modulesets/bootstrap.modules.dist;
 fi
-curl -ks 
https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-700557-autoreconf-i-fails-in-cases-of-ltmain.sh-.patch
 | git am
 
 echo "Installing jhbuild..."
 if [ -e "$SOURCE/jhbuild/autogen.sh" ]; then
diff --git a/jhbuild-revision b/jhbuild-revision
index a5840d4..c0625ac 100644
--- a/jhbuild-revision
+++ b/jhbuild-revision
@@ -1 +1 @@
-07b5a7d
+7c8d34736c3804
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 95e93a7..3ac07fe 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -548,6 +548,7 @@ if os.path.exists(_userrc):
 # builds, for example.
 #
 _build = os.environ.get('JHB', _gtk_osx_default_build)
+disable_Werror = False
 
 ###### Everything Below Uses (and Overrides) customizations! #######
 
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 52de494..572c101 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -21,7 +21,7 @@
   <repository type="tarball" name="intltool"
               href="http://launchpad.net/intltool/trunk/"/>
 
-  <autotools id="make">
+  <autotools id="make" bootstrap="true">
     <branch repo="ftp.gnu.org" module="make/make-3.82.tar.gz" version="3.82"/>
   </autotools>
 
@@ -39,7 +39,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="xz" autogen-sh="configure">
+  <autotools id="xz" autogen-sh="configure" bootstrap="true">
     <branch repo="tukaani.org" module="xz/xz-5.2.1.tar.bz2" version="5.2.1"/>
   </autotools>
 
@@ -77,53 +77,72 @@
     </branch>
   </autotools>
 
-  <autotools id="m4" autogen-sh="configure">
+  <autotools id="m4" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
             module="m4/m4-1.4.17.tar.xz" version="1.4.17"/>
   </autotools>
 
-  <autotools id="autoconf" autogen-sh="configure">
+  <autotools id="autoconf" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
             module="autoconf/autoconf-2.69.tar.xz" version="2.69"/>
     <dependencies>
+      <dep package="xz"/>
       <dep package="m4"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libtool" autogen-sh="configure">
+  <autotools id="libtool" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
             module="libtool/libtool-2.4.6.tar.gz" version="2.4.6"/>
   </autotools>
 
-  <autotools id="automake-1.10" autogen-sh="configure">
+  <autotools id="automake-1.10" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
             module="automake/automake-1.10.3.tar.bz2" version="1.10.3"
             size="957505" md5sum="b8e67fb458da396bc35555af7ef2b49f" />
+    <dependencies>
+      <dep package="autoconf"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="automake-1.11" autogen-sh="configure">
+  <autotools id="automake-1.11" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
             module="automake/automake-1.11.6.tar.xz" version="1.11.6"/>
+    <dependencies>
+      <dep package="autoconf"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="automake-1.12" autogen-sh="configure">
+  <autotools id="automake-1.12" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
             module="automake/automake-1.12.6.tar.xz" version="1.12.6"/>
+    <dependencies>
+      <dep package="autoconf"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="automake-1.13" autogen-sh="configure">
+  <autotools id="automake-1.13" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
             module="automake/automake-1.13.4.tar.xz" version="1.13.4"/>
+    <dependencies>
+      <dep package="autoconf"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="automake-1.14" autogen-sh="configure">
+  <autotools id="automake-1.14" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org" version="1.14.1"
             module="automake/automake-1.14.1.tar.xz"/>
+    <dependencies>
+      <dep package="autoconf"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="automake" autogen-sh="configure">
+  <autotools id="automake" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org" version="1.15"
             module="automake/automake-1.15.tar.gz"/>
+    <dependencies>
+      <dep package="autoconf"/>
+    </dependencies>
   </autotools>
 
   <autotools id="pkg-config" autogen-sh="configure"
@@ -208,6 +227,7 @@
       <dep package="make"/>     <!-- Needed for Tiger, skipped otherwise -->
       <dep package="subversion"/>   <!-- Needed for Tiger, skipped otherwise -->
       <dep package="gettext-tools" /> <!-- Needed for 64-bit -->
+      <dep package="readline" />
       <dep package="bash" />  <!-- Needed for El Cap and later to work around SIP. -->
       <dep package="cmake"/>
       <dep package="m4"/>      <!-- Can be skipped for Leopard and later -->