diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-28 02:43:12 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-28 02:48:24 +0000 |
commit | 4321d98a3c9eed570fe04872e5d133c5d011be92 (patch) | |
tree | 29b939fa9c133b448c5d40802f869a87b27f7fe5 /community/chromium/musl-fixes.patch | |
parent | 712aae449ebc46ea0fb31db103ced0633a958df1 (diff) | |
download | aports-4321d98a3c9eed570fe04872e5d133c5d011be92.tar.bz2 aports-4321d98a3c9eed570fe04872e5d133c5d011be92.tar.xz |
community/chromium: upgrade to 52.0.2743.116
Diffstat (limited to 'community/chromium/musl-fixes.patch')
-rw-r--r-- | community/chromium/musl-fixes.patch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch index 1410502b3b..62692503fb 100644 --- a/community/chromium/musl-fixes.patch +++ b/community/chromium/musl-fixes.patch @@ -186,16 +186,6 @@ UMA_HISTOGRAM_ENUMERATION("Linux.WindowManager", GetLinuxWindowManager(), UMA_LINUX_WINDOW_MANAGER_COUNT); ---- ./third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c.orig -+++ ./third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c -@@ -38,7 +38,6 @@ - #include <sys/param.h> - #endif - #include <sys/types.h> --#include <sys/sysctl.h> - #endif - #if HAVE_UNISTD_H - #include <unistd.h> --- ./device/serial/serial_io_handler_posix.cc.orig +++ ./device/serial/serial_io_handler_posix.cc @@ -6,6 +6,7 @@ @@ -217,3 +207,15 @@ 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 +--- a/third_party/ots/include/opentype-sanitiser.h ++++ b/third_party/ots/include/opentype-sanitiser.h +@@ -20,6 +20,7 @@ typedef unsigned __int64 uint64_t; + #define htonl(x) _byteswap_ulong (x) + #define htons(x) _byteswap_ushort (x) + #else ++#include <sys/types.h> + #include <arpa/inet.h> + #include <stdint.h> + #endif |