[gtk-osx] Build bison by default

[John Ralls <jralls src gnome org>]

commit 4fd272a7a4c884c336ba097bd44a40323095f1f6
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Oct 5 20:04:05 2014 -0700

    Build bison by default
    
    Recent versions of GStreamer require bison 2.4, and OSX has only 2.3 as
    of Mavericks.

 jhbuildrc-gtk-osx                                  |    1 -
 modulesets-stable/bootstrap.modules                |    6 +++---
 modulesets-stable/gtk-osx-gstreamer.modules        |    1 +
 ...r-706462-Make-grammar-y-work-with-Bison-3.patch |   20 ++++++++++++++++++++
 patches/patch status                               |    4 ++++
 5 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 52cbd3f..7639469 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -647,7 +647,6 @@ if not (os.environ.has_key ("LIBTOOLIZE") and os.environ["LIBTOOLIZE"]):
 if not _host_tiger:
     skip.append('make')
     skip.append('subversion')
-    skip.append('bison')
     skip.append('flex')
 
 # The option "headerpad_max_install_names" is there to leave some room for
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 5e55070..1777934 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -109,10 +109,10 @@
             module="pkg-config-0.25.tar.gz" version="0.25"/>
   </autotools>
 
-  <!-- 10.4 has 1.28 which is too old, 10.5 & 10.6 have 2.3 which is OK. -->
+  <!-- 10.5-10.9 have 2.3, gstreamer requires 2.4. -->
   <autotools id="bison" autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="bison/bison-2.6.3.tar.bz2"
-            version="2.6.3"/>
+    <branch repo="ftp.gnu.org" module="bison/bison-3.0.2.tar.xz"
+            version="3.0.2"/>
   </autotools>
 
   <!-- 10.4 has 2.5.4, too old for gstreamer (and probably others as well)
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index f213371..9da4fd7 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -36,6 +36,7 @@
     <branch module="gstreamer/0.10/gstreamer-0.10.35.tar.bz2" version="0.10.35"
             hash="sha256:817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-fix-includes-in-gstdatetime.patch"; 
strip="1"/>
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-706462-Make-grammar-y-work-with-Bison-3.patch";
 strip="1"/>
     </branch>
     <after>
       <dep package="glib"/>
diff --git a/patches/gstreamer-706462-Make-grammar-y-work-with-Bison-3.patch 
b/patches/gstreamer-706462-Make-grammar-y-work-with-Bison-3.patch
new file mode 100644
index 0000000..d157f88
--- /dev/null
+++ b/patches/gstreamer-706462-Make-grammar-y-work-with-Bison-3.patch
@@ -0,0 +1,20 @@
+diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
+index 24fc87b..7f9dd16 100644
+--- a/gst/parse/grammar.y
++++ b/gst/parse/grammar.y
+@@ -26,7 +26,6 @@
+  */
+ 
+ #define YYERROR_VERBOSE 1
+-#define YYLEX_PARAM scanner
+ 
+ #define YYENABLE_NLS 0
+ 
+@@ -648,6 +647,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s);
+ %right '.'
+ %left '!' '='
+ 
++%lex-param { void *scanner }
+ %parse-param { void *scanner }
+ %parse-param { graph_t *graph }
+ %pure-parser
diff --git a/patches/patch status b/patches/patch status
index ca7e15e..eb25a17 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -62,3 +62,7 @@ gjs:          gjs-Fix-uint-type-in-variable.patch Bug 712242, fixed in master.
 faad2:         faad2-2.7-ac-config-headers.patch
                Reported at https://sourceforge.net/p/faac/bugs/190/ but there hasn't
                been much activity in the last few years
+
+gstreamer:      gstreamer-fix-includes-in-gst-datetime.patch
+                gstreamer-706462-Make-grammar-y-work-with-Bison-3.patch
+                All fixed on 0.10 branch, only needed for modulesets-stable.