qt5webkit-0002-ANGLE-doesn-t-build-with-bison-3.0.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
  2. From: Allan Sandfeld Jensen <allan.jensen@digia.com>
  3. Date: Fri, 16 Aug 2013 18:27:07 +0200
  4. Subject: [PATCH] ANGLE doesn't build with bison 3.0
  5. https://bugs.webkit.org/show_bug.cgi?id=119798
  6. Reviewed by Antti Koivisto.
  7. Make glslang.y compatible with bison 3.0
  8. by using %lex-param to set YYLEX_PARAM.
  9. * src/compiler/glslang.y:
  10. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  11. Task-number: QTBUG-32913
  12. Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
  13. Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
  14. ---
  15. Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
  16. 1 file changed, 1 insertion(+)
  17. diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
  18. index 3cad335..b41e95a 100644
  19. --- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
  20. +++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
  21. @@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
  22. %expect 1 /* One shift reduce conflict because of if | else */
  23. %pure-parser
  24. %parse-param {TParseContext* context}
  25. +%lex-param {YYLEX_PARAM}
  26. %union {
  27. struct {
  28. --
  29. 1.8.4.2