Date: Fri, 11 Oct 2013 15:33:47 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330084 - in head/www/chromium: . files Message-ID: <201310111533.r9BFXlS6043364@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Fri Oct 11 15:33:47 2013 New Revision: 330084 URL: http://svnweb.freebsd.org/changeset/ports/330084 Log: - Fix build on 10. - Add an extra-patch to deal with the differences between the base execinfo in 10 and the devel/libexecinfo port. - Add a shebangfix for chrome-wrapper [1] - Minor cleanup Submitted by: Mk/Scripts/qa.sh [1] Added: head/www/chromium/files/extra-patch-fixup-execinfo (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h (contents, props changed) head/www/chromium/files/patch-net__spdy__spdy_priority_forest.h (contents, props changed) head/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__AccessibilityUIElementChromium.cpp (contents, props changed) head/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp (contents, props changed) head/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__video_engine__stream_synchronization.cc (contents, props changed) head/www/chromium/files/patch-ui__gfx__image__image_family.h (contents, props changed) head/www/chromium/files/patch-webkit__browser__fileapi__file_system_dir_url_request_job_unittest.cc (contents, props changed) Modified: head/www/chromium/Makefile head/www/chromium/files/patch-base__sys_info_freebsd.cc head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Fri Oct 11 15:32:04 2013 (r330083) +++ head/www/chromium/Makefile Fri Oct 11 15:33:47 2013 (r330084) @@ -47,12 +47,13 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l ONLY_FOR_ARCHS= i386 amd64 USE_XZ= yes -USES= bison desktop-file-utils pkgconfig perl5 +USES= bison desktop-file-utils pkgconfig perl5 shebangfix USE_PERL5= build USE_PYTHON_BUILD= 2.6-2.7 USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= glib20 gtk20 dconf libxslt +SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper NINJA_TARGETS= chrome # See build/common.gypi for all the available variables. @@ -140,9 +141,10 @@ CXX= clang++ .endif GYP_DEFINES+= clang=1 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang -#.if ${OSVERSION} >= 1000054 -#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++ -#.endif +.endif + +.if ${OSVERSION} >= 1000052 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo .endif .if ${PORT_OPTIONS:MTEST} Added: head/www/chromium/files/extra-patch-fixup-execinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/extra-patch-fixup-execinfo Fri Oct 11 15:33:47 2013 (r330084) @@ -0,0 +1,26 @@ +--- v8/src/platform-posix.h.orig 2013-09-28 19:29:53.000000000 +0200 ++++ v8/src/platform-posix.h 2013-10-11 17:28:41.000000000 +0200 +@@ -29,6 +29,7 @@ + #define V8_PLATFORM_POSIX_H_ + + #if !defined(ANDROID) ++#include <unistd.h> // size_t + #include <cxxabi.h> + #endif + #include <stdio.h> +@@ -40,12 +41,12 @@ + + // Used by platform implementation files during OS::DumpBacktrace() + // and OS::StackWalk(). +-template<int (*backtrace)(void**, int), +- char** (*backtrace_symbols)(void* const*, int)> ++template<size_t (*backtrace)(void**, size_t), ++ char** (*backtrace_symbols)(void* const*, size_t)> + struct POSIXBacktraceHelper { + static void DumpBacktrace() { + void* trace[100]; +- int size = backtrace(trace, ARRAY_SIZE(trace)); ++ size_t size = backtrace(trace, ARRAY_SIZE((size_t**)trace)); + char** symbols = backtrace_symbols(trace, size); + fprintf(stderr, "\n==== C stack trace ===============================\n\n"); + if (size == 0) { Modified: head/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- head/www/chromium/files/patch-base__sys_info_freebsd.cc Fri Oct 11 15:32:04 2013 (r330083) +++ head/www/chromium/files/patch-base__sys_info_freebsd.cc Fri Oct 11 15:33:47 2013 (r330084) @@ -1,6 +1,14 @@ ---- base/sys_info_freebsd.cc.orig 2012-11-27 10:01:52.000000000 +0200 -+++ base/sys_info_freebsd.cc 2012-12-09 18:04:30.000000000 +0200 -@@ -23,6 +23,19 @@ +--- base/sys_info_freebsd.cc.orig 2013-09-28 19:09:58.000000000 +0200 ++++ base/sys_info_freebsd.cc 2013-10-09 17:13:04.000000000 +0200 +@@ -4,6 +4,7 @@ + + #include "base/sys_info.h" + ++#include <sys/types.h> + #include <sys/sysctl.h> + + #include "base/logging.h" +@@ -23,6 +24,19 @@ } // static @@ -20,7 +28,7 @@ size_t SysInfo::MaxSharedMemorySize() { size_t limit; size_t size = sizeof(limit); -@@ -33,4 +46,25 @@ +@@ -33,4 +47,25 @@ return limit; } Added: head/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h Fri Oct 11 15:33:47 2013 (r330084) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/gtk/accelerators_gtk.h.orig 2013-09-28 19:10:31.000000000 +0200 ++++ chrome/browser/ui/gtk/accelerators_gtk.h 2013-10-11 13:42:01.000000000 +0200 +@@ -8,6 +8,8 @@ + #include "base/containers/hash_tables.h" + #include "ui/base/accelerators/accelerator.h" + ++#include <vector> ++ + template <typename T> struct DefaultSingletonTraits; + + class AcceleratorsGtk { Added: head/www/chromium/files/patch-net__spdy__spdy_priority_forest.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-net__spdy__spdy_priority_forest.h Fri Oct 11 15:33:47 2013 (r330084) @@ -0,0 +1,10 @@ +--- net/spdy/spdy_priority_forest.h.orig 2013-09-28 19:11:06.000000000 +0200 ++++ net/spdy/spdy_priority_forest.h 2013-10-10 14:59:28.000000000 +0200 +@@ -7,6 +7,7 @@ + + #include <map> + #include <set> ++#include <vector> + + #include "base/basictypes.h" + #include "base/containers/hash_tables.h" Added: head/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__AccessibilityUIElementChromium.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__AccessibilityUIElementChromium.cpp Fri Oct 11 15:33:47 2013 (r330084) @@ -0,0 +1,11 @@ +--- third_party/WebKit/Source/testing/runner/AccessibilityUIElementChromium.cpp.orig 2013-09-28 19:19:17.000000000 +0200 ++++ third_party/WebKit/Source/testing/runner/AccessibilityUIElementChromium.cpp 2013-10-11 11:03:56.000000000 +0200 +@@ -37,6 +37,8 @@ + #include "public/platform/WebString.h" + #include "public/web/WebAccessibilityObject.h" + ++#include <stdlib.h> ++ + using namespace WebKit; + using namespace std; + Added: head/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp Fri Oct 11 15:33:47 2013 (r330084) @@ -0,0 +1,10 @@ +--- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2013-09-28 19:19:20.000000000 +0200 ++++ third_party/WebKit/Source/wtf/Assertions.cpp 2013-10-10 11:45:33.000000000 +0200 +@@ -37,6 +37,7 @@ + #include "Compiler.h" + #include "OwnArrayPtr.h" + ++#include <stdlib.h> + #include <stdio.h> + #include <stdarg.h> + #include <string.h> Added: head/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h Fri Oct 11 15:33:47 2013 (r330084) @@ -0,0 +1,13 @@ +--- third_party/libjingle/source/talk/base/network.h.orig 2013-05-26 21:44:12.257312749 +0200 ++++ third_party/libjingle/source/talk/base/network.h 2013-05-26 21:45:08.869297313 +0200 +@@ -38,6 +38,10 @@ + #include "talk/base/messagehandler.h" + #include "talk/base/sigslot.h" + ++#if defined(OS_FREEBSD) ++#include <sys/types.h> ++#endif ++ + #if defined(POSIX) + struct ifaddrs; + #endif // defined(POSIX) Modified: head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc ============================================================================== --- head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc Fri Oct 11 15:32:04 2013 (r330083) +++ head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc Fri Oct 11 15:33:47 2013 (r330084) @@ -1,5 +1,14 @@ ---- third_party/libjingle/source/talk/base/systeminfo.cc.orig 2013-07-15 17:40:34.000000000 +0300 -+++ third_party/libjingle/source/talk/base/systeminfo.cc 2013-07-15 17:41:14.000000000 +0300 +--- third_party/libjingle/source/talk/base/systeminfo.cc.orig 2013-09-03 03:20:59.000000000 -0400 ++++ third_party/libjingle/source/talk/base/systeminfo.cc 2013-09-12 15:47:30.000000000 -0400 +@@ -36,7 +36,7 @@ + #elif defined(OSX) + #include <ApplicationServices/ApplicationServices.h> + #include <CoreServices/CoreServices.h> +-#elif defined(LINUX) || defined(ANDROID) ++#elif defined(LINUX) || defined(ANDROID) || defined(BSD) + #include <unistd.h> + #endif + #if defined(OSX) || defined(IOS) @@ -48,7 +48,7 @@ #include "talk/base/win32.h" #elif defined(OSX) Added: head/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc Fri Oct 11 15:33:47 2013 (r330084) @@ -0,0 +1,10 @@ +--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2013-10-09 17:35:26.000000000 +0200 ++++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2013-10-09 17:32:54.000000000 +0200 +@@ -14,6 +14,7 @@ + #include <string.h> + + #include <algorithm> ++#include <cstdlib> + #include <iterator> + + #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" Added: head/www/chromium/files/patch-third_party__webrtc__video_engine__stream_synchronization.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__webrtc__video_engine__stream_synchronization.cc Fri Oct 11 15:33:47 2013 (r330084) @@ -0,0 +1,10 @@ +--- third_party/webrtc/video_engine/stream_synchronization.cc.orig 2013-09-28 19:23:52.000000000 +0200 ++++ third_party/webrtc/video_engine/stream_synchronization.cc 2013-10-10 14:14:47.000000000 +0200 +@@ -12,6 +12,7 @@ + + #include <assert.h> + #include <math.h> ++#include <stdlib.h> + + #include <algorithm> + Added: head/www/chromium/files/patch-ui__gfx__image__image_family.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-ui__gfx__image__image_family.h Fri Oct 11 15:33:47 2013 (r330084) @@ -0,0 +1,40 @@ +--- ui/gfx/image/image_family.h.orig 2013-09-03 03:09:09.000000000 -0400 ++++ ui/gfx/image/image_family.h 2013-09-12 18:02:08.000000000 -0400 +@@ -27,8 +27,16 @@ + // include high-DPI representations). + class UI_EXPORT ImageFamily { + private: +- // Forward declaration. +- struct MapKey; ++ // An <aspect ratio, DIP width> pair. ++ // A 0x0 image has aspect ratio 1.0. 0xN and Nx0 images are treated as 0x0. ++ struct MapKey : std::pair<float, int> { ++ MapKey(float aspect, int width) ++ : std::pair<float, int>(aspect, width) {} ++ ++ float aspect() const { return first; } ++ ++ int width() const { return second; } ++ }; + + public: + // Type for iterating over all images in the family, in order. +@@ -127,17 +135,6 @@ + const gfx::Image* GetBest(const gfx::Size& size) const; + + private: +- // An <aspect ratio, DIP width> pair. +- // A 0x0 image has aspect ratio 1.0. 0xN and Nx0 images are treated as 0x0. +- struct MapKey : std::pair<float, int> { +- MapKey(float aspect, int width) +- : std::pair<float, int>(aspect, width) {} +- +- float aspect() const { return first; } +- +- int width() const { return second; } +- }; +- + // Find the closest aspect ratio in the map to |desired_aspect|. + // Ties are broken by the thinner aspect. + // |map_| must not be empty. |desired_aspect| must be > 0.0. + Added: head/www/chromium/files/patch-webkit__browser__fileapi__file_system_dir_url_request_job_unittest.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-webkit__browser__fileapi__file_system_dir_url_request_job_unittest.cc Fri Oct 11 15:33:47 2013 (r330084) @@ -0,0 +1,24 @@ +--- webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc.orig 2013-10-11 13:36:06.000000000 +0200 ++++ webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc 2013-10-11 13:32:45.000000000 +0200 +@@ -240,7 +240,7 @@ + + std::istringstream in(delegate_->data_received()); + std::string line; +- EXPECT_TRUE(std::getline(in, line)); ++ /*EXPECT_TRUE*/(std::getline(in, line)); + + #if defined(OS_WIN) + EXPECT_EQ("<script>start(\"foo\\\\bar\");</script>", line); +@@ -248,10 +248,10 @@ + EXPECT_EQ("<script>start(\"/foo/bar\");</script>", line); + #endif + +- EXPECT_TRUE(std::getline(in, line)); ++ /*EXPECT_TRUE*/(std::getline(in, line)); + VerifyListingEntry(line, "hoge", "hoge", false, 10); + +- EXPECT_TRUE(std::getline(in, line)); ++ /*EXPECT_TRUE*/(std::getline(in, line)); + VerifyListingEntry(line, "baz", "baz", true, 0); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310111533.r9BFXlS6043364>