diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-04-29 11:47:52 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-04-29 11:47:52 +0000 |
| commit | 41a25ca823a97de5bd392386762bf8854db808ca (patch) | |
| tree | b8f03c7c1cc678129291353658fc7c44426d6e2f /gnome-base/libgnomeprint | |
| parent | Bump to version 1.11, bug #504578. (diff) | |
| download | gentoo-2-41a25ca823a97de5bd392386762bf8854db808ca.tar.gz gentoo-2-41a25ca823a97de5bd392386762bf8854db808ca.tar.bz2 gentoo-2-41a25ca823a97de5bd392386762bf8854db808ca.zip | |
Fix compilation with >=sys-devel/bison-3.0 (bug #486408)
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'gnome-base/libgnomeprint')
| -rw-r--r-- | gnome-base/libgnomeprint/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch | 39 | ||||
| -rw-r--r-- | gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild | 7 |
3 files changed, 49 insertions, 4 deletions
diff --git a/gnome-base/libgnomeprint/ChangeLog b/gnome-base/libgnomeprint/ChangeLog index 9492bf3f13e1..d4dc5c992b12 100644 --- a/gnome-base/libgnomeprint/ChangeLog +++ b/gnome-base/libgnomeprint/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/libgnomeprint # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.196 2014/03/17 23:44:49 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.197 2014/04/29 11:47:51 polynomial-c Exp $ + + 29 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> + libgnomeprint-2.18.8.ebuild, +files/libgnomeprint-2.18.8-bison3.patch: + Fix compilation with >=sys-devel/bison-3.0 (bug #486408) with kind permission + from gnome team. 17 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org> libgnomeprint-2.18.8.ebuild, files/libgnomeprint-2.18.8-freetype-2.5.1.patch: diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch new file mode 100644 index 000000000000..d9fbbdd84fb9 --- /dev/null +++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch @@ -0,0 +1,39 @@ +http://git.pld-linux.org/gitweb.cgi?p=packages/libgnomeprint.git;a=blob;f=bison3.patch + +--- 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; + } diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild index f60dcb57034e..4f6c54a60817 100644 --- a/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild +++ b/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild,v 1.13 2014/03/17 23:44:49 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild,v 1.14 2014/04/29 11:47:52 polynomial-c Exp $ EAPI="3" GCONF_DEBUG="no" @@ -44,8 +44,9 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-stdio-include.patch - epatch "${FILESDIR}"/${P}-freetype-2.5.1.patch + epatch "${FILESDIR}"/${P}-stdio-include.patch \ + "${FILESDIR}"/${P}-freetype-2.5.1.patch \ + "${FILESDIR}"/${P}-bison3.patch eautoreconf gnome2_src_prepare |