diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch index 00624ffedb8..4282a17f338 100644 --- a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch +++ b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch @@ -128,47 +128,45 @@ #include --- ./third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig +++ ./third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -@@ -58,7 +58,7 @@ - // FIXME: On Mac OSX and Linux, this method cannot estimate stack size - // correctly for the main thread. +@@ -68,7 +68,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). - // In this case, this method returns 0 and the caller must handle it. -@@ -105,7 +105,7 @@ + // 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. +@@ -135,7 +135,7 @@ + } - void* StackFrameDepth::getStackStart() - { + void* StackFrameDepth::getStackStart() { -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - pthread_attr_t attr; - int error; + 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 -@@ -26,7 +26,7 @@ - #include "ui/events/event_switches.h" - #include "ui/gfx/screen.h" +@@ -40,7 +40,7 @@ + #include "chrome/browser/metrics/tab_usage_recorder.h" + #endif // !defined(OS_ANDROID) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(__GLIBC__) && !defined(OS_CHROMEOS) #include #include "base/version.h" ---- ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig -+++ ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -116,7 +116,7 @@ +@@ -173,7 +173,7 @@ } void RecordLinuxGlibcVersion() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(__GLIBC__) && !defined(OS_CHROMEOS) - Version version(gnu_get_libc_version()); + base::Version version(gnu_get_libc_version()); UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE; -@@ -140,7 +140,7 @@ +@@ -197,7 +197,7 @@ #endif } @@ -177,7 +175,7 @@ UMALinuxWindowManager GetLinuxWindowManager() { switch (ui::GuessWindowManager()) { case ui::WM_UNKNOWN: -@@ -239,7 +239,7 @@ +@@ -330,7 +330,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() { RecordLinuxGlibcVersion(); diff --git a/srcpkgs/chromium/patches/issue2495583002_1.patch b/srcpkgs/chromium/patches/issue2495583002_1.patch deleted file mode 100644 index b1eb3ef9a99..00000000000 --- a/srcpkgs/chromium/patches/issue2495583002_1.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: net/quic/chromium/crypto/proof_verifier_chromium.cc -diff --git net/quic/chromium/crypto/proof_verifier_chromium.cc net/quic/chromium/crypto/proof_verifier_chromium.cc -index 546b00740fef947a95a109e7e9bc22ffdedce785..160191bf6226292d49997bec94429e3a1d0fe990 100644 ---- net/quic/chromium/crypto/proof_verifier_chromium.cc -+++ net/quic/chromium/crypto/proof_verifier_chromium.cc -@@ -426,6 +426,8 @@ int ProofVerifierChromium::Job::DoVerifyCertComplete(int result) { - int ct_result = OK; - if (verify_details_->ct_verify_result.cert_policy_compliance != - ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS && -+ verify_details_->ct_verify_result.cert_policy_compliance != -+ ct::CertPolicyCompliance::CERT_POLICY_BUILD_NOT_TIMELY && - transport_security_state_->ShouldRequireCT( - hostname_, cert_verify_result.verified_cert.get(), - cert_verify_result.public_key_hashes)) { -Index: net/socket/ssl_client_socket_impl.cc -diff --git net/socket/ssl_client_socket_impl.cc net/socket/ssl_client_socket_impl.cc -index bb76bf8c46d6d84f7d5ad7d48eacfe751204d151..a5d2afd7d8483a4996e04f9b68e3756f55af5d1a 100644 ---- net/socket/ssl_client_socket_impl.cc -+++ net/socket/ssl_client_socket_impl.cc -@@ -1556,6 +1556,8 @@ int SSLClientSocketImpl::VerifyCT() { - - if (ct_verify_result_.cert_policy_compliance != - ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS && -+ ct_verify_result_.cert_policy_compliance != -+ ct::CertPolicyCompliance::CERT_POLICY_BUILD_NOT_TIMELY && - transport_security_state_->ShouldRequireCT( - host_and_port_.host(), server_cert_verify_result_.verified_cert.get(), - server_cert_verify_result_.public_key_hashes)) { -Index: net/spdy/spdy_session.cc -diff --git net/spdy/spdy_session.cc net/spdy/spdy_session.cc -index b79c5e62e3d17f2745c369428c8ac35d9d663349..9315380e45f7f7d9ebfa5bdfe62d11c93705cddc 100644 ---- net/spdy/spdy_session.cc -+++ net/spdy/spdy_session.cc -@@ -617,6 +617,8 @@ bool SpdySession::CanPool(TransportSecurityState* transport_security_state, - - if (ssl_info.ct_cert_policy_compliance != - ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS && -+ ssl_info.ct_cert_policy_compliance != -+ ct::CertPolicyCompliance::CERT_POLICY_BUILD_NOT_TIMELY && - transport_security_state->ShouldRequireCT( - new_hostname, ssl_info.cert.get(), ssl_info.public_key_hashes)) { - return false; diff --git a/srcpkgs/chromium/patches/no-execinfo.patch b/srcpkgs/chromium/patches/no-execinfo.patch index de56066bff3..23adf39236e 100644 --- a/srcpkgs/chromium/patches/no-execinfo.patch +++ b/srcpkgs/chromium/patches/no-execinfo.patch @@ -70,8 +70,8 @@ void StackTrace::OutputToStream(std::ostream* os) const { StreamBacktraceOutputHandler handler(os); ProcessBacktrace(trace_, count_, &handler); ---- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2016-05-08 08:02:03.230553120 +0200 -+++ third_party/WebKit/Source/wtf/Assertions.cpp 2016-05-08 08:02:35.822504255 +0200 +--- 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 @@ -60,7 +60,7 @@ #include #endif @@ -81,24 +81,24 @@ #include #include #include -@@ -220,7 +220,7 @@ void WTFReportArgumentAssertionFailure(c +@@ -164,7 +164,7 @@ + } - void WTFGetBacktrace(void** stack, int* size) - { + void WTFGetBacktrace(void** stack, int* size) { -#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) +#if OS(MACOSX) || (OS(LINUX) && defined(__GLIBC__)) - *size = backtrace(stack, *size); + *size = backtrace(stack, *size); #elif OS(WIN) - // The CaptureStackBackTrace function is available in XP, but it is not defined -@@ -258,7 +258,7 @@ FrameToNameScope::FrameToNameScope(void* - : m_name(0) - , m_cxaDemangled(0) - { + // The CaptureStackBackTrace function is available in XP, but it is not +@@ -215,7 +215,7 @@ + }; + + FrameToNameScope::FrameToNameScope(void* addr) : m_name(0), m_cxaDemangled(0) { -#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) +#if OS(MACOSX) || (OS(LINUX) && defined(__GLIBC__)) - Dl_info info; - if (!dladdr(addr, &info) || !info.dli_sname) - return; + Dl_info info; + if (!dladdr(addr, &info) || !info.dli_sname) + return; --- third_party/webrtc/base/checks.cc.orig 2016-05-08 08:03:04.398461275 +0200 +++ third_party/webrtc/base/checks.cc 2016-05-08 08:03:24.254431362 +0200 @@ -16,7 +16,7 @@ diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index d058fcdb749..24dfaf33af1 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,14 +1,14 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=54.0.2840.100 +version=55.0.2883.75 revision=1 short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Juan RP " homepage="http://www.chromium.org/" license="BSD" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=e2e7f54a780c93ec2e933af09e1126837e6cf940b57213d39f36d58df10c89df +checksum=5bcf7180935bebc7648f7e2577f612da681f7846127f79dac22630ded9984e55 only_for_archs="i686 x86_64 x86_64-musl" lib32disabled=yes @@ -16,8 +16,7 @@ nodebug=yes nopie=yes # contains tools that are not PIE, enables PIE itself build_options="nacl" -build_options_default="" -desc_option_nacl="Enabled NaCL support" +desc_option_nacl="Enable NaCL support" hostmakedepends="yasm python pkg-config perl gperf bison ninja hwids libatomic-devel libevent-devel libglib-devel" @@ -71,8 +70,7 @@ do_configure() { # use_system_zlib=1 # use_system_libvpx=1 # use_system_re2=1 // breaks with re2-devel-2016.06.01 - # libevent - # bzip2 jsoncpp nspr minizip xdg_utils snappy speex + # bzip2 jsoncpp minizip xdg_utils speex system=" flac harfbuzz-ng