[lfs-patches] r2823 - trunk/netsurf

igor at higgs.linuxfromscratch.org igor at higgs.linuxfromscratch.org
Wed Jan 15 08:34:06 PST 2014


Author: igor
Date: Wed Jan 15 08:34:06 2014
New Revision: 2823

Log:
netsurf with bison >= 2.6 fix

Added:
   trunk/netsurf/
   trunk/netsurf/netsurf-3.0-bison2.6-1.patch

Added: trunk/netsurf/netsurf-3.0-bison2.6-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/netsurf/netsurf-3.0-bison2.6-1.patch	Wed Jan 15 08:34:06 2014	(r2823)
@@ -0,0 +1,46 @@
+Submitted By:            Igor Živković <contact at igor-zivkovic.from.hr>
+Date:                    2014-01-15
+Initial Package Version: 3.0
+Upstream Status:         Fixed
+Origin:                  Upstream
+Description:             Fixes building the lexers with bison versions at and after 2.6.
+
+diff -Naur netsurf-full-3.0.orig/src/nsgenbind-0.0.1/src/nsgenbind-lexer.l netsurf-full-3.0/src/nsgenbind-0.0.1/src/nsgenbind-lexer.l
+--- netsurf-full-3.0.orig/src/nsgenbind-0.0.1/src/nsgenbind-lexer.l	2013-04-18 23:59:18.000000000 +0200
++++ netsurf-full-3.0/src/nsgenbind-0.0.1/src/nsgenbind-lexer.l	2014-01-15 17:01:48.671826076 +0100
+@@ -19,6 +19,16 @@
+     yylloc->first_column = yylloc->last_column + 1; \
+     yylloc->last_column += yyleng;
+ 
++
++/* Ensure compatability with bison 2.6 and later */
++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined NSGENBIND_STYPE_IS_DECLARED
++#define YYSTYPE NSGENBIND_STYPE
++#endif
++
++#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined NSGENBIND_LTYPE_IS_DECLARED
++#define YYLTYPE NSGENBIND_LTYPE
++#endif
++
+ %}
+ 
+ /* lexer options */
+diff -Naur netsurf-full-3.0.orig/src/nsgenbind-0.0.1/src/webidl-lexer.l netsurf-full-3.0/src/nsgenbind-0.0.1/src/webidl-lexer.l
+--- netsurf-full-3.0.orig/src/nsgenbind-0.0.1/src/webidl-lexer.l	2013-04-18 23:59:18.000000000 +0200
++++ netsurf-full-3.0/src/nsgenbind-0.0.1/src/webidl-lexer.l	2014-01-15 17:01:48.671826076 +0100
+@@ -27,6 +27,15 @@
+     yylloc->first_column = yylloc->last_column + 1; \
+     yylloc->last_column += yyleng;
+ 
++/* Ensure compatability with bison 2.6 and later */
++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined WEBIDL_STYPE_IS_DECLARED
++#define YYSTYPE WEBIDL_STYPE
++#endif
++
++#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined WEBIDL_LTYPE_IS_DECLARED
++#define YYLTYPE WEBIDL_LTYPE
++#endif
++
+ %}
+ 
+ 



More information about the patches mailing list