diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-05-01 15:03:30 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-01 15:03:30 +0200 |
commit | bf4af30bb2bce9dd5baf91f313ea35c55893eb10 (patch) | |
tree | 94aa42278cd88cb50304e7fe34854399fc5255af /gnu/packages/patches/gstreamer-0.10-bison3.patch | |
parent | 9e63a388d91f73e2b82f8c4688f131680fe5f165 (diff) | |
parent | bc7d089a9cb5ce843730f863cc03195168a956b9 (diff) | |
download | guix-bf4af30bb2bce9dd5baf91f313ea35c55893eb10.tar guix-bf4af30bb2bce9dd5baf91f313ea35c55893eb10.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/gstreamer-0.10-bison3.patch')
-rw-r--r-- | gnu/packages/patches/gstreamer-0.10-bison3.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/gnu/packages/patches/gstreamer-0.10-bison3.patch b/gnu/packages/patches/gstreamer-0.10-bison3.patch deleted file mode 100644 index f6eb90cb02..0000000000 --- a/gnu/packages/patches/gstreamer-0.10-bison3.patch +++ /dev/null @@ -1,32 +0,0 @@ -See https://bugzilla.gnome.org/show_bug.cgi?id=706462 - -Subject: [PATCH] Make grammar.y work with Bison 3 - -YYLEX_PARAM is no longer supported in Bison 3. ---- - gst/parse/grammar.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y -index 8a9019c..f533389 100644 ---- a/gst/parse/grammar.y -+++ b/gst/parse/grammar.y -@@ -26,7 +26,6 @@ - */ - - #define YYERROR_VERBOSE 1 --#define YYLEX_PARAM scanner - - #define YYENABLE_NLS 0 - -@@ -659,6 +658,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s); - %right '.' - %left '!' '=' - -+%lex-param { void *scanner } - %parse-param { void *scanner } - %parse-param { graph_t *graph } - %pure-parser --- -1.8.3.4 - |