community/chromium: upgrade to 46.0.2490.71

3 files changed, 30 insertions, 15 deletions

diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index 8307f5adaa..733604291b 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=45.0.2454.101
+pkgver=46.0.2490.71
 pkgrel=0
 pkgdesc="chromium web browser"
 url="http://www.chromium.org/"
@@ -63,6 +63,10 @@ prepare() {
 	# the system ones, leading to errors during the final link stage.
 	# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/BNGvJc08B6Q
 	find third_party/icu -type f \! -regex '.*\.\(gyp\|gypi\|isolate\)' -delete
+
+	# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
+	touch chrome/test/data/webui/i18n_process_css_test.html || return 1
+
 }
 
 build() {
@@ -213,41 +217,41 @@ chromedriver() {
 		"$subpkgdir"/usr/lib/$pkgname/chromedriver || return 1
 }
 
-md5sums="501bae19c33b3888578a9d92a493a17e  chromium-45.0.2454.101.tar.xz
+md5sums="0011d66f7ec8221fc021da3f5f66d929  chromium-46.0.2490.71.tar.xz
 b6d015c1da85aa65ee21bc974c7fc7d2  chromium-launcher.sh
 c5aa73a87d4b88cce9f1a680ca691bb6  chromium.conf
 2962ac6259e39a797d441daf43aa49c9  chromium.desktop
 2d2ee5f22d65c756871301b4a407f4ca  google-api.keys
-4d51f367a9220703f5f7dd962388b5a7  musl-fixes.patch
+43139a873cc0dbb51fc1b8319560ff94  musl-fixes.patch
 00ae59dd9d09c60a116fd0133f9f3a60  no-execinfo.patch
 af047840f31e99aa36be04edc3482afd  resolver.patch
-5c69e07f1738f11632e8d9f27cc85826  no-mallinfo.patch
+55c047c08d7de4b278e99da89a6a9610  no-mallinfo.patch
 2c8de771a7c0e5e0e9fc68fa978785f7  no-getcontext.patch
 4f22f0d05448c49d6501386523a081ba  musl-sandbox.patch
 97b1578585ab600ed9adef4f341ccd80  chromium-system-jinja-r7.patch
 de717d6430532f34fe161035dfdafcdf  chromium-widevine.patch"
-sha256sums="1b682dcaae9c89b2ebfdb192bb2f73c78c5b30a55103e7198fa3c1e21fed85fb  chromium-45.0.2454.101.tar.xz
+sha256sums="cd4b18249e64ee267236c9d4578effe810bf8f47567e2d43a5a8a7613787dcb6  chromium-46.0.2490.71.tar.xz
 89f1eb19d1ed998a190045ea173959f01faee3490d58a6a34ca3fe21228e569f  chromium-launcher.sh
 b466559340a36998354a0577325fe533d9e6b74c24a15b7599671171506bf128  chromium.conf
 3ae90cea7503d0039de53448ed112b9bc0cb5a09f6b0045506eb777fc23517e5  chromium.desktop
 267ba8ff50574e51d2582c4fca9b9e14f7225c1fa064d135cbceff9cef2324ac  google-api.keys
-55150c9f0671789b998d8f858e7c8640e30331b92912dea0a19458c9d0c3f31c  musl-fixes.patch
+534f2453b7aba0a75c6fe334f26a144beafde589ab3c19e20667ac41266c10c5  musl-fixes.patch
 505a55c28e971e067f189e3a1ce697d711cec82a765d81f78eb49ec1f6df56cf  no-execinfo.patch
 f16c63d4188fe56732dc6760307795ba4059452c4cf3de1460cbcb2616011511  resolver.patch
-d746414cde6c7fc1836406cc2f954387dc75c755141b2dd0126eb885ab411638  no-mallinfo.patch
+2c3a2685e5b557fd39578bbb5b27924e4ea2167b1597ef2a37461766e514062c  no-mallinfo.patch
 ea79f9a46116c8b56bbc69d226abd9252e4ae4d946ca695203f2298279cc2211  no-getcontext.patch
 20fcb99022f3a737dceea7349da61e12a85834c0ab65a02009b6f56acb8b0f07  musl-sandbox.patch
 872f5a38d8263b14308bb117828496a4093d0e6ad755d39d2c5e6857314fe071  chromium-system-jinja-r7.patch
 1d1ead77250475228524770e57c17282aff9098c5efc3d7719b0df76229b8874  chromium-widevine.patch"
-sha512sums="cab9566de6d6b582f0b78a3ef2ed591830976fdf838e7780a380eb0caed2d6649ceee50ce2c017406e18ac8bfa92fd6a43a6677f0984a4af8de0723db4d9312b  chromium-45.0.2454.101.tar.xz
+sha512sums="bd7916c8752fb5b2a8f6dfffc4194d9069e7895315c5b26b2657905842ee3859e79b806afb9757fb2335fd3d87194a31bb73ba5a668eba3bdb8808dd33c5e545  chromium-46.0.2490.71.tar.xz
 b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60  chromium-launcher.sh
 f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f  chromium.conf
 e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c  chromium.desktop
 2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac  google-api.keys
-47d2fa2e3cad35e6eca5de9ffad1eacdce7c82e4da4579aa08e7fde0fb5690b9925c8f925b484f012ce1eaf22b18350e2fbdd5f38301c45b390da4393158bf79  musl-fixes.patch
+e17bf48de031719b21e590c075888fcc0ffc646f780447aac2a619b4b498fee884808f3df3c2d3cfc77893bf2efc63b175fec26800b529ec44083e82831cb5c3  musl-fixes.patch
 4f756d3e404033f7a36b38266176b7302f7e2a2e78c9f8b8d362a53a3dbdc675cdaa581393a70c23a29135b34566cf4109513cb13a289dc111bbce65ec065ebd  no-execinfo.patch
 987f18d37824676e5d874a6fde1099bcc558920e7781de5f34e612411013e4fac9ca421a3cce1ed5f82401c4d54212b6f47a0a856892a78543b8e400a4bb0489  resolver.patch
-c8ff8d3d2c5948a8c9ae0ccc8625ae6116071af19b1d7d2bc2597b0876084de42565537abcbb96b150176e04de7a288ab7a9116e038fe83dd6816c7c5b2ae235  no-mallinfo.patch
+83d7266df3b70467fb11eb4c1daf19d639495cb1208ffc2a9cb46e0cc71c1eb0f9c3485b4ddea78729f75106f612caeee7219826dcd0790418cbbb194494139f  no-mallinfo.patch
 42d9a6ebea2d95cdc169b921cc1a1b846cf500997059fd3084de09e21f00b63b76e60c6124f4af247d402ff5ca3f4bf8867a6f2c78198c05b4273ca01fb29241  no-getcontext.patch
 cc61407bae55523fd3d0b43be7cf827cd6a648314a81f8d78f830e60cb215ede6c585d8755e9c870bb98955a4d3679205cbefde6f4efcb0e48469169167823eb  musl-sandbox.patch
 10bcc6a467b6766d13b5e41e7b7dcdbd62de7c04daad16c83037e88043032a0c118627029f91ef8a2a57faaaebc8b6f4ee16e8d1fecb5921d0d49efd60a27863  chromium-system-jinja-r7.patch
diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch
index 144a008557..6bddcf480a 100644
--- a/community/chromium/musl-fixes.patch
+++ b/community/chromium/musl-fixes.patch
@@ -217,3 +217,14 @@
  
  #include "base/posix/eintr_wrapper.h"
  
+--- ./base/logging.cc
++++ ./base/logging.cc.orig
+@@ -543,7 +543,7 @@
+ }
+ 
+ LogMessage::~LogMessage() {
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__)
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__)
+   if (severity_ == LOG_FATAL) {
+     // Include a stack trace on a fatal.
+     base::debug::StackTrace trace;
diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch
index 6e1063084a..0dadb3b480 100644
--- a/community/chromium/no-mallinfo.patch
+++ b/community/chromium/no-mallinfo.patch
@@ -9,17 +9,17 @@
  size_t GetMemoryUsageKB() {
    struct mallinfo minfo = mallinfo();
    uint64_t mem_usage =
---- ./base/trace_event/malloc_dump_provider.cc.orig
+--- ./base/trace_event/malloc_dump_provider.cc
 +++ ./base/trace_event/malloc_dump_provider.cc
-@@ -29,6 +29,7 @@
- // Called at trace dump point time. Creates a snapshot the memory counters for
+@@ -30,6 +30,7 @@
  // the current process.
- bool MallocDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
+ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
+                                       ProcessMemoryDump* pmd) {
 +#if defined(__GLIBC__)
    struct mallinfo info = mallinfo();
    DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
  
-@@ -46,6 +47,7 @@
+@@ -47,6 +48,7 @@
    MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects);
    inner_dump->AddScalar(MemoryAllocatorDump::kNameSize,
                          MemoryAllocatorDump::kUnitsBytes, info.uordblks);