fixup! [SPIN] Hotfix for build with gcc 4.6.3

This patch fixes problem with third_party/mesa compilation
when flag _enable_content_shell = 1 and gcc 4.6.3 is used.
Issues with keyword final are resolved.
Mesa repository is not a part of chromium repo
so git patch is prepared.

Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=10841
Reviewed by: Antonio Gomes, Piotr Grad, Piotr Tworek, SeungSeop Park

Change-Id: If54ed4441310c8be6c88a20aabd909d0623ab69e
Signed-off-by: Sebastian Stolinski <s.stolinski@samsung.com>

diff --git a/tizen_src/build/patches/hotfix_enable_content_shell.diff b/tizen_src/build/patches/hotfix_enable_content_shell.diff
new file mode 100644 (file)
index 0000000..16b5a6f
--- /dev/null
+++ b/tizen_src/build/patches/hotfix_enable_content_shell.diff
@@ -0,0 +1,41 @@
+diff --git a/third_party/mesa/src/chromium_gensrc/mesa/glcpp-parse.c b/third_party/mesa/src/chromium_gensrc/mesa/glcpp-parse.c
+index 40ff9ff..c641ab0 100644
+--- a/third_party/mesa/src/chromium_gensrc/mesa/glcpp-parse.c
++++ b/third_party/mesa/src/chromium_gensrc/mesa/glcpp-parse.c
+@@ -4005,12 +4005,12 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
+                * unexpanded token. */
+               char *str;
+               token_list_t *expansion;
+-              token_t *final;
++              token_t *final_token;
+ 
+               str = ralloc_strdup (parser, token->value.str);
+-              final = _token_create_str (parser, OTHER, str);
++              final_token = _token_create_str (parser, OTHER, str);
+               expansion = _token_list_create (parser);
+-              _token_list_append (expansion, final);
++              _token_list_append (expansion, final_token);
+               *last = node;
+               return expansion;
+       }
+diff --git a/third_party/mesa/src/src/glsl/glcpp/glcpp-parse.y b/third_party/mesa/src/src/glsl/glcpp/glcpp-parse.y
+index 8025c06..a19dc15 100644
+--- a/third_party/mesa/src/src/glsl/glcpp/glcpp-parse.y
++++ b/third_party/mesa/src/src/glsl/glcpp/glcpp-parse.y
+@@ -1538,12 +1538,12 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
+                * unexpanded token. */
+               char *str;
+               token_list_t *expansion;
+-              token_t *final;
++              token_t *final_token;
+ 
+               str = ralloc_strdup (parser, token->value.str);
+-              final = _token_create_str (parser, OTHER, str);
++              final_token = _token_create_str (parser, OTHER, str);
+               expansion = _token_list_create (parser);
+-              _token_list_append (expansion, final);
++              _token_list_append (expansion, final_token);
+               *last = node;
+               return expansion;
+       }
+