diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-09 13:36:10 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-09 13:36:43 +0200 |
| commit | 4358dca0f77dcc6bd073e6f1e55e5c59c89e6c1b (patch) | |
| tree | af2034ce508ba4bf4e4daab19f5e65798f46dc27 /community/chromium/musl-fixes.patch | |
| parent | 117de5a063091790a09ecbfc08cb4ae97b25a869 (diff) | |
| download | aports-4358dca0f77dcc6bd073e6f1e55e5c59c89e6c1b.tar.bz2 aports-4358dca0f77dcc6bd073e6f1e55e5c59c89e6c1b.tar.xz | |
community/chromium: upgrade to 59.0.3071.86
Diffstat (limited to 'community/chromium/musl-fixes.patch')
| -rw-r--r-- | community/chromium/musl-fixes.patch | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch index 8f0b116cd1..633d7a6894 100644 --- a/community/chromium/musl-fixes.patch +++ b/community/chromium/musl-fixes.patch @@ -126,26 +126,6 @@ #endif #if HAVE_UNISTD_H #include <unistd.h> ---- ./third_party/WebKit/Source/wtf/StackUtil.cpp.orig -+++ ./third_party/WebKit/Source/wtf/StackUtil.cpp -@@ -28,7 +28,7 @@ - // FIXME: On Mac OSX and Linux, this method cannot estimate stack size - // correctly for the main thread. - --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). - // If so, a conservative size estimate is returned. -@@ -95,7 +95,7 @@ - } - - void* getStackStart() { --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - pthread_attr_t attr; - int error; - #if OS(FREEBSD) --- ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig +++ ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -40,7 +40,7 @@ @@ -217,3 +197,35 @@ index a80ea16..55a2abf 100644 #include <arpa/inet.h> #include <stdint.h> #endif +--- ./third_party/WebKit/Source/platform/wtf/StackUtil.cpp.orig ++++ ./third_party/WebKit/Source/platform/wtf/StackUtil.cpp +@@ -28,7 +28,7 @@ + // FIXME: On Mac OSX and Linux, this method cannot estimate stack size + // correctly for the main thread. + +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + // pthread_getattr_np() can fail if the thread is not invoked by + // pthread_create() (e.g., the main thread of webkit_unit_tests). + // If so, a conservative size estimate is returned. +@@ -95,7 +95,7 @@ + } + + void* GetStackStart() { +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + pthread_attr_t attr; + int error; + #if OS(FREEBSD) +diff --git a/third_party/swiftshader/src/Common/Socket.cpp b/third_party/swiftshader/src/Common/Socket.cpp +index a19f574..3e6655d 100644 +--- a/third_party/swiftshader/src/Common/Socket.cpp ++++ b/third_party/swiftshader/src/Common/Socket.cpp +@@ -17,6 +17,7 @@ + #if defined(_WIN32) + #include <ws2tcpip.h> + #else ++ #include <sys/select.h> + #include <unistd.h> + #include <netdb.h> + #include <netinet/in.h> |