[packages/libgnomeprint] - fix building with bison 3.0
baggins
baggins at pld-linux.org
Sun Nov 3 21:46:19 CET 2013
commit e608d29a8482f4930937344133d5285f206314e1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Nov 3 21:46:04 2013 +0100
- fix building with bison 3.0
bison3.patch | 37 +++++++++++++++++++++++++++++++++++++
libgnomeprint.spec | 2 ++
2 files changed, 39 insertions(+)
---
diff --git a/libgnomeprint.spec b/libgnomeprint.spec
index 8a9975b..ffbb215 100644
--- a/libgnomeprint.spec
+++ b/libgnomeprint.spec
@@ -13,6 +13,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.18/%{name}-%{ver
# Source0-md5: 63b05ffb5386e131487c6af30f4c56ac
Patch0: %{name}-includes.patch
Patch1: %{name}-papi.patch
+Patch2: bison3.patch
URL: http://www.gnome.org/
BuildRequires: autoconf >= 2.52
BuildRequires: automake >= 1:1.7.2
@@ -144,6 +145,7 @@ Moduł PAPI dla libgnomeprint.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
CPPFLAGS="%{rpmcppflags}%{?with_papi: -I/usr/include/papi}"
diff --git a/bison3.patch b/bison3.patch
new file mode 100644
index 0000000..bb04cdf
--- /dev/null
+++ b/bison3.patch
@@ -0,0 +1,37 @@
+--- libgnomeprint-2.18.8/libgnomeprint/grammar.y.orig 2010-02-09 13:32:51.000000000 +0100
++++ libgnomeprint-2.18.8/libgnomeprint/grammar.y 2013-11-03 21:44:59.859877696 +0100
+@@ -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 @@
+ }
+
+ static int yylex (void *lvalp);
+-static int yyerror (const char *s);
++static int yyerror (graph_t *g, const char *s);
+ %}
+
+ %union {
+@@ -117,6 +115,7 @@
+ %type <p> pool
+
+ %pure_parser
++%parse-param { graph_t *graph }
+
+ %start graph
+ %%
+@@ -185,7 +184,7 @@
+ %%
+
+ static int
+-yyerror (const char *s)
++yyerror (graph_t *g, const char *s)
+ {
+ return -1;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgnomeprint.git/commitdiff/e608d29a8482f4930937344133d5285f206314e1
More information about the pld-cvs-commit
mailing list