File gcc50-fixes.diff of Package chromium

Overview Repositories Revisions Requests Users Attributes Meta

File gcc50-fixes.diff of Package chromium (Revision 3ec47a2af46de77e1496822edc8ad6b6)

Currently displaying revision 3ec47a2af46de77e1496822edc8ad6b6 , Show latest

--- build/compiler_version.py	2015-06-17 21:51:42.871082412 +0200
+++ build/compiler_version.py	2015-06-17 21:51:42.871082412 +0200
@@ -56,7 +56,7 @@
     if tool == "compiler":
       compiler = compiler + " -dumpversion"
       # 4.6
-      version_re = re.compile(r"(\d+)\.(\d+)")
+      version_re = re.compile(r"(\d+)")
     elif tool == "assembler":
       compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
       # Unmodified: GNU assembler (GNU Binutils) 2.24
@@ -88,7 +88,11 @@
       raise subprocess.CalledProcessError(pipe.returncode, compiler)
 
     parsed_output = version_re.match(tool_output)
-    result = parsed_output.group(1) + parsed_output.group(2)
+    if tool == "compiler":
+      result = parsed_output.group(1) + "1"
+    else:
+      result = parsed_output.group(1) + parsed_output.group(2)
+
     compiler_version_cache[cache_key] = result
     return result
   except Exception, e:
--- native_client/build/compiler_version.py	2015-06-17 21:51:42.871082412 +0200
+++ native_client/build/compiler_version.py	2015-06-17 21:51:42.871082412 +0200
@@ -56,7 +56,7 @@
     if tool == "compiler":
       compiler = compiler + " -dumpversion"
       # 4.6
-      version_re = re.compile(r"(\d+)\.(\d+)")
+      version_re = re.compile(r"(\d+)")
     elif tool == "assembler":
       compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
       # Unmodified: GNU assembler (GNU Binutils) 2.24
@@ -88,7 +88,11 @@
       raise subprocess.CalledProcessError(pipe.returncode, compiler)
 
     parsed_output = version_re.match(tool_output)
-    result = parsed_output.group(1) + parsed_output.group(2)
+    if tool == "compiler":
+      result = parsed_output.group(1) + "1"
+    else:
+      result = parsed_output.group(1) + parsed_output.group(2)
+
     compiler_version_cache[cache_key] = result
     return result
   except Exception, e:

Index: third_party/WebKit/Source/core/events/DragEvent.h
diff --git a/third_party/WebKit/Source/core/events/DragEvent.h b/third_party/WebKit/Source/core/events/DragEvent.h
index f4f7ea81dcacc353ec61ac40b0d45c0971127365..66e05a9f154f3584a688933bb5d8adb4e1260454 100644
--- third_party/WebKit/Source/core/events/DragEvent.h
+++ third_party/WebKit/Source/core/events/DragEvent.h
@@ -5,6 +5,7 @@
 #ifndef DragEvent_h
 #define DragEvent_h
 
+#include "core/CoreExport.h"
 #include "core/events/DragEventInit.h"
 #include "core/events/MouseEvent.h"
 
@@ -12,7 +13,7 @@ namespace blink {
 
 class DataTransfer;
 
-class DragEvent final : public MouseEvent {
+class CORE_EXPORT DragEvent final : public MouseEvent {
     DEFINE_WRAPPERTYPEINFO();
 
 public:

Places

File gcc50-fixes.diff of Package chromium (Revision 3ec47a2af46de77e1496822edc8ad6b6)

Places