diff options
| -rw-r--r-- | community/chromium/APKBUILD | 37 | ||||
| -rw-r--r-- | community/chromium/chromium-use-non-versioned-icu-namespace.patch | 14 | ||||
| -rw-r--r-- | community/chromium/musl-fixes.patch | 11 | ||||
| -rw-r--r-- | community/chromium/no-mallinfo.patch | 32 | ||||
| -rw-r--r-- | community/chromium/resolver.patch | 12 |
5 files changed, 69 insertions, 37 deletions
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD index dc277f6a35..17bff98e66 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=47.0.2526.106 +pkgver=48.0.2564.109 pkgrel=0 pkgdesc="chromium web browser" url="http://www.chromium.org/" @@ -37,6 +37,8 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn chromium-system-jinja-r7.patch chromium-widevine.patch + + chromium-use-non-versioned-icu-namespace.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -216,42 +218,45 @@ chromedriver() { "$subpkgdir"/usr/lib/$pkgname/chromedriver || return 1 } -md5sums="b61a28c68c8b81b6bfa0fc671faed723 chromium-47.0.2526.106.tar.xz +md5sums="e69b230c4f4372210ca0828db51d06f9 chromium-48.0.2564.109.tar.xz b6d015c1da85aa65ee21bc974c7fc7d2 chromium-launcher.sh c5aa73a87d4b88cce9f1a680ca691bb6 chromium.conf 2962ac6259e39a797d441daf43aa49c9 chromium.desktop 2d2ee5f22d65c756871301b4a407f4ca google-api.keys -309b4328abecb2737499b1ade8004e5c musl-fixes.patch +8d28a0bf8315bbc796fe04a5d94c90a7 musl-fixes.patch 00ae59dd9d09c60a116fd0133f9f3a60 no-execinfo.patch -af047840f31e99aa36be04edc3482afd resolver.patch -55c047c08d7de4b278e99da89a6a9610 no-mallinfo.patch +f99a4572c0be2c2123acc2478905e01f resolver.patch +118a79e218eebb4214e89726fd991ca8 no-mallinfo.patch 2c8de771a7c0e5e0e9fc68fa978785f7 no-getcontext.patch 4f22f0d05448c49d6501386523a081ba musl-sandbox.patch 97b1578585ab600ed9adef4f341ccd80 chromium-system-jinja-r7.patch -de717d6430532f34fe161035dfdafcdf chromium-widevine.patch" -sha256sums="64535073330a3d37aad228d10a15cdcbb5b389e59d079d1a3b22d023b99a58e6 chromium-47.0.2526.106.tar.xz +de717d6430532f34fe161035dfdafcdf chromium-widevine.patch +b0da9a7f6791176e3064734dbc65ad85 chromium-use-non-versioned-icu-namespace.patch" +sha256sums="2eb1e5b6dda718a5e501ba26f47015c1629adeb9f2bf2877bd9d8bf346abeb03 chromium-48.0.2564.109.tar.xz 89f1eb19d1ed998a190045ea173959f01faee3490d58a6a34ca3fe21228e569f chromium-launcher.sh b466559340a36998354a0577325fe533d9e6b74c24a15b7599671171506bf128 chromium.conf 3ae90cea7503d0039de53448ed112b9bc0cb5a09f6b0045506eb777fc23517e5 chromium.desktop 267ba8ff50574e51d2582c4fca9b9e14f7225c1fa064d135cbceff9cef2324ac google-api.keys -773dac52fdc5967c0bfd7a5cd43ddfb34f831ef88ab52d18775cb8496c360c0b musl-fixes.patch +42e800f6cc223593188e977ab4e7010cda253204d91bace548c338578674804a musl-fixes.patch 505a55c28e971e067f189e3a1ce697d711cec82a765d81f78eb49ec1f6df56cf no-execinfo.patch -f16c63d4188fe56732dc6760307795ba4059452c4cf3de1460cbcb2616011511 resolver.patch -2c3a2685e5b557fd39578bbb5b27924e4ea2167b1597ef2a37461766e514062c no-mallinfo.patch +914c513bb54d4d97cd2a7622647f6af5cd0c8d29a0aa2962a60fdbed88f54429 resolver.patch +1f0a2d924267470e91c666e993e19058472d69fdb4448b063c25f6c46cbc0453 no-mallinfo.patch ea79f9a46116c8b56bbc69d226abd9252e4ae4d946ca695203f2298279cc2211 no-getcontext.patch 20fcb99022f3a737dceea7349da61e12a85834c0ab65a02009b6f56acb8b0f07 musl-sandbox.patch 872f5a38d8263b14308bb117828496a4093d0e6ad755d39d2c5e6857314fe071 chromium-system-jinja-r7.patch -1d1ead77250475228524770e57c17282aff9098c5efc3d7719b0df76229b8874 chromium-widevine.patch" -sha512sums="ef9e76069aee26c08ba0f6fa29becf645e0dec901cb1461fd50ecfe1e26169ec973932a7d9bef2b96bc34e9834ce9ca3c8ef3f97d98619f489d23628cd0326d8 chromium-47.0.2526.106.tar.xz +1d1ead77250475228524770e57c17282aff9098c5efc3d7719b0df76229b8874 chromium-widevine.patch +e4192446cc0ab6a5c540599c8a149f4f2208f0014da2786ada6c9544913d7426 chromium-use-non-versioned-icu-namespace.patch" +sha512sums="2891384385a6ac1ebab218837ce609c16abcf2500e1d49396fea931bf0f709097b4a99c6ca11ae409d757c7c94b0f3af9d6848084047d981597c0bb0f73257cd chromium-48.0.2564.109.tar.xz b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c chromium.desktop 2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac google-api.keys -85db7fa403450e48fb8e20f496d18b50825cd7efc0804dee4700cd5abeb7c1d7cfabf662e1a7bda584c42960328a0103052cf327233569e870ef765457668037 musl-fixes.patch +0d112ce486fd3b93ef60eadbc4db7f1746c51bc02634212ce986f34480915ea37f4ca8ff37d56316abecb112bb0fc1079e7bc27e603ec9ceabde01caa2777561 musl-fixes.patch 4f756d3e404033f7a36b38266176b7302f7e2a2e78c9f8b8d362a53a3dbdc675cdaa581393a70c23a29135b34566cf4109513cb13a289dc111bbce65ec065ebd no-execinfo.patch -987f18d37824676e5d874a6fde1099bcc558920e7781de5f34e612411013e4fac9ca421a3cce1ed5f82401c4d54212b6f47a0a856892a78543b8e400a4bb0489 resolver.patch -83d7266df3b70467fb11eb4c1daf19d639495cb1208ffc2a9cb46e0cc71c1eb0f9c3485b4ddea78729f75106f612caeee7219826dcd0790418cbbb194494139f no-mallinfo.patch +d60407a8faadfd2a8294570163b4d1b1112c8a70a6f8e778fc3aff25d20613a2e26c66cd87e69c54953cc1b984e4038015ad04797b0495df13932541b05398fe resolver.patch +ee28e99f090c282f17f118b31ced9aa2c69bb54598bc1f6be1b295a335f975742f716031406e85f6f1d774fbfef0f3319356d19df9c31aeecb215c8ef62531e8 no-mallinfo.patch 42d9a6ebea2d95cdc169b921cc1a1b846cf500997059fd3084de09e21f00b63b76e60c6124f4af247d402ff5ca3f4bf8867a6f2c78198c05b4273ca01fb29241 no-getcontext.patch cc61407bae55523fd3d0b43be7cf827cd6a648314a81f8d78f830e60cb215ede6c585d8755e9c870bb98955a4d3679205cbefde6f4efcb0e48469169167823eb musl-sandbox.patch 10bcc6a467b6766d13b5e41e7b7dcdbd62de7c04daad16c83037e88043032a0c118627029f91ef8a2a57faaaebc8b6f4ee16e8d1fecb5921d0d49efd60a27863 chromium-system-jinja-r7.patch -4a11b46afa8ce84bd23a8c506301b5848ee4291a764f3aed282b8a98706ece16cf9346dec6cc71b1e17812b15f43a5cbc7bc6d38ed4dcc88c12d6fcb03bd9295 chromium-widevine.patch" +4a11b46afa8ce84bd23a8c506301b5848ee4291a764f3aed282b8a98706ece16cf9346dec6cc71b1e17812b15f43a5cbc7bc6d38ed4dcc88c12d6fcb03bd9295 chromium-widevine.patch +8b0b39b454350fe0377e0fb1b07a0ef4ac33633698a2070f8c539144ed3367d76c30a53d8ccbbfe23af096e9955741a25d812fe5a586079235cfcfcb5f22eb46 chromium-use-non-versioned-icu-namespace.patch" diff --git a/community/chromium/chromium-use-non-versioned-icu-namespace.patch b/community/chromium/chromium-use-non-versioned-icu-namespace.patch new file mode 100644 index 0000000000..f7b0b6d805 --- /dev/null +++ b/community/chromium/chromium-use-non-versioned-icu-namespace.patch @@ -0,0 +1,14 @@ +Index: components/autofill/core/common/autofill_l10n_util.cc +diff --git a/components/autofill/core/common/autofill_l10n_util.cc b/components/autofill/core/common/autofill_l10n_util.cc +index 2ee517faf82b1feb224f83ae533092ae3b31f5af..c29b0a299b7215895874adf9241e4705247161ab 100644 +--- a/components/autofill/core/common/autofill_l10n_util.cc ++++ b/components/autofill/core/common/autofill_l10n_util.cc +@@ -22,7 +22,7 @@ CaseInsensitiveCompare::CaseInsensitiveCompare(const icu::Locale& locale) { + // library. This could be due to a device-specific issue (has been seen in + // the wild on Android devices). In the failure case, |collator_| will be + // null. See http://crbug.com/558625. +- icu_54::UnicodeString name; ++ icu::UnicodeString name; + std::string locale_name; + locale.getDisplayName(name).toUTF8String(locale_name); + LOG(ERROR) << "Failed to initialize the ICU Collator for " diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch index 0a069b7ec3..1410502b3b 100644 --- a/community/chromium/musl-fixes.patch +++ b/community/chromium/musl-fixes.patch @@ -105,17 +105,6 @@ #if defined(__mips__) // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the ---- ./net/base/dns_reloader.cc.orig -+++ ./net/base/dns_reloader.cc -@@ -5,7 +5,7 @@ - #include "net/base/dns_reloader.h" - - #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ -- !defined(OS_ANDROID) -+ !defined(OS_ANDROID) && !defined(_GNU_SOURCE) - - #include <resolv.h> - --- ./net/dns/dns_config_service_posix.cc.orig +++ ./net/dns/dns_config_service_posix.cc @@ -116,7 +116,7 @@ diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch index 0dadb3b480..7ce835b096 100644 --- a/community/chromium/no-mallinfo.patch +++ b/community/chromium/no-mallinfo.patch @@ -9,20 +9,32 @@ size_t GetMemoryUsageKB() { struct mallinfo minfo = mallinfo(); uint64_t mem_usage = ---- ./base/trace_event/malloc_dump_provider.cc +--- ./base/trace_event/malloc_dump_provider.cc.orig +++ ./base/trace_event/malloc_dump_provider.cc -@@ -30,6 +30,7 @@ - // the current process. - bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - ProcessMemoryDump* pmd) { +@@ -55,6 +55,7 @@ + res = get_property_function("generic.current_allocated_bytes", + &allocated_objects_size); + DCHECK(res); +#if defined(__GLIBC__) - struct mallinfo info = mallinfo(); - DCHECK_GE(info.arena + info.hblkhd, info.uordblks); + } else { + struct mallinfo info = mallinfo(); + DCHECK_GE(info.arena + info.hblkhd, info.uordblks); +@@ -65,9 +66,11 @@ + total_virtual_size = info.arena + info.hblkhd; + resident_size = info.uordblks; + allocated_objects_size = info.uordblks; ++#endif + } + #endif -@@ -47,6 +48,7 @@ - MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects); ++#if defined(__GLIBC__) + MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc"); + outer_dump->AddScalar("virtual_size", MemoryAllocatorDump::kUnitsBytes, + total_virtual_size); +@@ -79,6 +82,7 @@ inner_dump->AddScalar(MemoryAllocatorDump::kNameSize, - MemoryAllocatorDump::kUnitsBytes, info.uordblks); + MemoryAllocatorDump::kUnitsBytes, + allocated_objects_size); +#endif return true; diff --git a/community/chromium/resolver.patch b/community/chromium/resolver.patch index fe1141ecbe..7e2a0a4723 100644 --- a/community/chromium/resolver.patch +++ b/community/chromium/resolver.patch @@ -22,3 +22,15 @@ DnsReloaderMaybeReload(); #endif int err = getaddrinfo(host.c_str(), NULL, &hints, &ai); +--- ./net/dns/dns_reloader.cc.orig ++++ ./net/dns/dns_reloader.cc +@@ -4,8 +4,7 @@ + + #include "net/dns/dns_reloader.h" + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ +- !defined(OS_ANDROID) ++#if defined(__GLIBC__) + + #include <resolv.h> + |