anvil-editor: init at 0.4
[NixPkgs.git] / pkgs / applications / misc / golden-cheetah / 0001-Fix-building-with-bison-3.7.patch
blobf410d0f18b2bffa77a049a1c625503035265fc44
1 diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y
2 index 30070f131..15f746a10 100644
3 --- a/src/Core/DataFilter.y
4 +++ b/src/Core/DataFilter.y
5 @@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement
7 %}
9 +// generated by the scanner
10 +%define api.header.include {"DataFilter_yacc.h"}
12 // Symbol can be meta, metric, variable or function name
13 %token <string> SYMBOL PYTHON
15 diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y
16 index d6da086bd..f2001e23c 100644
17 --- a/src/Core/RideDB.y
18 +++ b/src/Core/RideDB.y
19 @@ -40,6 +40,8 @@ void RideDBerror(void*jc, const char *error) // used by parser aka yyerror()
20 #define scanner jc->scanner
23 +// generated by the scanner
24 +%define api.header.include {"RideDB_yacc.h"}
26 %pure-parser
27 %lex-param { void *scanner }
28 diff --git a/src/FileIO/JsonRideFile.y b/src/FileIO/JsonRideFile.y
29 index 2cbbef9fc..d5c77a779 100644
30 --- a/src/FileIO/JsonRideFile.y
31 +++ b/src/FileIO/JsonRideFile.y
32 @@ -106,6 +106,9 @@ static QString protect(const QString string)
36 +// generated by the scanner
37 +%define api.header.include {"JsonRideFile_yacc.h"}
39 %pure-parser
40 %lex-param { void *scanner }
41 %parse-param { struct JsonContext *jc }
42 diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in
43 index a280bbb6b..07e543372 100644
44 --- a/src/gcconfig.pri.in
45 +++ b/src/gcconfig.pri.in
46 @@ -75,10 +75,10 @@
48 # Let us know where flex and bison are installed.
49 # You may need to specify the full path if things don't work.
50 -#QMAKE_LEX = flex
51 -#QMAKE_YACC = bison
52 +QMAKE_LEX = flex
53 +QMAKE_YACC = bison
54 # If you are using bison 3.7 or higher, uncomment the line below
55 -#QMAKE_MOVE = cp
56 +QMAKE_MOVE = cp
57 # If you're compiling with nmake and VC then you
58 # will likely also use win_flex and win_bison
59 # so uncomment below