aboutsummaryrefslogtreecommitdiffstats
path: root/community/chromium/musl-fixes.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-08-08 13:34:16 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2017-09-15 13:37:11 +0000
commitd183e852a762296b473c33e9ce106f52a4359dae (patch)
tree2f92f891d7ff1fc4b4aa0551bd7b28218b30b9d3 /community/chromium/musl-fixes.patch
parent0d4667363c89e53a83538d90acdc612739d061db (diff)
downloadaports-d183e852a762296b473c33e9ce106f52a4359dae.tar.bz2
aports-d183e852a762296b473c33e9ce106f52a4359dae.tar.xz
community/chromium: upgrade to 61.0.3163.79
to fix tab crashes, use patch from https://github.com/lluixhi/musl-extras/issues/10#issuecomment-328272349 use various patches from fedora
Diffstat (limited to 'community/chromium/musl-fixes.patch')
-rw-r--r--community/chromium/musl-fixes.patch115
1 files changed, 57 insertions, 58 deletions
diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch
index 48d8563454..a06d9613d3 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/dns/dns_config_service_posix.cc.orig
-+++ ./net/dns/dns_config_service_posix.cc
-@@ -116,7 +116,7 @@
- ConfigParsePosixResult ReadDnsConfig(DnsConfig* config) {
- ConfigParsePosixResult result;
- config->unhandled_options = false;
--#if defined(OS_OPENBSD)
-+#if defined(OS_OPENBSD) || defined(_GNU_SOURCE)
- // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
- // res_init behaves the same way.
- memset(&_res, 0, sizeof(_res));
--- ./third_party/ffmpeg/libavutil/cpu.c.orig
+++ ./third_party/ffmpeg/libavutil/cpu.c
@@ -38,7 +38,6 @@
@@ -126,19 +115,22 @@
#endif
#if HAVE_UNISTD_H
#include <unistd.h>
---- ./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 @@
- #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)
+diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+index 9067e84..1c47b2a 100644
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+@@ -39,7 +39,9 @@
+ #endif // defined(OS_ANDROID) && defined(__arm__)
+
+ #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(__GLIBC__)
#include <gnu/libc-version.h>
++#endif
- #include "base/version.h"
-@@ -173,7 +173,7 @@
- }
+ #include "base/linux_util.h"
+ #include "base/strings/string_split.h"
+@@ -295,7 +297,7 @@ void RecordLinuxDistro() {
+ #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
void RecordLinuxGlibcVersion() {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -146,24 +138,6 @@
base::Version version(gnu_get_libc_version());
UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
-@@ -197,7 +197,7 @@
- #endif
- }
-
--#if defined(USE_X11) && !defined(OS_CHROMEOS)
-+#if defined(__GLIBC__) && defined(USE_X11) && !defined(OS_CHROMEOS)
- UMALinuxWindowManager GetLinuxWindowManager() {
- switch (ui::GuessWindowManager()) {
- case ui::WM_UNKNOWN:
-@@ -330,7 +330,7 @@
-
- void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() {
- RecordLinuxGlibcVersion();
--#if defined(USE_X11) && !defined(OS_CHROMEOS)
-+#if defined(__GLIBC__) && defined(USE_X11) && !defined(OS_CHROMEOS)
- UMA_HISTOGRAM_ENUMERATION("Linux.WindowManager",
- GetLinuxWindowManager(),
- UMA_LINUX_WINDOW_MANAGER_COUNT);
--- ./device/serial/serial_io_handler_posix.cc.orig
+++ ./device/serial/serial_io_handler_posix.cc
@@ -6,6 +6,7 @@
@@ -174,17 +148,6 @@
#include "base/posix/eintr_wrapper.h"
---- ./base/logging.cc.orig
-+++ ./base/logging.cc
-@@ -494,7 +494,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 && !base::debug::BeingDebugged()) {
- // Include a stack trace on a fatal, unless a debugger is attached.
- base::debug::StackTrace trace;
diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h
index a80ea16..55a2abf 100644
--- third_party/ots/include/opentype-sanitiser.h
@@ -197,23 +160,59 @@ index a80ea16..55a2abf 100644
#include <arpa/inet.h>
#include <stdint.h>
#endif
+--- ./base/logging.cc.orig
++++ ./base/logging.cc
+@@ -545,8 +545,7 @@
+
+ LogMessage::~LogMessage() {
+ size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
+- !defined(OS_AIX)
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__)
+ if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
+ // Include a stack trace on a fatal, unless a debugger is attached.
+ base::debug::StackTrace trace;
--- ./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)
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+ defined(OS_FUCHSIA)
// 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 @@
+@@ -96,7 +96,7 @@
}
void* GetStackStart() {
--#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
-+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+ defined(OS_FUCHSIA)
pthread_attr_t attr;
int error;
- #if OS(FREEBSD)
+--- ./net/dns/dns_config_service_posix.cc.orig
++++ ./net/dns/dns_config_service_posix.cc
+@@ -122,7 +122,7 @@
+ ConfigParsePosixResult result;
+ config->unhandled_options = false;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || defined(_GNU_SOURCE)
+ // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+ // res_init behaves the same way.
+ memset(&_res, 0, sizeof(_res));
+--- base/native_library_posix.cc.orig 2016-11-17 01:45:50.032002326 +0100
++++ base/native_library_posix.cc 2016-11-17 01:46:23.729001549 +0100
+@@ -12,6 +12,10 @@
+ #include "base/strings/utf_string_conversions.h"
+ #include "base/threading/thread_restrictions.h"
+
++#ifndef RTLD_DEEPBIND
++#define RTLD_DEEPBIND 0
++#endif
++
+ namespace base {
+
+ std::string NativeLibraryLoadError::ToString() const {