[libgnomeprint22] Fix building with the new bison

[mkasik]

commit 89741ad310916a285c97d8fec11d1d7fcf1dc695
Author: Marek Kasik <mkasik at redhat.com>
Date:   Tue Jun 10 16:40:16 2014 +0200

    Fix building with the new bison
    
    Resolves: #1106017

 libgnomeprint22-2.18.8-bison.patch |   38 ++++++++++++++++++++++++++++++++++++
 libgnomeprint22.spec               |    8 ++++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/libgnomeprint22-2.18.8-bison.patch b/libgnomeprint22-2.18.8-bison.patch
new file mode 100644
index 0000000..fec9768
--- /dev/null
+++ b/libgnomeprint22-2.18.8-bison.patch
@@ -0,0 +1,38 @@
+--- libgnomeprint-2.18.8/libgnomeprint/grammar.y
++++ libgnomeprint-2.18.8/libgnomeprint/grammar.y
+@@ -6,8 +6,6 @@
+ #include <libgnomeprint/types.h>
+ #include <libgnomeprint/gnome-print-filter.h>
+ 
+-#define YYPARSE_PARAM graph
+-
+ static void
+ set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s)
+ {
+@@ -99,7 +97,7 @@ gnome_print_filter_parse_prop (GnomePrin
+ }
+ 
+ static int yylex (void *lvalp);
+-static int yyerror (const char *s);
++static int yyerror (graph_t *graph, const char *s);
+ %}
+ 
+ %union {
+@@ -116,6 +114,8 @@ static int yyerror (const char *s);
+ %type <f> filter
+ %type <p> pool
+ 
++%parse-param {graph_t *graph}
++
+ %pure_parser
+ 
+ %start graph
+@@ -185,7 +185,7 @@ graph: filter {
+ %%
+ 
+ static int
+-yyerror (const char *s)
++yyerror (graph_t *graph, const char *s)
+ {
+ 	return -1;
+ }
diff --git a/libgnomeprint22.spec b/libgnomeprint22.spec
index 7cf357d..f047144 100644
--- a/libgnomeprint22.spec
+++ b/libgnomeprint22.spec
@@ -3,13 +3,14 @@
 Summary: Printing library for GNOME
 Name:  libgnomeprint22
 Version: 2.18.8
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+ and BSD
 # BSD applies to ttsubset code that was taken from STSF
 Group:          System Environment/Base
 Source:  http://download.gnome.org/sources/libgnomeprint/2.18/libgnomeprint-%{version}.tar.bz2
 URL:            http://www.gnome.org
 Patch0:  libgnomeprint22-stdio.patch
+Patch1:  libgnomeprint22-2.18.8-bison.patch
 
 Requires: urw-fonts
 Requires: ghostscript
@@ -60,6 +61,7 @@ want to use the GNOME desktop environment.
 %prep
 %setup -q -n libgnomeprint-%{version}
 %patch0 -p1 -b .stdio
+%patch1 -p1 -b .bison
 
 # Convert to utf-8
 for file in NEWS; do
@@ -99,6 +101,10 @@ find $RPM_BUILD_ROOT -name *.la -exec rm {} \;
 %{_datadir}/gtk-doc/html/libgnomeprint
 
 %changelog
+* Tue Jun 10 2014 Marek Kasik <mkasik at redhat.com> - 2.18.8-10
+- Fix building with the new bison
+- Resolves: #1106017
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.18.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild