From f69e941936d866a7ddc3ed316fdcd0916eb2908f Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Thu, 10 Mar 2016 23:54:38 +0100 Subject: community/chromium: upgrade to 49.0.2623.87 --- community/chromium/APKBUILD | 31 ++++++++++--------- community/chromium/musl-hacks.patch | 22 ++++++++++++++ community/chromium/musl-sandbox.patch | 10 +++--- community/chromium/no-mallinfo.patch | 57 +++++++++++++++++------------------ 4 files changed, 70 insertions(+), 50 deletions(-) create mode 100644 community/chromium/musl-hacks.patch (limited to 'community') diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD index 9ba9f1e3bf..c73a854338 100644 --- a/community/chromium/APKBUILD +++ b/community/chromium/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter # Maintainer: Carlo Landmeter pkgname=chromium -pkgver=48.0.2564.116 +pkgver=49.0.2623.87 pkgrel=0 pkgdesc="chromium web browser" url="http://www.chromium.org/" @@ -37,8 +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 + + musl-hacks.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -137,6 +137,7 @@ build() { -Dusb_ids_path=/usr/share/hwdata/usb.ids \ -Duse_mojo=0 \ -Duse_gconf=0 \ + -Duse_sysroot=0 \ -Duse_pulseaudio=0 \ -Denable_hotwording=0 \ -Ddisable_fatal_linker_warnings=1 \ @@ -218,7 +219,7 @@ chromedriver() { "$subpkgdir"/usr/lib/$pkgname/chromedriver || return 1 } -md5sums="87d827c19dbc64f20b3494333aedf64b chromium-48.0.2564.116.tar.xz +md5sums="2d886e5ded692db41a604e722342484f chromium-49.0.2623.87.tar.xz b6d015c1da85aa65ee21bc974c7fc7d2 chromium-launcher.sh c5aa73a87d4b88cce9f1a680ca691bb6 chromium.conf 2962ac6259e39a797d441daf43aa49c9 chromium.desktop @@ -226,13 +227,13 @@ c5aa73a87d4b88cce9f1a680ca691bb6 chromium.conf 8d28a0bf8315bbc796fe04a5d94c90a7 musl-fixes.patch 00ae59dd9d09c60a116fd0133f9f3a60 no-execinfo.patch f99a4572c0be2c2123acc2478905e01f resolver.patch -118a79e218eebb4214e89726fd991ca8 no-mallinfo.patch +68befd7a58485973e15ca8a3263112d7 no-mallinfo.patch 2c8de771a7c0e5e0e9fc68fa978785f7 no-getcontext.patch -4f22f0d05448c49d6501386523a081ba musl-sandbox.patch +72f430ba7a83b32c0046152bc8c13a60 musl-sandbox.patch 97b1578585ab600ed9adef4f341ccd80 chromium-system-jinja-r7.patch de717d6430532f34fe161035dfdafcdf chromium-widevine.patch -b0da9a7f6791176e3064734dbc65ad85 chromium-use-non-versioned-icu-namespace.patch" -sha256sums="6a1eb9b4c853f15eeec0a55af7ac3b41835f0fc592ba6c0a500873cb12a84d0f chromium-48.0.2564.116.tar.xz +5f1bca53835b6380b5949c96860f6894 musl-hacks.patch" +sha256sums="c98d0f843d1f5e24f5df42154d91f340a8ae64f316399f163b701193e880774d chromium-49.0.2623.87.tar.xz 89f1eb19d1ed998a190045ea173959f01faee3490d58a6a34ca3fe21228e569f chromium-launcher.sh b466559340a36998354a0577325fe533d9e6b74c24a15b7599671171506bf128 chromium.conf 3ae90cea7503d0039de53448ed112b9bc0cb5a09f6b0045506eb777fc23517e5 chromium.desktop @@ -240,13 +241,13 @@ b466559340a36998354a0577325fe533d9e6b74c24a15b7599671171506bf128 chromium.conf 42e800f6cc223593188e977ab4e7010cda253204d91bace548c338578674804a musl-fixes.patch 505a55c28e971e067f189e3a1ce697d711cec82a765d81f78eb49ec1f6df56cf no-execinfo.patch 914c513bb54d4d97cd2a7622647f6af5cd0c8d29a0aa2962a60fdbed88f54429 resolver.patch -1f0a2d924267470e91c666e993e19058472d69fdb4448b063c25f6c46cbc0453 no-mallinfo.patch +6834c9a0623dc632baecb274ae9a8e7c0eca08b07268875d59a117dce16ae29e no-mallinfo.patch ea79f9a46116c8b56bbc69d226abd9252e4ae4d946ca695203f2298279cc2211 no-getcontext.patch -20fcb99022f3a737dceea7349da61e12a85834c0ab65a02009b6f56acb8b0f07 musl-sandbox.patch +16a3986a3ae9f662b27b2b8fb5d10e8a5afc84f183eb3cf4ab1cd8b8499744e0 musl-sandbox.patch 872f5a38d8263b14308bb117828496a4093d0e6ad755d39d2c5e6857314fe071 chromium-system-jinja-r7.patch 1d1ead77250475228524770e57c17282aff9098c5efc3d7719b0df76229b8874 chromium-widevine.patch -e4192446cc0ab6a5c540599c8a149f4f2208f0014da2786ada6c9544913d7426 chromium-use-non-versioned-icu-namespace.patch" -sha512sums="22c653580c1320b00e56a8b055e215b0292518af52e2d7e24b0610950ef1457a03dcec62b5417dd2e1021a2cf42b06d38b2249ee39d97aa662728f4972c54fc6 chromium-48.0.2564.116.tar.xz +10a4d81e1d8f70e4993ba0b7e1b9069f18c28190e6660e0f67bf24d598aa7c66 musl-hacks.patch" +sha512sums="4c9a96d322ec199a047d52057076579b9d6aefe6db8661f3b3c53f9f9d18ef5cd39c91038fe61e4158d371d4d4d8a78019f8cdf6e5e8135488d8233471d62728 chromium-49.0.2623.87.tar.xz b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c chromium.desktop @@ -254,9 +255,9 @@ e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b3 0d112ce486fd3b93ef60eadbc4db7f1746c51bc02634212ce986f34480915ea37f4ca8ff37d56316abecb112bb0fc1079e7bc27e603ec9ceabde01caa2777561 musl-fixes.patch 4f756d3e404033f7a36b38266176b7302f7e2a2e78c9f8b8d362a53a3dbdc675cdaa581393a70c23a29135b34566cf4109513cb13a289dc111bbce65ec065ebd no-execinfo.patch d60407a8faadfd2a8294570163b4d1b1112c8a70a6f8e778fc3aff25d20613a2e26c66cd87e69c54953cc1b984e4038015ad04797b0495df13932541b05398fe resolver.patch -ee28e99f090c282f17f118b31ced9aa2c69bb54598bc1f6be1b295a335f975742f716031406e85f6f1d774fbfef0f3319356d19df9c31aeecb215c8ef62531e8 no-mallinfo.patch +170173a05167cb073403501c9dc57bb86c2f77d54bcabf970cb1beb2302f848dc21a89c3406940b0156b94dfb20c12e2d2bdb73064613a28bc3af39ba1f453b5 no-mallinfo.patch 42d9a6ebea2d95cdc169b921cc1a1b846cf500997059fd3084de09e21f00b63b76e60c6124f4af247d402ff5ca3f4bf8867a6f2c78198c05b4273ca01fb29241 no-getcontext.patch -cc61407bae55523fd3d0b43be7cf827cd6a648314a81f8d78f830e60cb215ede6c585d8755e9c870bb98955a4d3679205cbefde6f4efcb0e48469169167823eb musl-sandbox.patch +2f5a54bf952eeecced66dc3711f11802a5c00854d0dc546f13b37a63804809233ac7ea52c56e18cc652794cb2dd7dfcf2a8f67097e1f20d9b1e85ce2e2d14654 musl-sandbox.patch 10bcc6a467b6766d13b5e41e7b7dcdbd62de7c04daad16c83037e88043032a0c118627029f91ef8a2a57faaaebc8b6f4ee16e8d1fecb5921d0d49efd60a27863 chromium-system-jinja-r7.patch 4a11b46afa8ce84bd23a8c506301b5848ee4291a764f3aed282b8a98706ece16cf9346dec6cc71b1e17812b15f43a5cbc7bc6d38ed4dcc88c12d6fcb03bd9295 chromium-widevine.patch -8b0b39b454350fe0377e0fb1b07a0ef4ac33633698a2070f8c539144ed3367d76c30a53d8ccbbfe23af096e9955741a25d812fe5a586079235cfcfcb5f22eb46 chromium-use-non-versioned-icu-namespace.patch" +4043dd7a64dcb9b73e15786b407934dd1b171df8b628ab1b18718fd93f9758c76eb25d1bdf1e1a22901544185088b8f817d3e2a58154c54949704dc8cc87b84d musl-hacks.patch" diff --git a/community/chromium/musl-hacks.patch b/community/chromium/musl-hacks.patch new file mode 100644 index 0000000000..d1f580a81d --- /dev/null +++ b/community/chromium/musl-hacks.patch @@ -0,0 +1,22 @@ +--- ./third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c.orig ++++ ./third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c +@@ -72,7 +72,7 @@ + pthread_setname_np(name); + #endif + #if defined(__Userspace_os_Linux) +- pthread_setname_np(pthread_self(), name); ++ //pthread_setname_np(pthread_self(), name); + #endif + #if defined(__Userspace_os_FreeBSD) + pthread_set_name_np(pthread_self(), name); +--- ./base/debug/stack_trace.cc.orig ++++ ./base/debug/stack_trace.cc +@@ -33,7 +33,7 @@ + + std::string StackTrace::ToString() const { + std::stringstream stream; +-#if !defined(__UCLIBC__) ++#if defined(__GLIBC__) + OutputToStream(&stream); + #endif + return stream.str(); diff --git a/community/chromium/musl-sandbox.patch b/community/chromium/musl-sandbox.patch index 3f244f03e6..9a6cad4f0f 100644 --- a/community/chromium/musl-sandbox.patch +++ b/community/chromium/musl-sandbox.patch @@ -1,6 +1,6 @@ ---- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.cld +--- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -@@ -111,23 +111,13 @@ +@@ -114,23 +114,13 @@ // CLONE_VM, nor CLONE_THREAD, which includes all fork() implementations. ResultExpr RestrictCloneToThreadsAndEPERMFork() { const Arg flags(0); @@ -21,9 +21,9 @@ - CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID; - const BoolExpr glibc_test = flags == kGlibcPthreadFlags; - -- const BoolExpr android_test = flags == kAndroidCloneMask || -- flags == kObsoleteAndroidCloneMask || -- flags == kGlibcPthreadFlags; +- const BoolExpr android_test = +- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask, +- flags == kGlibcPthreadFlags); - - return If(IsAndroid() ? android_test : glibc_test, Allow()) + return If(thread_clone_ok, Allow()) diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch index 7ce835b096..be571d40ad 100644 --- a/community/chromium/no-mallinfo.patch +++ b/community/chromium/no-mallinfo.patch @@ -1,41 +1,38 @@ ---- ./content/child/content_child_helpers.cc.orig -+++ ./content/child/content_child_helpers.cc -@@ -15,7 +15,7 @@ - - namespace content { - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(__GLIBC__) || defined(OS_ANDROID) - 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 -@@ -55,6 +55,7 @@ - res = get_property_function("generic.current_allocated_bytes", - &allocated_objects_size); - DCHECK(res); -+#if defined(__GLIBC__) - } 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 - } +@@ -61,7 +61,7 @@ + // fixed quantum, so the excess region will not be resident. + // See crrev.com/1531463004 for detailed explanation. + resident_size = stats.max_size_in_use; +-#else ++#elif defined(__GLIBC__) + struct mallinfo info = mallinfo(); + DCHECK_GE(info.arena + info.hblkhd, info.uordblks); + +@@ -73,6 +73,7 @@ + allocated_objects_size = info.uordblks; #endif -+#if defined(__GLIBC__) ++#if defined(USE_TCMALLOC) || defined(__GLIBC__) || defined(OS_MACOSX) || defined(OS_IOS) 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, - allocated_objects_size); +@@ -95,6 +96,7 @@ + MemoryAllocatorDump::kUnitsBytes, + resident_size - allocated_objects_size); + } +#endif return true; } +--- ./content/child/content_child_helpers.cc ++++ ./content/child/content_child_helpers.cc +@@ -18,7 +18,7 @@ + + namespace content { + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(_GLIBC_) || defined(OS_ANDROID) + size_t GetMemoryUsageKB() { + struct mallinfo minfo = mallinfo(); + uint64_t mem_usage = -- cgit v1.2.3