community/chromium: upgrade to 59.0.3071.86

5 files changed, 134 insertions, 35 deletions

diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index 88a36fda8d..a4d6713480 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=chromium
-pkgver=58.0.3029.110
+pkgver=59.0.3071.86
 pkgrel=0
 pkgdesc="chromium web browser"
 url="http://www.chromium.org/"
@@ -95,6 +95,7 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
 	no-mallinfo.patch
 	resolver.patch
 	unset-madv_free.patch
+	swiftshader.patch
 	"
 
 builddir="$srcdir"/$pkgname-$pkgver
@@ -349,7 +350,7 @@ chromedriver() {
 	mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin || return 1
 }
 
-sha512sums="412dc94e23d6699b959f23956f5f82f4c600050649a8a2e694bb2c6e166245e3670f4549ee1c08a0df05b4e361f040d1739515180b8631adbfac9c907af8d93f  chromium-58.0.3029.110.tar.xz
+sha512sums="1b92956435dcc422f3edf0ccd031007a19d291620d5af284ac2c1d2578b8524691713927b47130d2fd7c9acb7d9cd0376e9f5e3821b5feece7529b8b7bddf193  chromium-59.0.3071.86.tar.xz
 b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60  chromium-launcher.sh
 f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f  chromium.conf
 e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c  chromium.desktop
@@ -360,11 +361,11 @@ e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b3
 88928afcc33843e17daa082435a4b88c2106b0252a202ad19f684021c027859366a0c12970700c0d1b010211eef95d295362dc6afdea1b00199dd8d2efbdcfe7  gcc6.patch
 0a15b178fadffdc31f1f7bc814b95817cbcea9dd90b1ed84f7bab2d840f36453573742bd8501d79edecfa38c0ec2147843aef03c7b2c9bcfd0e3d22b72c25c4b  gn_bootstrap.patch
 8fbfd67a0b6bbdf08364e810bd85b4a80dda9af73fefe3aba8010d9b33022d458a785c628515bbda9c743b8a0293d57cfe18fcc5aa2313c845c6fb948c2335f9  last-commit-position.patch
-cab92f22a9922ab073d3f8fcecc523803ef6d1961699f9348b2785d6e10c03bc29138f3c76cc921181a73948b1477079d2c6aad853475b02c7336fe571b6de7d  musl-fixes.patch
+6b4225ce8971db5a8fa86099c7399ba06509f6056772948f9a1ececaa501a7e9b19b568ea59f315cd66c8dc7869b70f363f0af9a42a0282381888da6b0b1c7a9  musl-fixes.patch
 17164a6b38409f466bd7da6bf0d4e71f3114bec38950414c924f57da6b7f536203e368100c7f3d8239ae52a8edf6f588e7b07281a71b5fc5847460da409af0e3  musl-hacks.patch
 ce8276bb35a8d72cf58868a6331e85286b350a1aad694525ebf637499819219dd4d87ab67dd3b938830a6bd3e7172fc9bcd9c8971820d0ed95c0d141867a24fe  musl-sandbox.patch
-f11db647ef78d70232e32cf15fb278f8541b27c68ff5d0c3764127eb9df76fe58e2bd842d857e795178b7dd10af64caed56b901f39524f37426ce9fb50689b05  no-execinfo.patch
+7230e468931da704d5f3e19d9ef2b123e1ac5194b1858bd9ddcf21acc6c4eb22639c13119f1243769872ab96093c8ce3b5a1167ca689fc269cf1466b6a6565f2  no-execinfo.patch
 a57858e45cfbb7e97f77b3b308502e377543d61d3d0085798ed73bc53da456828f5e010308d0de05fee4fe52071362d074f5af205f98f41d67222d997857d626  no-getcontext.patch
-b5436f3f2fe8fa28f7019516edd3e7cbada40299e50640e3ca136abdfcb81d32a2f59011d5aea0add1997df30fd699694cdf65ae4b80862e0f5229b446f47c24  no-mallinfo.patch
+bd3645eb466e7bb3696fec5e71782b5db0a6ae7a0cca5c8e58781d9a29432cbbbea70129038726ad93b9d2332a66e8b99797ff481765314c20647c54a37a5c59  no-mallinfo.patch
 d60407a8faadfd2a8294570163b4d1b1112c8a70a6f8e778fc3aff25d20613a2e26c66cd87e69c54953cc1b984e4038015ad04797b0495df13932541b05398fe  resolver.patch
 27dd7916be3324294a0a913c43c856e9c00be767a2aec4f3da2455fb84e74ebb0017d1aa586b40dd9d989ada6b60fc531522f503d57e04324726a2171bf3a85e  unset-madv_free.patch"
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>
diff --git a/community/chromium/no-execinfo.patch b/community/chromium/no-execinfo.patch
index e3899052dd..05d96c1bae 100644
--- a/community/chromium/no-execinfo.patch
+++ b/community/chromium/no-execinfo.patch
@@ -71,7 +71,7 @@
    StreamBacktraceOutputHandler handler(os);
    ProcessBacktrace(trace_, count_, &handler);
 --- third_party/WebKit/Source/wtf/Assertions.cpp.orig	2016-12-02 00:02:32.000000000 +0100
