[gtk-osx: 4/5] Harmonize python across all modulesets.

[John Ralls <jralls src gnome org>]

commit 473546115521eaddad97dc4f2fecb2f8abfa4b41
Author: John Ralls <jralls ceridwen us>
Date:   Fri Dec 12 12:50:52 2014 -0800

    Harmonize python across all modulesets.
    
    And patch dumb typo in Python-2.7.8

 modulesets-stable/gtk-osx-python.modules        |    1 +
 modulesets-unstable/gtk-osx-python.modules      |   10 +++++++++-
 modulesets/gtk-osx-python.modules               |    9 ++++++++-
 patches/python-2.7.8-test_grammar.py-typo.patch |   16 ++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 829a470..8e0ab20 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -72,6 +72,7 @@
             autogen-sh="configure" supports-non-srcdir-builds="no">
     <branch repo="python"
            module="2.7.8/Python-2.7.8.tar.xz" version="2.7.8">
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/python-2.7.8-test_grammar.py-typo.patch"; skip="1"/>
     </branch>
     <dependencies>
       <dep package="gettext-runtime"/>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index ec522e4..1ede3a9 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -42,13 +42,17 @@
       <patch file="https://github.com/narkoleptik/os-x-berkeleydb-patch/raw/master/atomic.patch"; strip='1'/>
     </branch>
   </autotools>
+
 <!-- Python-2.7.5's hashlib doesn't build correctly with gcc-4.2, though it does fine with Clang (and 
probably later gccs as well). -->
   <autotools id="python2.7" autogenargs="--enable-shared"
             autogen-sh="configure">
     <branch repo="python"
-           module="2.7.6/Python-2.7.6.tar.xz" version="2.7.6">
+           module="2.7.8/Python-2.7.8.tar.xz" version="2.7.8">
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/python-2.7.8-test_grammar.py-typo.patch"; skip="1"/>
     </branch>
     <dependencies>
+      <dep package="gettext-runtime"/>
+      <dep package='readline'/>
     </dependencies>
     <after>
       <dep package="berkeleydb4.8"/>
@@ -71,6 +75,10 @@
     <branch repo="python"
            module="3.3.2/Python-3.3.2.tar.xz" version="3.3.2">
     </branch>
+    <dependencies>
+      <dep package="gettext-runtime"/>
+      <dep package='readline'/>
+    </dependencies>
     <after>
       <dep package="berkeleydb5.0"/>
     </after>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index c291ead..394a2da 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -49,9 +49,12 @@
   <autotools id="python" autogenargs="--enable-shared"
             autogen-sh="configure">
     <branch repo="python"
-           module="2.7.6/Python-2.7.6.tar.xz" version="2.7.6">
+           module="2.7.8/Python-2.7.8.tar.xz" version="2.7.8">
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/python-2.7.8-test_grammar.py-typo.patch"; skip="1"/>
     </branch>
     <dependencies>
+      <dep package="gettext-runtime"/>
+      <dep package='readline'/>
     </dependencies>
     <after>
       <dep package="berkeleydb"/>
@@ -60,6 +63,10 @@
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
     <branch repo="python" module="3.3.0/Python-3.3.0.tar.xz" version="3.3.0"/>
+    <dependencies>
+      <dep package="gettext-runtime"/>
+      <dep package='readline'/>
+    </dependencies>
     <after>
       <dep package="berkeleydb"/>
     </after>
diff --git a/patches/python-2.7.8-test_grammar.py-typo.patch b/patches/python-2.7.8-test_grammar.py-typo.patch
new file mode 100644
index 0000000..dbe74a6
--- /dev/null
+++ b/patches/python-2.7.8-test_grammar.py-typo.patch
@@ -0,0 +1,16 @@
+
+--- a/lib/test/test_grammar.py Sun Jun 29 19:05:34 2014
++++ b/lib/test/test_grammar.py Fri Dec 12 10:30:26 2014
+@@ -77,8 +77,8 @@
+ 
+     def test_float_exponent_tokenization(self):
+         # See issue 21642.
+-        self.assertEqual(1 if 1else 0, 1)
+-        self.assertEqual(1 if 0else 0, 0)
++        self.assertEqual(1 if 1 else 0, 1)
++        self.assertEqual(1 if 0 else 0, 0)
+         self.assertRaises(SyntaxError, eval, "0 if 1Else 0")
+ 
+     def testStringLiterals(self):
+
+Diff finished.  Fri Dec 12 12:40:15 2014