Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/libgnomeprint/files: libgnomeprint-2.18.8-bison3.patch
Date: Tue, 29 Apr 2014 11:47:56
Message-Id: 20140429114752.746E22004C@flycatcher.gentoo.org
1 polynomial-c 14/04/29 11:47:52
2
3 Added: libgnomeprint-2.18.8-bison3.patch
4 Log:
5 Fix compilation with >=sys-devel/bison-3.0 (bug #486408)
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
8
9 Revision Changes Path
10 1.1 gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch?rev=1.1&content-type=text/plain
14
15 Index: libgnomeprint-2.18.8-bison3.patch
16 ===================================================================
17 http://git.pld-linux.org/gitweb.cgi?p=packages/libgnomeprint.git;a=blob;f=bison3.patch
18
19 --- libgnomeprint-2.18.8/libgnomeprint/grammar.y.orig 2010-02-09 13:32:51.000000000 +0100
20 +++ libgnomeprint-2.18.8/libgnomeprint/grammar.y 2013-11-03 21:44:59.859877696 +0100
21 @@ -6,8 +6,6 @@
22 #include <libgnomeprint/types.h>
23 #include <libgnomeprint/gnome-print-filter.h>
24
25 -#define YYPARSE_PARAM graph
26 -
27 static void
28 set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s)
29 {
30 @@ -99,7 +97,7 @@
31 }
32
33 static int yylex (void *lvalp);
34 -static int yyerror (const char *s);
35 +static int yyerror (graph_t *g, const char *s);
36 %}
37
38 %union {
39 @@ -117,6 +115,7 @@
40 %type <p> pool
41
42 %pure_parser
43 +%parse-param { graph_t *graph }
44
45 %start graph
46 %%
47 @@ -185,7 +184,7 @@
48 %%
49
50 static int
51 -yyerror (const char *s)
52 +yyerror (graph_t *g, const char *s)
53 {
54 return -1;
55 }