diff options
author | Rene Ladan <rene@FreeBSD.org> | 2015-12-10 08:37:50 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2015-12-10 08:37:50 +0000 |
commit | c9798e638632a56593c285ebc76783cc1bb32aff (patch) | |
tree | 6fdde026e22140b8b1cb5b428fcaf867d5e42c0e | |
parent | 506339b3472bcf88e23b43344656e507e1ac6d19 (diff) | |
download | ports-c9798e638632a56593c285ebc76783cc1bb32aff.tar.gz ports-c9798e638632a56593c285ebc76783cc1bb32aff.zip |
www/chromium: fix build on 9amd64, regression-tested on 10i386
MFH: 2015Q4
Notes
Notes:
svn path=/head/; revision=403446
-rw-r--r-- | www/chromium/files/extra-patch-clang | 11 | ||||
-rw-r--r-- | www/chromium/files/extra-patch-gcc | 22 | ||||
-rw-r--r-- | www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp | 14 |
3 files changed, 33 insertions, 14 deletions
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index c085f95e9627..7c63497855bf 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -242,3 +242,14 @@ } bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2015-10-14 22:17:57.580250000 +0200 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2015-10-14 22:18:13.766229000 +0200 +@@ -358,7 +358,7 @@ + { + RefPtr<SharedBuffer> buffer; + +- SkFontTableTag tag = WTF::bswap32(table); ++ SkFontTableTag tag = bswap32(table); + const size_t tableSize = m_typeface->getTableSize(tag); + if (tableSize) { + Vector<char> tableBuffer(tableSize); diff --git a/www/chromium/files/extra-patch-gcc b/www/chromium/files/extra-patch-gcc index e50403d345c7..df30aa08673c 100644 --- a/www/chromium/files/extra-patch-gcc +++ b/www/chromium/files/extra-patch-gcc @@ -135,3 +135,25 @@ const char* suffix, const char* mode); struct AsDOT { +--- v8/src/log-utils.h.orig 2015-10-13 21:04:45.000000000 +0200 ++++ v8/src/log-utils.h 2015-10-17 10:17:35.535561000 +0200 +@@ -5,6 +5,9 @@ + #ifndef V8_LOG_UTILS_H_ + #define V8_LOG_UTILS_H_ + ++#include <cstdarg> ++#include <cstdio> ++ + #include "src/allocation.h" + #include "src/base/platform/mutex.h" + #include "src/flags.h" +--- third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc.orig 2015-10-22 21:00:59.000000000 +0200 ++++ third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc 2015-11-01 11:32:36.293750000 +0100 +@@ -11,6 +11,7 @@ + #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" + + #include <algorithm> ++#include <cstdio> + #include <sstream> + #include <math.h> + #include <stdlib.h> diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp b/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp deleted file mode 100644 index 5b54f394ffec..000000000000 --- a/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2015-10-14 15:15:21.746018000 -0400 -+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2015-10-14 15:36:04.640922000 -0400 -@@ -358,7 +358,11 @@ - { - RefPtr<SharedBuffer> buffer; - -+#if defined(__FreeBSD__) -+ SkFontTableTag tag = bswap32(table); -+#else - SkFontTableTag tag = WTF::bswap32(table); -+#endif - const size_t tableSize = m_typeface->getTableSize(tag); - if (tableSize) { - Vector<char> tableBuffer(tableSize); |