-+++ third_party/WebKit/Source/wtf/Assertions.cpp	2016-12-06 10:58:11.183147846 +0100
++++ third_party/WebKit/Source/platform/wtf/Assertions.cpp
 @@ -60,7 +60,7 @@
  #include <windows.h>
  #endif
diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch
index 306c64b622..4396e29778 100644
--- a/community/chromium/no-mallinfo.patch
+++ b/community/chromium/no-mallinfo.patch
@@ -22,9 +22,9 @@
    uint64_t mem_usage =
 --- content/renderer/render_thread_impl.cc.orig
 +++ content/renderer/render_thread_impl.cc
-@@ -1712,6 +1712,49 @@
+@@ -1699,6 +1699,49 @@
  }
-
+ 
  }  // namespace
 +#elif defined(OS_LINUX) && !defined(__GLIBC__)
 +namespace {
@@ -70,14 +70,14 @@
 +
 +}  // namespace
  #endif
-
- void RenderThreadImpl::GetRendererMemoryMetrics(
-@@ -1722,7 +1765,7 @@
-   memory_metrics->partition_alloc_kb =
-       blink_stats.partitionAllocTotalAllocatedBytes / 1024;
-   memory_metrics->blink_gc_kb = blink_stats.blinkGCTotalAllocatedBytes / 1024;
+ 
+ bool RenderThreadImpl::GetRendererMemoryMetrics(
+@@ -1719,7 +1762,7 @@
+       blink_stats.partition_alloc_total_allocated_bytes / 1024;
+   memory_metrics->blink_gc_kb =
+       blink_stats.blink_gc_total_allocated_bytes / 1024;
 -#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
++#if defined(OS_LINUX) && defined(__GLIBC__) || defined(OS_ANDROID)
    struct mallinfo minfo = mallinfo();
  #if defined(USE_TCMALLOC)
    size_t malloc_usage = minfo.uordblks;
diff --git a/community/chromium/swiftshader.patch b/community/chromium/swiftshader.patch
new file mode 100644
index 0000000000..bb133d1cc2
--- /dev/null
+++ b/community/chromium/swiftshader.patch
@@ -0,0 +1,86 @@
+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
++++ 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>
+diff --git a/third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h b/third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
+index 509bc26..6522713 100644
+--- a/third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
++++ third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
+@@ -125,7 +125,7 @@
+ #define HAVE_ERROR_T 1
+ 
+ /* Define to 1 if you have the <execinfo.h> header file. */
+-#define HAVE_EXECINFO_H 1
++/* #undef HAVE_EXECINFO_H */
+ 
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #define HAVE_FCNTL_H 1
+@@ -240,10 +240,10 @@
+ /* #undef HAVE_MACH_O_DYLD_H */
+ 
+ /* Define if mallinfo() is available on this platform. */
+-#define HAVE_MALLINFO 1
++/* #undef HAVE_MALLINFO */
+ 
+ /* Define to 1 if you have the <malloc.h> header file. */
+-#define HAVE_MALLOC_H 1
++/* #undef HAVE_MALLOC_H */
+ 
+ /* Define to 1 if you have the <malloc/malloc.h> header file. */
+ /* #undef HAVE_MALLOC_MALLOC_H */
+diff --git a/third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp b/third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
+index bd68083..f703e13 100644
+--- a/third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
++++ third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
+@@ -160,7 +160,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) {
+ // On linux we have a weird situation. The stderr/out/in symbols are both
+ // macros and global variables because of standards requirements. So, we
+ // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first.
+-#if defined(__linux__) && !defined(__ANDROID__)
++#if defined(__GLIBC__)
+   {
+     EXPLICIT_SYMBOL(stderr);
+     EXPLICIT_SYMBOL(stdout);
+diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
+index e14edbd..8d7e41e 100644
+--- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
++++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
+@@ -14,7 +14,7 @@
+ #define ENABLE_CRASH_OVERRIDES 1
+ 
+ /* Define to 1 if you have the `backtrace' function. */
+-#define HAVE_BACKTRACE 1
++/* #undef  HAVE_BACKTRACE */
+ 
+ /* Define to 1 if you have the <CrashReporterClient.h> header file. */
+ /* #undef HAVE_CRASHREPORTERCLIENT_H */
+@@ -55,7 +55,7 @@
+ #define HAVE_ERRNO_H 1
+ 
+ /* Define to 1 if you have the <execinfo.h> header file. */
+-#define HAVE_EXECINFO_H 1
++/* #undef HAVE_EXECINFO_H */
+ 
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #define HAVE_FCNTL_H 1
+@@ -130,10 +130,10 @@
+ /* #undef HAVE_MALLCTL */
+ 
+ /* Define to 1 if you have the `mallinfo' function. */
+-#define HAVE_MALLINFO 1
++/* #undef HAVE_MALLINFO */
+ 
+ /* Define to 1 if you have the <malloc.h> header file. */
+-#define HAVE_MALLOC_H 1
++/* #undef HAVE_MALLOC_H */
+ 
+ /* Define to 1 if you have the <malloc/malloc.h> header file. */
+ /* #undef HAVE_MALLOC_MALLOC_H */