Add patches for Doxygen and GObject introspection to improve compatibility with Yacc

This commit is contained in:
2026-07-17 07:45:45 -05:00
parent 4f914253b7
commit 94aeb45fa6
3 changed files with 122 additions and 33 deletions
@@ -0,0 +1,39 @@
--- a/giscanner/meson.build
+++ b/giscanner/meson.build
@@ -55,12 +55,12 @@
subdir('doctemplates/mallard')
flex = find_program('flex', 'win_flex')
-bison = find_program('bison', 'win_bison')
+yacc = find_program('yacc', 'bison', 'win_bison')
scannerparser = custom_target('scannerparser',
input: 'scannerparser.y',
output: ['scannerparser.c', 'scannerparser.h'],
- command: [bison, '@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@']
+ command: [yacc, '-d', '-o', '@OUTPUT0@', '@INPUT@']
)
--- a/giscanner/scannerparser.y
+++ b/giscanner/scannerparser.y
@@ -250,7 +250,7 @@
%}
-%define parse.error verbose
+%error-verbose
%union {
char *str;
GList *list;
@@ -266,8 +266,8 @@
%lex-param { GISourceScanner* scanner }
%token <str> BASIC_TYPE
-%token <str> IDENTIFIER "identifier"
-%token <str> TYPEDEF_NAME "typedef-name"
+%token <str> IDENTIFIER
+%token <str> TYPEDEF_NAME
%token INTEGER FLOATING BOOLEAN CHARACTER STRING