mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00
Code Issues Releases Activity

- Update to 6.0.472.63, again without the Courgette code

Browse Source 
- Add option to depend on VP8 codec from ports
- Makefile cleanups
- Tested to work with --integrated-as by maintainer
PR:		ports/152166
Submitted by:	maintainer
This commit is contained in:
Rene Ladan 2010-11-13 09:22:45 +00:00
parent 7c642d9fdc
commit 73d79ddb86
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=264471
7 changed files with 2305 additions and 2042 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
www/chromium/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= chromium
DISTVERSIONPREFIX= courgette-redacted-
DISTVERSION= 5.0.375.127
DISTVERSION= 6.0.472.63
CATEGORIES= www
MASTER_SITES= http://chromium.hybridsource.org/old/ports/ \
CRITICAL
@ -15,8 +15,8 @@ MASTER_SITES= http://chromium.hybridsource.org/old/ports/ \
MAINTAINER= chromium@hybridsource.org
COMMENT= A mostly BSD-licensed web browser based on WebKit and Gtk+
BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex \
gperf:${PORTSDIR}/devel/gperf \
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
bash:${PORTSDIR}/shells/bash \
pkg-config:${PORTSDIR}/devel/pkg-config \
yasm:${PORTSDIR}/devel/yasm \
@ -30,23 +30,26 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
Xss.1:${PORTSDIR}/x11/libXScrnSaver \
asound.2:${PORTSDIR}/audio/alsa-lib \
freetype.9:${PORTSDIR}/print/freetype2 \
nss3.1:${PORTSDIR}/security/nss
nss3.1:${PORTSDIR}/security/nss \
gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
USE_XZ= yes
USE_BISON= build
USE_PYTHON= 2.6 # only needed at build time
USE_PERL5_BUILD=yes
USE_GMAKE= yes
USE_GCC= 4.2+
MAN1= chrome.1
USE_XORG= scrnsaverproto
USE_GNOME= glib20 gtk20 gconf2
USE_GNOME= glib20 gtk20 gconf2 libxslt
LICENSE_COMB= multi
LICENSE= BSD LGPL21 MPL
DESKTOP_ENTRIES="Chromium" "${COMMENT}" "${DATADIR}/product_logo_48.png" \
"chrome" "Application;Network;WebBrowser;" true
ALL_TARGET= chrome
#user tunables showing defaults, some won't compile if changed
@ -59,14 +62,8 @@ GYP_DEFINES+= use_system_libxml=1
#GYP_DEFINES+= use_system_sqlite=0
#GYP_DEFINES+= use_system_zlib=1
OPTIONS= CODECS "Compile and enable patented codecs like H.264" off
DESKTOP_ENTRIES= "Chromium" \
"${COMMENT}" \
"${DATADIR}/product_logo_48.png" \
"chrome" \
"Application;Network;WebBrowser;" \
"true"
OPTIONS= CODECS "Compile and enable patented codecs like H.264" off \
VPX "Use system libvpx for VP8 codec" on
.include <bsd.port.pre.mk>
@ -80,12 +77,19 @@ GYP_DEFINES+= ffmpeg_branding=Chrome
GYP_DEFINES+= ffmpeg_branding=Chromium
.endif
.if defined(WITH_VPX)
LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx
GYP_DEFINES+= use_system_vpx=1
.endif
.if !defined(WITH_DEBUG)
BUILDTYPE= Release
.else
BUILDTYPE= Debug
.endif
#pull newer flex and gperf in from ports
MAKE_ENV+= PATH=${LOCALBASE}/bin:${PATH}
MAKE_ENV+= BUILDTYPE=${BUILDTYPE}
MAKE_JOBS_SAFE= yes
STRIP=
@ -110,18 +114,18 @@ post-patch:
${WRKSRC}/v8/tools/gyp/v8.gyp
@${REINPLACE_CMD} -e 's|/usr/bin/gcc|${CC}|' \
${WRKSRC}/third_party/WebKit/WebCore/bindings/scripts/IDLParser.pm \
${WRKSRC}/third_party/WebKit/WebCore/css/make-css-file-arrays.pl \
${WRKSRC}/third_party/WebKit/WebCore/dom/make_names.pl
do-configure:
cd ${WRKSRC} && \
${SETENV} GYP_GENERATORS="make" GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} ./build/gyp_chromium chrome/chrome.gyp --depth ./
GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} ./build/gyp_chromium chrome/chrome.gyp --depth ./
do-install:
${MKDIR} ${DATADIR}
${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${MANPREFIX}/man/man1
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/chrome.pak ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources.pak ${DATADIR}
${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper ${DATADIR}
${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${DATADIR}
.for f in chrome ffmpegsumo_nolink libffmpegsumo.so mksnapshot protoc

5
www/chromium/distinfo
View File

@ -1,3 +1,2 @@
MD5 (chromium-courgette-redacted-5.0.375.127.tar.bz2) = 8f2677735d2e4b11f9935e1827d749e9
SHA256 (chromium-courgette-redacted-5.0.375.127.tar.bz2) = bc9140746a97877ab5e5da405ee0e9fd1b6ceb86cefc56969d92d3365e74c0b1
SIZE (chromium-courgette-redacted-5.0.375.127.tar.bz2) = 162104866
SHA256 (chromium-courgette-redacted-6.0.472.63.tar.xz) = 94ffd913f3724570eaa4bc9c61b8c78e0fd66c6d3e4a39fe4c27bcd075c0a455
SIZE (chromium-courgette-redacted-6.0.472.63.tar.xz) = 95188168

3448
www/chromium/files/patch-chromium
View File

File diff suppressed because it is too large Load Diff

178
www/chromium/files/patch-clang
View File

@ -1,3 +1,44 @@
diff --git a/base/logging.h b/base/logging.h
index 2084739..d865744 100644
--- base/logging.h
+++ base/logging.h
@@ -102,6 +102,18 @@
// There is also the special severity of DFATAL, which logs FATAL in
// debug mode, ERROR in normal mode.
+// XXX better comment -- must be before we use << and in global namespace
+// These functions are provided as a convenience for logging, which is where we
+// use streams (it is against Google style to use streams in other places). It
+// is designed to allow you to emit non-ASCII Unicode strings to the log file,
+// which is normally ASCII. It is relatively slow, so try not to use it for
+// common cases. Non-ASCII characters will be converted to UTF-8 by these
+// operators.
+std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
+inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
+ return out << wstr.c_str();
+}
+
namespace logging {
// Where to record logging output? A flat file and/or system debug log via
@@ -842,17 +854,6 @@ void RawLog(int level, const char* message);
} // namespace logging
-// These functions are provided as a convenience for logging, which is where we
-// use streams (it is against Google style to use streams in other places). It
-// is designed to allow you to emit non-ASCII Unicode strings to the log file,
-// which is normally ASCII. It is relatively slow, so try not to use it for
-// common cases. Non-ASCII characters will be converted to UTF-8 by these
-// operators.
-std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
-inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
- return out << wstr.c_str();
-}
-
// The NOTIMPLEMENTED() macro annotates codepaths which have
// not been implemented yet.
//
diff -ru chrome/plugin/plugin_main_linux.cc.orig chrome/plugin/plugin_main_linux.cc
--- chrome/plugin/plugin_main_linux.cc.orig 2010-10-23 17:25:49.000000000 -0700
+++ chrome/plugin/plugin_main_linux.cc 2010-10-23 13:57:10.000000000 -0700
@ -10,18 +51,44 @@ diff -ru chrome/plugin/plugin_main_linux.cc.orig chrome/plugin/plugin_main_linux
#include <unistd.h>
#include "build/build_config.h"
diff -ru third_party/libjingle/files/talk/base/stringencode.cc.orig third_party/libjingle/files/talk/base/stringencode.cc
--- third_party/libjingle/files/talk/base/stringencode.cc.orig 2010-08-18 01:01:35.000000000 -0700
+++ third_party/libjingle/files/talk/base/stringencode.cc 2010-10-23 13:51:39.000000000 -0700
@@ -29,7 +29,7 @@
#include <malloc.h>
--- net/base/ssl_config_service.h.orig 2010-09-21 08:01:26.000000000 +0000
+++ net/base/ssl_config_service.h 2010-11-13 07:22:48.000000000 +0000
@@ -121,10 +121,10 @@
// True if we use False Start for SSL and TLS.
static bool false_start_enabled();
- protected:
// SetFlags sets the values of several flags based on global configuration.
static void SetSSLConfigFlags(SSLConfig*);
+ protected:
friend class base::RefCountedThreadSafe<SSLConfigService>;
virtual ~SSLConfigService() {}
--- third_party/ffmpeg/patched-ffmpeg-mt/libavcodec/x86/dsputil_mmx.c.orig 2010-09-21 08:06:29.000000000 +0000
+++ third_party/ffmpeg/patched-ffmpeg-mt/libavcodec/x86/dsputil_mmx.c 2010-11-13 07:22:15.000000000 +0000
@@ -615,7 +615,7 @@
__asm__ volatile(
"mov %7, %3 \n"
"1: \n"
- "movzx (%3,%4), %2 \n"
+ "movzbl (%3,%4), %2 \n"
"mov %2, %k3 \n"
"sub %b1, %b3 \n"
"add %b0, %b3 \n"
Index: third_party/libjingle/source/talk/base/stringutils.h
===================================================================
--- third_party/libjingle/source/talk/base/stringutils.h (revision 29)
+++ third_party/libjingle/source/talk/base/stringutils.h (working copy)
@@ -37,7 +37,7 @@
#define alloca _alloca
#endif // WIN32
#ifdef POSIX
-#include <alloca.h>
+#include <stdlib.h>
#define _alloca alloca
#endif // POSIX
#include <stdlib.h>
#include <cstring>
diff -ru third_party/skia/include/core/SkPreConfig.h.orig third_party/skia/include/core/SkPreConfig.h
--- third_party/skia/include/core/SkPreConfig.h.orig 2010-08-18 01:03:49.000000000 -0700
+++ third_party/skia/include/core/SkPreConfig.h 2010-10-23 12:54:33.000000000 -0700
@ -34,100 +101,3 @@ diff -ru third_party/skia/include/core/SkPreConfig.h.orig third_party/skia/inclu
//////////////////////////////////////////////////////////////////////
diff -ru v8/src/frames.h.bak v8/src/frames.h
--- v8/src/frames.h.bak 2010-08-18 01:12:33.000000000 -0700
+++ v8/src/frames.h 2010-10-23 13:37:54.000000000 -0700
@@ -343,6 +343,7 @@
private:
friend class StackFrame;
+ friend class StackFrameIterator;
};
diff -ru v8/src/ia32/assembler-ia32-inl.h.b v8/src/ia32/assembler-ia32-inl.h
--- v8/src/ia32/assembler-ia32-inl.h.b 2010-08-18 01:12:29.000000000 -0700
+++ v8/src/ia32/assembler-ia32-inl.h 2010-10-23 17:41:21.000000000 -0700
@@ -42,10 +42,6 @@
namespace v8 {
namespace internal {
-Condition NegateCondition(Condition cc) {
- return static_cast<Condition>(cc ^ 1);
-}
-
// The modes possibly affected by apply must be in kApplyMask.
void RelocInfo::apply(intptr_t delta) {
diff -ru v8/src/ia32/assembler-ia32.h.orig v8/src/ia32/assembler-ia32.h
--- v8/src/ia32/assembler-ia32.h.orig 2010-08-18 01:12:29.000000000 -0700
+++ v8/src/ia32/assembler-ia32.h 2010-10-23 17:41:41.000000000 -0700
@@ -146,7 +146,9 @@
// Negation of the default no_condition (-1) results in a non-default
// no_condition value (-2). As long as tests for no_condition check
// for condition < 0, this will work as expected.
-inline Condition NegateCondition(Condition cc);
+inline Condition NegateCondition(Condition cc) {
+ return static_cast<Condition>(cc ^ 1);
+}
// Corresponds to transposing the operands of a comparison.
inline Condition ReverseCondition(Condition cc) {
diff -ru v8/src/objects.cc.b v8/src/objects.cc
--- v8/src/objects.cc.b 2010-08-18 01:12:33.000000000 -0700
+++ v8/src/objects.cc 2010-10-23 13:44:19.000000000 -0700
@@ -7945,7 +7945,7 @@
template<typename Shape, typename Key>
Object* Dictionary<Shape, Key>::AtPut(Key key, Object* value) {
- int entry = FindEntry(key);
+ int entry = this->FindEntry(key);
// If the entry is present set the value;
if (entry != Dictionary<Shape, Key>::kNotFound) {
@@ -7970,7 +7970,7 @@
Object* value,
PropertyDetails details) {
// Valdate key is absent.
- SLOW_ASSERT((FindEntry(key) == Dictionary<Shape, Key>::kNotFound));
+ SLOW_ASSERT((this->FindEntry(key) == Dictionary<Shape, Key>::kNotFound));
// Check whether the dictionary should be extended.
Object* obj = EnsureCapacity(1, key);
if (obj->IsFailure()) return obj;
@@ -8029,7 +8029,7 @@
Object* value,
PropertyDetails details) {
UpdateMaxNumberKey(key);
- SLOW_ASSERT(FindEntry(key) == kNotFound);
+ SLOW_ASSERT(this->FindEntry(key) == kNotFound);
return Add(key, value, details);
}
diff -ru v8/src/x64/assembler-x64-inl.h.orig v8/src/x64/assembler-x64-inl.h
--- v8/src/x64/assembler-x64-inl.h.orig 2010-08-18 01:12:31.000000000 -0700
+++ v8/src/x64/assembler-x64-inl.h 2010-10-23 16:27:50.000000000 -0700
@@ -34,10 +34,6 @@
namespace v8 {
namespace internal {
-Condition NegateCondition(Condition cc) {
- return static_cast<Condition>(cc ^ 1);
-}
-
// -----------------------------------------------------------------------------
// Implementation of Assembler
diff -ru v8/src/x64/assembler-x64.h.orig v8/src/x64/assembler-x64.h
--- v8/src/x64/assembler-x64.h.orig 2010-08-18 01:12:31.000000000 -0700
+++ v8/src/x64/assembler-x64.h 2010-10-23 16:28:37.000000000 -0700
@@ -215,7 +215,9 @@
// Negation of the default no_condition (-1) results in a non-default
// no_condition value (-2). As long as tests for no_condition check
// for condition < 0, this will work as expected.
-inline Condition NegateCondition(Condition cc);
+inline Condition NegateCondition(Condition cc){
+return static_cast<Condition>(cc ^ 1);
+}
// Corresponds to transposing the operands of a comparison.
inline Condition ReverseCondition(Condition cc) {

187
www/chromium/files/patch-codecs Normal file
View File

@ -0,0 +1,187 @@
Index: third_party/ffmpeg/ffmpeg.gyp
===================================================================
--- third_party/ffmpeg/ffmpeg.gyp (revision 49485)
+++ third_party/ffmpeg/ffmpeg.gyp (working copy)
@@ -80,7 +80,7 @@
'ffmpeg_variant%': '<(target_arch)',
'use_system_ffmpeg%': 0,
- 'use_system_yasm%': 0,
+ 'use_system_yasm%': 1,
'build_ffmpegsumo%': 1,
'use_system_vpx%': 0,
@@ -156,11 +156,11 @@
'patched-ffmpeg-mt/libavutil/pixdesc.c',
'patched-ffmpeg-mt/libavutil/rational.c',
# Config file for the OS and architecture.
- 'config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)/config.h',
+ 'config/<(ffmpeg_branding)/linux/<(ffmpeg_config)/config.h',
'config/libavutil/avconfig.h',
],
'include_dirs': [
- 'config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)',
+ 'config/<(ffmpeg_branding)/linux/<(ffmpeg_config)',
'patched-ffmpeg-mt',
'config',
],
@@ -417,8 +417,13 @@
}],
['use_system_vpx==0', {
'ldflags': [
- '-L<(libvpx_hack_dir)/lib/<(OS)/<(target_arch)',
+ '-L<(libvpx_hack_dir)/lib/linux/<(target_arch)',
],
+ }, {
+ # Using libvpx provided by the system.
+ 'ldflags': [
+ '-L/usr/local/lib',
+ ],
}],
],
},
@@ -476,7 +476,7 @@
}, {
# Using libvpx provided by the system.
'include_dirs': [
- '/usr/include/vpx',
+ '/usr/local/include',
],
}
],
Index: third_party/ffmpeg/config/Chromium/linux/x64/config.h
===================================================================
--- third_party/ffmpeg/config/Chromium/linux/x64/config.h (revision 49485)
+++ third_party/ffmpeg/config/Chromium/linux/x64/config.h (working copy)
@@ -45,7 +45,7 @@
#define HAVE_NEON 0
#define HAVE_PPC4XX 0
#define HAVE_SSE 1
-#define HAVE_SSSE3 1
+#define HAVE_SSSE3 0
#define HAVE_VIS 0
#define HAVE_BIGENDIAN 0
#define HAVE_BEOSTHREADS 0
@@ -94,16 +94,16 @@
#define HAVE_LLRINT 1
#define HAVE_LOCAL_ALIGNED_16 1
#define HAVE_LOCAL_ALIGNED_8 1
-#define HAVE_LOG2 1
-#define HAVE_LOG2F 1
+#define HAVE_LOG2 0
+#define HAVE_LOG2F 0
#define HAVE_LOONGSON 0
#define HAVE_LRINT 1
#define HAVE_LRINTF 1
#define HAVE_LZO1X_999_COMPRESS 0
#define HAVE_MACHINE_IOCTL_BT848_H 0
#define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMALIGN 1
+#define HAVE_MALLOC_H 0
+#define HAVE_MEMALIGN 0
#define HAVE_MKSTEMP 1
#define HAVE_PLD 0
#define HAVE_POSIX_MEMALIGN 1
Index: third_party/ffmpeg/config/Chromium/linux/ia32/config.h
===================================================================
--- third_party/ffmpeg/config/Chromium/linux/ia32/config.h (revision 49485)
+++ third_party/ffmpeg/config/Chromium/linux/ia32/config.h (working copy)
@@ -45,7 +45,7 @@
#define HAVE_NEON 0
#define HAVE_PPC4XX 0
#define HAVE_SSE 1
-#define HAVE_SSSE3 1
+#define HAVE_SSSE3 0
#define HAVE_VIS 0
#define HAVE_BIGENDIAN 0
#define HAVE_BEOSTHREADS 0
@@ -94,16 +94,16 @@
#define HAVE_LLRINT 1
#define HAVE_LOCAL_ALIGNED_16 1
#define HAVE_LOCAL_ALIGNED_8 1
-#define HAVE_LOG2 1
-#define HAVE_LOG2F 1
+#define HAVE_LOG2 0
+#define HAVE_LOG2F 0
#define HAVE_LOONGSON 0
#define HAVE_LRINT 1
#define HAVE_LRINTF 1
#define HAVE_LZO1X_999_COMPRESS 0
#define HAVE_MACHINE_IOCTL_BT848_H 0
#define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMALIGN 1
+#define HAVE_MALLOC_H 0
+#define HAVE_MEMALIGN 0
#define HAVE_MKSTEMP 1
#define HAVE_PLD 0
#define HAVE_POSIX_MEMALIGN 1
Index: third_party/ffmpeg/config/Chrome/linux/x64/config.h
===================================================================
--- third_party/ffmpeg/config/Chrome/linux/x64/config.h (revision 49485)
+++ third_party/ffmpeg/config/Chrome/linux/x64/config.h (working copy)
@@ -45,7 +45,7 @@
#define HAVE_NEON 0
#define HAVE_PPC4XX 0
#define HAVE_SSE 1
-#define HAVE_SSSE3 1
+#define HAVE_SSSE3 0
#define HAVE_VIS 0
#define HAVE_BIGENDIAN 0
#define HAVE_BEOSTHREADS 0
@@ -94,16 +94,16 @@
#define HAVE_LLRINT 1
#define HAVE_LOCAL_ALIGNED_16 1
#define HAVE_LOCAL_ALIGNED_8 1
-#define HAVE_LOG2 1
-#define HAVE_LOG2F 1
+#define HAVE_LOG2 0
+#define HAVE_LOG2F 0
#define HAVE_LOONGSON 0
#define HAVE_LRINT 1
#define HAVE_LRINTF 1
#define HAVE_LZO1X_999_COMPRESS 0
#define HAVE_MACHINE_IOCTL_BT848_H 0
#define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMALIGN 1
+#define HAVE_MALLOC_H 0
+#define HAVE_MEMALIGN 0
#define HAVE_MKSTEMP 1
#define HAVE_PLD 0
#define HAVE_POSIX_MEMALIGN 1
Index: third_party/ffmpeg/config/Chrome/linux/ia32/config.h
===================================================================
--- third_party/ffmpeg/config/Chrome/linux/ia32/config.h (revision 49485)
+++ third_party/ffmpeg/config/Chrome/linux/ia32/config.h (working copy)
@@ -45,7 +45,7 @@
#define HAVE_NEON 0
#define HAVE_PPC4XX 0
#define HAVE_SSE 1
-#define HAVE_SSSE3 1
+#define HAVE_SSSE3 0
#define HAVE_VIS 0
#define HAVE_BIGENDIAN 0
#define HAVE_BEOSTHREADS 0
@@ -94,16 +94,16 @@
#define HAVE_LLRINT 1
#define HAVE_LOCAL_ALIGNED_16 1
#define HAVE_LOCAL_ALIGNED_8 1
-#define HAVE_LOG2 1
-#define HAVE_LOG2F 1
+#define HAVE_LOG2 0
+#define HAVE_LOG2F 0
#define HAVE_LOONGSON 0
#define HAVE_LRINT 1
#define HAVE_LRINTF 1
#define HAVE_LZO1X_999_COMPRESS 0
#define HAVE_MACHINE_IOCTL_BT848_H 0
#define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMALIGN 1
+#define HAVE_MALLOC_H 0
+#define HAVE_MEMALIGN 0
#define HAVE_MKSTEMP 1
#define HAVE_PLD 0
#define HAVE_POSIX_MEMALIGN 1

400
www/chromium/files/patch-thirdparty
View File

@ -1,6 +1,6 @@
Index: third_party/WebKit/WebCore/dom/SelectElement.cpp
===================================================================
--- third_party/WebKit/WebCore/dom/SelectElement.cpp (revision 57286)
--- third_party/WebKit/WebCore/dom/SelectElement.cpp (revision 63601)
+++ third_party/WebKit/WebCore/dom/SelectElement.cpp (working copy)
@@ -53,7 +53,7 @@
#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
@ -13,9 +13,9 @@ Index: third_party/WebKit/WebCore/dom/SelectElement.cpp
#else
Index: third_party/WebKit/WebCore/page/EventHandler.cpp
===================================================================
--- third_party/WebKit/WebCore/page/EventHandler.cpp (revision 57286)
--- third_party/WebKit/WebCore/page/EventHandler.cpp (revision 63601)
+++ third_party/WebKit/WebCore/page/EventHandler.cpp (working copy)
@@ -1829,7 +1829,7 @@
@@ -1890,7 +1890,7 @@
return swallowEvent;
}
@ -26,7 +26,7 @@ Index: third_party/WebKit/WebCore/page/EventHandler.cpp
return false;
Index: third_party/WebKit/WebCore/page/chromium/EventHandlerChromium.cpp
===================================================================
--- third_party/WebKit/WebCore/page/chromium/EventHandlerChromium.cpp (revision 57286)
--- third_party/WebKit/WebCore/page/chromium/EventHandlerChromium.cpp (revision 63601)
+++ third_party/WebKit/WebCore/page/chromium/EventHandlerChromium.cpp (working copy)
@@ -154,7 +154,7 @@
#endif
@ -39,9 +39,9 @@ Index: third_party/WebKit/WebCore/page/chromium/EventHandlerChromium.cpp
// This code comes from gtk/EventHandlerGtk.cpp.
Index: third_party/WebKit/WebCore/platform/chromium/ChromiumBridge.h
===================================================================
--- third_party/WebKit/WebCore/platform/chromium/ChromiumBridge.h (revision 57286)
--- third_party/WebKit/WebCore/platform/chromium/ChromiumBridge.h (revision 63601)
+++ third_party/WebKit/WebCore/platform/chromium/ChromiumBridge.h (working copy)
@@ -114,7 +114,7 @@
@@ -141,7 +141,7 @@
#if OS(WINDOWS)
static bool ensureFontLoaded(HFONT font);
#endif
@ -50,26 +50,9 @@ Index: third_party/WebKit/WebCore/platform/chromium/ChromiumBridge.h
static void getRenderStyleForStrike(const char* family, int sizeAndStyle, FontRenderStyle* result);
static String getFontFamilyForCharacters(const UChar*, size_t numCharacters);
#endif
Index: third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp (revision 57286)
+++ third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp (working copy)
@@ -130,9 +130,9 @@
}
png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
- png_voidp_NULL,
- png_error_ptr_NULL,
- png_error_ptr_NULL);
+ 0, //png_voidp_NULL,
+ 0, //png_error_ptr_NULL,
+ 0);//png_error_ptr_NULL);
if (!pngPtr)
return false;
Index: third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp (revision 57286)
--- third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp (revision 63601)
+++ third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp (working copy)
@@ -36,7 +36,7 @@
#include "Base64.h"
@ -127,7 +110,7 @@ Index: third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformD
if (!typeface)
Index: third_party/WebKit/WebCore/platform/graphics/chromium/FontPlatformData.h
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/chromium/FontPlatformData.h (revision 57286)
--- third_party/WebKit/WebCore/platform/graphics/chromium/FontPlatformData.h (revision 63601)
+++ third_party/WebKit/WebCore/platform/graphics/chromium/FontPlatformData.h (working copy)
@@ -33,7 +33,7 @@
@ -140,7 +123,7 @@ Index: third_party/WebKit/WebCore/platform/graphics/chromium/FontPlatformData.h
Index: third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.h
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.h (revision 57286)
--- third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.h (revision 63601)
+++ third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.h (working copy)
@@ -38,7 +38,7 @@
#if OS(WINDOWS)
@ -171,7 +154,7 @@ Index: third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformD
};
Index: third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp (revision 57286)
--- third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp (revision 63601)
+++ third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp (working copy)
@@ -89,7 +89,7 @@
// color to produce a new output color.
@ -182,7 +165,7 @@ Index: third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
// If non-empty, the current State is clipped to this image.
SkBitmap m_imageBufferClip;
// If m_imageBufferClip is non-empty, this is the region the image is clipped to.
@@ -143,7 +143,7 @@
@@ -146,7 +146,7 @@
, m_lineJoin(other.m_lineJoin)
, m_dash(other.m_dash)
, m_textDrawingMode(other.m_textDrawingMode)
@ -191,8 +174,8 @@ Index: third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
, m_imageBufferClip(other.m_imageBufferClip)
, m_clip(other.m_clip)
#endif
@@ -214,7 +214,7 @@
m_stateStack.append(*m_state);
@@ -232,7 +232,7 @@
m_stateStack.append(m_state->cloneInheritedProperties());
m_state = &m_stateStack.last();
-#if OS(LINUX) || OS(WINDOWS)
@ -200,7 +183,7 @@ Index: third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
// The clip image only needs to be applied once. Reset the image so that we
// don't attempt to clip multiple times.
m_state->m_imageBufferClip.reset();
@@ -224,7 +224,7 @@
@@ -242,7 +242,7 @@
canvas()->save();
}
@ -209,7 +192,7 @@ Index: third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
void PlatformContextSkia::beginLayerClippedToImage(const WebCore::FloatRect& rect,
const WebCore::ImageBuffer* imageBuffer)
{
@@ -272,7 +272,7 @@
@@ -290,7 +290,7 @@
void PlatformContextSkia::restore()
{
@ -218,8 +201,8 @@ Index: third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
if (!m_state->m_imageBufferClip.empty()) {
applyClipFromImage(m_state->m_clip, m_state->m_imageBufferClip);
canvas()->restore();
@@ -563,7 +563,7 @@
return m_canvas->getTopPlatformDevice().IsVectorial();
@@ -614,7 +614,7 @@
return !m_imageResamplingHintSrcSize.isEmpty() && !m_imageResamplingHintDstSize.isEmpty();
}
-#if OS(LINUX) || OS(WINDOWS)
@ -229,7 +212,7 @@ Index: third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
// NOTE: this assumes the image mask contains opaque black for the portions that are to be shown, as such we
Index: third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.h
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.h (revision 57286)
--- third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.h (revision 63601)
+++ third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.h (working copy)
@@ -88,7 +88,7 @@
// |rect|. This layer is implicitly restored when the next restore is
@ -240,8 +223,8 @@ Index: third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.h
void beginLayerClippedToImage(const WebCore::FloatRect&,
const WebCore::ImageBuffer*);
#endif
@@ -168,7 +168,7 @@
bool isPrinting();
@@ -176,7 +176,7 @@
bool hasImageResamplingHint() const;
private:
-#if OS(LINUX) || OS(WINDOWS)
@ -251,9 +234,9 @@ Index: third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.h
void applyClipFromImage(const WebCore::FloatRect&, const SkBitmap&);
Index: third_party/WebKit/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (revision 57286)
--- third_party/WebKit/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (revision 63601)
+++ third_party/WebKit/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (working copy)
@@ -434,7 +434,7 @@
@@ -432,7 +432,7 @@
if (paintingDisabled())
return;
@ -262,9 +245,22 @@ Index: third_party/WebKit/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
platformContext()->beginLayerClippedToImage(rect, imageBuffer);
#endif
}
Index: third_party/WebKit/WebCore/platform/Scrollbar.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/Scrollbar.cpp (revision 63601)
+++ third_party/WebKit/WebCore/platform/Scrollbar.cpp (working copy)
@@ -40,7 +40,7 @@
using namespace std;
-#if PLATFORM(CHROMIUM) && OS(LINUX)
+#if PLATFORM(CHROMIUM) && (OS(LINUX) || OS(FREEBSD))
// The position of the scrollbar thumb affects the appearance of the steppers, so
// when the thumb moves, we have to invalidate them for painting.
#define THUMB_POSITION_AFFECTS_BUTTONS
Index: third_party/WebKit/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
===================================================================
--- third_party/WebKit/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp (revision 57286)
--- third_party/WebKit/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp (revision 63601)
+++ third_party/WebKit/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp (working copy)
@@ -57,6 +57,8 @@
DEFINE_STATIC_LOCAL(const String, platform, ("windows"));
@ -277,7 +273,7 @@ Index: third_party/WebKit/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
#endif
Index: third_party/WebKit/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp
===================================================================
--- third_party/WebKit/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp (revision 57286)
--- third_party/WebKit/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp (revision 63601)
+++ third_party/WebKit/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp (working copy)
@@ -46,6 +46,8 @@
return v8String("mac");
@ -290,20 +286,20 @@ Index: third_party/WebKit/WebCore/bindings/v8/custom/V8InspectorFrontendHostCust
#else
Index: third_party/WebKit/WebCore/loader/CachedFont.cpp
===================================================================
--- third_party/WebKit/WebCore/loader/CachedFont.cpp (revision 57286)
--- third_party/WebKit/WebCore/loader/CachedFont.cpp (revision 63601)
+++ third_party/WebKit/WebCore/loader/CachedFont.cpp (working copy)
@@ -27,7 +27,7 @@
#include "config.h"
#include "CachedFont.h"
-#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX))) || PLATFORM(HAIKU) || OS(WINCE)
+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX) || OS(FREEBSD))) || PLATFORM(HAIKU) || OS(WINCE)
-#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID)
+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX) || OS(FREEBSD))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID)
#define STORE_FONT_CUSTOM_PLATFORM_DATA
#endif
Index: third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
===================================================================
--- third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp (revision 57286)
--- third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp (revision 63601)
+++ third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp (working copy)
@@ -39,7 +39,7 @@
@ -350,7 +346,7 @@ Index: third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cp
s_gl->makeCurrent(0, 0);
s_gl->destroyContext(m_contextObj);
s_gl->destroyPbuffer(m_pbuffer);
@@ -308,7 +308,7 @@
@@ -316,7 +316,7 @@
}
m_pbuffer = pbuffer;
m_contextObj = context;
@ -359,7 +355,7 @@ Index: third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cp
if (!s_gl) {
s_gl = GLConnection::create();
if (!s_gl)
@@ -422,7 +422,7 @@
@@ -431,7 +431,7 @@
if (CGLGetCurrentContext() != m_contextObj)
if (CGLSetCurrentContext(m_contextObj) == kCGLNoError)
return true;
@ -370,18 +366,18 @@ Index: third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cp
return true;
Index: third_party/WebKit/WebKit/chromium/src/ChromiumBridge.cpp
===================================================================
--- third_party/WebKit/WebKit/chromium/src/ChromiumBridge.cpp (revision 57286)
--- third_party/WebKit/WebKit/chromium/src/ChromiumBridge.cpp (revision 63601)
+++ third_party/WebKit/WebKit/chromium/src/ChromiumBridge.cpp (working copy)
@@ -62,7 +62,7 @@
@@ -64,7 +64,7 @@
#include "WebThemeEngine.h"
#endif
-#if OS(LINUX)
+#if OS(LINUX) || OS(FREEBSD)
#include "WebSandboxSupport.h"
#include "WebFontInfo.h"
#include "WebFontRenderStyle.h"
@@ -340,7 +340,7 @@
#endif
@@ -420,7 +420,7 @@
}
#endif
@ -392,9 +388,9 @@ Index: third_party/WebKit/WebKit/chromium/src/ChromiumBridge.cpp
if (webKitClient()->sandboxSupport())
Index: third_party/WebKit/WebKit/chromium/src/WebFrameImpl.cpp
===================================================================
--- third_party/WebKit/WebKit/chromium/src/WebFrameImpl.cpp (revision 57286)
--- third_party/WebKit/WebKit/chromium/src/WebFrameImpl.cpp (revision 63601)
+++ third_party/WebKit/WebKit/chromium/src/WebFrameImpl.cpp (working copy)
@@ -150,7 +150,7 @@
@@ -151,7 +151,7 @@
#include "LocalCurrentGraphicsContext.h"
#endif
@ -403,11 +399,20 @@ Index: third_party/WebKit/WebKit/chromium/src/WebFrameImpl.cpp
#include <gdk/gdk.h>
#endif
@@ -298,7 +298,7 @@
float scale = m_printedPageWidth / pageRect.width();
ctx.save();
-#if OS(LINUX)
+#if OS(LINUX) || OS(FREEBSD)
ctx.scale(WebCore::FloatSize(scale, scale));
#endif
ctx.translate(static_cast<float>(-pageRect.x()),
Index: third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
===================================================================
--- third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h (revision 57286)
--- third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h (revision 63601)
+++ third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h (working copy)
@@ -49,7 +49,7 @@
@@ -52,7 +52,7 @@
#define FLIP_FRAMEBUFFER_VERTICALLY
#endif
@ -416,7 +421,7 @@ Index: third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
#include "GL/glxew.h"
#endif
@@ -322,7 +322,7 @@
@@ -332,7 +332,7 @@
CGLPBufferObj m_pbuffer;
CGLContextObj m_contextObj;
unsigned char* m_renderOutput;
@ -427,9 +432,9 @@ Index: third_party/WebKit/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
Index: third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp
===================================================================
--- third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp (revision 57286)
--- third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp (revision 63601)
+++ third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp (working copy)
@@ -103,7 +103,7 @@
@@ -115,7 +115,7 @@
#if OS(WINDOWS)
#include "RenderThemeChromiumWin.h"
#else
@ -438,7 +443,7 @@ Index: third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp
#include "RenderThemeChromiumLinux.h"
#endif
#include "RenderTheme.h"
@@ -370,7 +370,7 @@
@@ -402,7 +402,7 @@
|| (event.button == WebMouseEvent::ButtonLeft
&& event.modifiers & WebMouseEvent::ControlKey))
mouseContextMenu(event);
@ -447,7 +452,7 @@ Index: third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp
if (event.button == WebMouseEvent::ButtonRight)
mouseContextMenu(event);
#endif
@@ -409,7 +409,7 @@
@@ -441,7 +441,7 @@
if (!mainFrameImpl() || !mainFrameImpl()->frameView())
return;
@ -456,7 +461,7 @@ Index: third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp
// If the event was a middle click, attempt to copy text into the focused
// frame. We execute this before we let the page have a go at the event
// because the page may change what is focused during in its event handler.
@@ -493,11 +493,11 @@
@@ -525,11 +525,11 @@
if (!handler)
return keyEventDefault(event);
@ -470,25 +475,25 @@ Index: third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp
WebInputEvent::RawKeyDown;
#endif
@@ -647,7 +647,7 @@
//
// This function is an ugly copy/paste and should be cleaned up when the
// WebKitWin version is cleaned: https://bugs.webkit.org/show_bug.cgi?id=20438
@@ -673,7 +673,7 @@
}
#endif
-#if OS(WINDOWS) || OS(LINUX)
+#if OS(WINDOWS) || OS(LINUX) || OS(FREEBSD)
// FIXME: implement on Mac
// Mac has no way to open a context menu based on a keyboard event.
bool WebViewImpl::sendContextMenuEvent(const WebKeyboardEvent& event)
{
@@ -1858,7 +1858,7 @@
@@ -1875,7 +1875,7 @@
void WebViewImpl::setScrollbarColors(unsigned inactiveColor,
unsigned activeColor,
unsigned trackColor) {
-#if OS(LINUX)
+#if OS(LINUX) || OS(FREEBSD)
RenderThemeChromiumLinux::setScrollbarColors(inactiveColor,
PlatformThemeChromiumGtk::setScrollbarColors(inactiveColor,
activeColor,
trackColor);
@@ -1869,7 +1869,7 @@
@@ -1886,7 +1886,7 @@
unsigned activeForegroundColor,
unsigned inactiveBackgroundColor,
unsigned inactiveForegroundColor) {
@ -499,7 +504,7 @@ Index: third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp
inactiveBackgroundColor,
Index: tools/gyp/test/additional-targets/src/dir1/actions.gyp
===================================================================
--- tools/gyp/test/additional-targets/src/dir1/actions.gyp (revision 810)
--- tools/gyp/test/additional-targets/src/dir1/actions.gyp (revision 837)
+++ tools/gyp/test/additional-targets/src/dir1/actions.gyp (working copy)
@@ -47,7 +47,7 @@
},
@ -512,7 +517,7 @@ Index: tools/gyp/test/additional-targets/src/dir1/actions.gyp
},
Index: tools/gyp/test/library/src/library.gyp
===================================================================
--- tools/gyp/test/library/src/library.gyp (revision 810)
--- tools/gyp/test/library/src/library.gyp (revision 837)
+++ tools/gyp/test/library/src/library.gyp (working copy)
@@ -48,7 +48,7 @@
},
@ -525,7 +530,7 @@ Index: tools/gyp/test/library/src/library.gyp
'cflags': ['-fPIC'],
Index: tools/gyp/pylib/gyp/generator/make.py
===================================================================
--- tools/gyp/pylib/gyp/generator/make.py (revision 810)
--- tools/gyp/pylib/gyp/generator/make.py (revision 837)
+++ tools/gyp/pylib/gyp/generator/make.py (working copy)
@@ -34,7 +34,7 @@
generator_default_variables = {
@ -536,9 +541,18 @@ Index: tools/gyp/pylib/gyp/generator/make.py
'STATIC_LIB_PREFIX': 'lib',
'SHARED_LIB_PREFIX': 'lib',
'STATIC_LIB_SUFFIX': '.a',
@@ -109,13 +109,13 @@
AR.target ?= $(AR)
RANLIB.target ?= ranlib
@@ -106,7 +106,7 @@
# export LINK="$(CXX)"
#
# This will allow make to invoke N linker processes as specified in -jN.
-LINK ?= flock $(builddir)/linker.lock $(CXX)
+LINK ?= $(CXX)
# We want to use GNU ar's T option if available because it's much faster.
# We try to archive and link a file to see ar and ld support this feature.
@@ -147,13 +147,13 @@
ARFLAGS.target := $(call detect_arflags,target)
endif
-CC.host ?= gcc
-CFLAGS.host ?=
@ -554,10 +568,19 @@ Index: tools/gyp/pylib/gyp/generator/make.py
+LINK.host ?= $(LINK)
+LDFLAGS.host ?= $(LDFLAGS)
+AR.host ?= $(AR)
RANLIB.host ?= ranlib
# Flags to make gcc output dependency info. Note that you need to be
@@ -850,12 +850,12 @@
# See the description for ARFLAGS.target.
-include $(obj).host/arflags/arflags.mk
# Temporarily disabled -- see ARFLAGS.target.
@@ -195,7 +195,7 @@
# We remove slashes and replace spaces with new lines;
# remove blank lines;
# delete the first line and append a colon to the remaining lines.
-sed -e 's|\\||' -e 's| |\n|g' $(depfile).raw |\
+sed -e 's|\\||' -e 'y| |\n|' $(depfile).raw |\
grep -v '^$$' |\
sed -e 1d -e 's|$$|:|' \
>> $(depfile)
@@ -895,12 +895,12 @@
# CFLAGS et al overrides must be target-local.
# See "Target-specific Variable Values" in the GNU Make manual.""")
self.WriteLn("$(OBJS): TOOLSET := $(TOOLSET)")
@ -576,9 +599,21 @@ Index: tools/gyp/pylib/gyp/generator/make.py
self.WriteLn()
Index: tools/gyp/pylib/gyp/__init__.py
===================================================================
--- tools/gyp/pylib/gyp/__init__.py (revision 856)
+++ tools/gyp/pylib/gyp/__init__.py (working copy)
@@ -315,6 +315,7 @@
'cygwin': 'msvs',
'freebsd7': 'make',
'freebsd8': 'make',
+ 'freebsd9': 'make',
'linux2': 'make',
'openbsd4': 'make',
'sunos5': 'make',}[sys.platform] ]
Index: third_party/hunspell/hunspell.gyp
===================================================================
--- third_party/hunspell/hunspell.gyp (revision 41000)
--- third_party/hunspell/hunspell.gyp (revision 50872)
+++ third_party/hunspell/hunspell.gyp (working copy)
@@ -63,11 +63,12 @@
],
@ -594,41 +629,9 @@ Index: third_party/hunspell/hunspell.gyp
],
}],
],
Index: third_party/icu/icu.gyp
===================================================================
--- third_party/icu/icu.gyp (revision 43139)
+++ third_party/icu/icu.gyp (working copy)
@@ -38,7 +38,7 @@
}, { # else: OS != "win"
'sources!': ['icudt42.dll'],
}],
- [ 'OS != "linux"', {
+ [ 'OS != "linux" and OS!= "freebsd"', {
'sources!': ['linux/icudt42l_dat.s'],
}],
[ 'OS != "mac"', {
@@ -208,7 +208,7 @@
],
},
'conditions': [
- [ 'OS=="linux"', {
+ [ 'OS=="linux" or OS=="freebsd"', {
# Since ICU wants to internally use its own deprecated APIs, don't
# complain about it.
'cflags': [
@@ -396,7 +396,7 @@
'source/stubdata/stubdata.c',
],
}],
- [ 'OS == "linux"', {
+ [ 'OS == "linux" or OS=="freebsd"', {
'cflags': [
# TODO(port): fix ICU to not depend on this flag.
'-fno-strict-aliasing',
Index: third_party/icu/public/common/unicode/umachine.h
===================================================================
--- third_party/icu/public/common/unicode/umachine.h (revision 43139)
--- third_party/icu/public/common/unicode/umachine.h (revision 51076)
+++ third_party/icu/public/common/unicode/umachine.h (working copy)
@@ -49,6 +49,8 @@
# include "unicode/pmac.h"
@ -957,9 +960,110 @@ Index: third_party/icu/public/common/unicode/pfreebsd.h
+/*===========================================================================*/
+
+#define U_MAKE "/usr/local/bin/gmake"
Index: third_party/icu/icu.gyp
===================================================================
--- third_party/icu/icu.gyp (revision 51076)
+++ third_party/icu/icu.gyp (working copy)
@@ -42,7 +42,7 @@
}, { # else: OS != "win"
'sources!': ['icudt42.dll'],
}],
- [ 'OS != "linux" or chromeos == 1', {
+ [ '(OS != "linux" and OS != "freebsd") or chromeos == 1', {
'sources!': ['linux/icudt42l_dat.s'],
}],
[ 'OS != "mac"', {
@@ -215,7 +215,7 @@
],
},
'conditions': [
- [ 'OS=="linux"', {
+ [ 'OS=="linux" or OS=="freebsd"', {
# Since ICU wants to internally use its own deprecated APIs, don't
# complain about it.
'cflags': [
@@ -403,7 +403,7 @@
'source/stubdata/stubdata.c',
],
}],
- [ 'OS == "linux"', {
+ [ 'OS == "linux" or OS=="freebsd"', {
'cflags': [
# TODO(port): fix ICU to not depend on this flag.
'-fno-strict-aliasing',
Index: third_party/libjingle/source/talk/base/httpcommon.cc
===================================================================
--- third_party/libjingle/source/talk/base/httpcommon.cc (revision 24)
+++ third_party/libjingle/source/talk/base/httpcommon.cc (working copy)
@@ -399,7 +399,7 @@
gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;
}
// TODO: Android should support timezone, see b/2441195
-#if defined(OSX) || defined(ANDROID)
+#if defined(OSX) || defined(ANDROID) || defined(BSD)
tm *tm_for_timezone = localtime((time_t *)&gmt);
*seconds = gmt + tm_for_timezone->tm_gmtoff;
#else
Index: third_party/libjingle/source/talk/base/unixfilesystem.cc
===================================================================
--- third_party/libjingle/source/talk/base/unixfilesystem.cc (revision 24)
+++ third_party/libjingle/source/talk/base/unixfilesystem.cc (working copy)
@@ -490,7 +490,7 @@
Pathname UnixFilesystem::GetCurrentDirectory() {
Pathname cwd;
-#if defined(LINUX) || defined(OSX)
+#if defined(LINUX) || defined(OSX) || defined(BSD)
// Both Linux and Mac supported malloc()'ing the string themselves, although
// that is not required by POSIX.
char *path = getcwd(NULL, 0);
@@ -508,7 +508,7 @@
}
cwd.SetFolder(std::string(path));
-#if defined(LINUX) || defined(OSX)
+#if defined(LINUX) || defined(OSX) || defined(BSD)
free(path);
#endif
return cwd;
Index: third_party/libjingle/source/talk/base/physicalsocketserver.cc
===================================================================
--- third_party/libjingle/source/talk/base/physicalsocketserver.cc (revision 24)
+++ third_party/libjingle/source/talk/base/physicalsocketserver.cc (working copy)
@@ -487,7 +487,7 @@
*slevel = IPPROTO_IP;
*sopt = IP_DONTFRAGMENT;
break;
-#elif defined(OSX)
+#elif defined(OSX) || defined(BSD)
LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
return -1;
#elif defined(POSIX)
Index: third_party/ppapi/ppapi.gyp
===================================================================
--- third_party/ppapi/ppapi.gyp (revision 165)
+++ third_party/ppapi/ppapi.gyp (working copy)
@@ -144,7 +144,7 @@
},
},
}],
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'cflags': ['-Wextra', '-pedantic'],
}],
['OS=="mac"', {
@@ -172,7 +172,7 @@
['OS=="win"', {
'msvs_guid': '057E7FA0-83C0-11DF-8395-0800200C9A66',
}],
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'cflags': ['-Wextra', '-pedantic'],
}],
['OS=="mac"', {
Index: native_client/src/shared/platform/platform.gyp
===================================================================
--- native_client/src/shared/platform/platform.gyp (revision 1998)
--- native_client/src/shared/platform/platform.gyp (revision 2697)
+++ native_client/src/shared/platform/platform.gyp (working copy)
@@ -59,7 +59,7 @@
'time.h',
@ -972,7 +1076,7 @@ Index: native_client/src/shared/platform/platform.gyp
'linux/lock.cc',
Index: native_client/src/trusted/service_runtime/service_runtime.gyp
===================================================================
--- native_client/src/trusted/service_runtime/service_runtime.gyp (revision 1998)
--- native_client/src/trusted/service_runtime/service_runtime.gyp (revision 2697)
+++ native_client/src/trusted/service_runtime/service_runtime.gyp (working copy)
@@ -31,7 +31,7 @@
{
@ -985,9 +1089,9 @@ Index: native_client/src/trusted/service_runtime/service_runtime.gyp
],
Index: native_client/build/common.gypi
===================================================================
--- native_client/build/common.gypi (revision 1998)
--- native_client/build/common.gypi (revision 2697)
+++ native_client/build/common.gypi (working copy)
@@ -344,7 +344,7 @@
@@ -383,7 +383,7 @@
},
},
'conditions': [
@ -996,65 +1100,3 @@ Index: native_client/build/common.gypi
'target_defaults': {
# Enable -Werror by default, but put it in a variable so it can
# be disabled in ~/.gyp/include.gypi on the valgrind builders.
Index: v8/tools/gyp/v8.gyp
===================================================================
--- v8/tools/gyp/v8.gyp (revision 4335)
+++ v8/tools/gyp/v8.gyp (working copy)
@@ -74,10 +74,15 @@
'LinkIncremental': '2',
},
},
+ 'conditions': [
+ ['OS=="freebsd"', {
+ 'cflags': [ '-I/usr/local/include' ],
+ }],
+ ],
},
'Release': {
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'cflags!': [
'-O2',
'-Os',
@@ -97,6 +102,9 @@
}],
],
}],
+ ['OS=="freebsd"', {
+ 'cflags': [ '-I/usr/local/include' ],
+ }],
['OS=="mac"', {
'xcode_settings': {
'GCC_OPTIMIZATION_LEVEL': '3', # -O3
@@ -541,6 +549,17 @@
],
}
],
+ ['OS=="freebsd"', {
+ 'link_settings': {
+ 'libraries': [
+ '-L/usr/local/lib -lexecinfo',
+ ]},
+ 'sources': [
+ '../../src/platform-freebsd.cc',
+ '../../src/platform-posix.cc'
+ ],
+ }
+ ],
['OS=="openbsd"', {
'link_settings': {
'libraries': [
Index: v8/src/globals.h
===================================================================
--- v8/src/globals.h (revision 4335)
+++ v8/src/globals.h (working copy)
@@ -112,7 +112,7 @@
#define V8PRIxPTR "lx"
#endif
-#if defined(__APPLE__) && defined(__MACH__)
+#if (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__)
#define USING_MAC_ABI
#endif

91
www/chromium/pkg-plist
View File

@ -58,46 +58,24 @@ bin/chrome
%%DATADIR%%/mksnapshot
%%DATADIR%%/product_logo_48.png
%%DATADIR%%/protoc
%%DATADIR%%/resources/bookmark_manager/css/bmm.css
%%DATADIR%%/resources/bookmark_manager/css/bmm.css.js
%%DATADIR%%/resources/bookmark_manager/css/list.css
%%DATADIR%%/resources/bookmark_manager/css/menu.css
%%DATADIR%%/resources/bookmark_manager/css/tree.css
%%DATADIR%%/resources/bookmark_manager/css/tree.css.js
%%DATADIR%%/resources/bookmark_manager/images/bookmark_bar_folder_mac.png
%%DATADIR%%/resources/bookmark_manager/images/bookmark_manager_recent.png
%%DATADIR%%/resources/bookmark_manager/images/bookmark_manager_search.png
%%DATADIR%%/resources/bookmark_manager/images/bookmarks_favicon.png
%%DATADIR%%/resources/bookmark_manager/images/bookmarks_section.png
%%DATADIR%%/resources/bookmark_manager/images/folder_closed.png
%%DATADIR%%/resources/bookmark_manager/images/folder_closed_rtl.png
%%DATADIR%%/resources/bookmark_manager/images/folder_open.png
%%DATADIR%%/resources/bookmark_manager/images/folder_open_rtl.png
%%DATADIR%%/resources/bookmark_manager/js/bmm.js
%%DATADIR%%/resources/bookmark_manager/js/bmm/bookmarklist.js
%%DATADIR%%/resources/bookmark_manager/js/bmm/bookmarktree.js
%%DATADIR%%/resources/bookmark_manager/js/bmm/treeiterator.js
%%DATADIR%%/resources/bookmark_manager/js/cr.js
%%DATADIR%%/resources/bookmark_manager/js/cr/event.js
%%DATADIR%%/resources/bookmark_manager/js/cr/eventtarget.js
%%DATADIR%%/resources/bookmark_manager/js/cr/promise.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui/command.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui/contextmenuhandler.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui/list.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui/listitem.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui/listselectionmodel.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui/menu.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui/menubutton.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui/menuitem.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui/splitpane.js
%%DATADIR%%/resources/bookmark_manager/js/cr/ui/tree.js
%%DATADIR%%/resources/bookmark_manager/js/i18ntemplate.js
%%DATADIR%%/resources/bookmark_manager/js/localstrings.js
%%DATADIR%%/resources/bookmark_manager/js/util.js
%%DATADIR%%/resources/bookmark_manager/main.html
%%DATADIR%%/resources/bookmark_manager/manifest.json
%%DATADIR%%/resources.pak
%%DATADIR%%/resources/calendar_app/128.png
%%DATADIR%%/resources/calendar_app/24.png
%%DATADIR%%/resources/calendar_app/32.png
%%DATADIR%%/resources/calendar_app/48.png
%%DATADIR%%/resources/calendar_app/manifest.json
%%DATADIR%%/resources/docs_app/128.png
%%DATADIR%%/resources/docs_app/24.png
%%DATADIR%%/resources/docs_app/32.png
%%DATADIR%%/resources/docs_app/48.png
%%DATADIR%%/resources/docs_app/manifest.json
%%DATADIR%%/resources/gmail_app/128.png
%%DATADIR%%/resources/gmail_app/24.png
%%DATADIR%%/resources/gmail_app/32.png
%%DATADIR%%/resources/gmail_app/48.png
%%DATADIR%%/resources/gmail_app/manifest.json
%%DATADIR%%/resources/inspector/DevTools.js
%%DATADIR%%/resources/inspector/Images/applicationCache.png
%%DATADIR%%/resources/inspector/Images/auditsIcon.png
%%DATADIR%%/resources/inspector/Images/back.png
%%DATADIR%%/resources/inspector/Images/breakpointBorder.png
@ -186,16 +164,13 @@ bin/chrome
%%DATADIR%%/resources/inspector/Images/searchSmallWhite.png
%%DATADIR%%/resources/inspector/Images/segment.png
%%DATADIR%%/resources/inspector/Images/segmentChromium.png
%%DATADIR%%/resources/inspector/Images/segmentChromium2.png
%%DATADIR%%/resources/inspector/Images/segmentEnd.png
%%DATADIR%%/resources/inspector/Images/segmentHover.png
%%DATADIR%%/resources/inspector/Images/segmentHoverChromium.png
%%DATADIR%%/resources/inspector/Images/segmentHoverChromium2.png
%%DATADIR%%/resources/inspector/Images/segmentHoverEnd.png
%%DATADIR%%/resources/inspector/Images/segmentHoverEndChromium.png
%%DATADIR%%/resources/inspector/Images/segmentSelected.png
%%DATADIR%%/resources/inspector/Images/segmentSelectedChromium.png
%%DATADIR%%/resources/inspector/Images/segmentSelectedChromium2.png
%%DATADIR%%/resources/inspector/Images/segmentSelectedEnd.png
%%DATADIR%%/resources/inspector/Images/segmentSelectedEndChromium.png
%%DATADIR%%/resources/inspector/Images/sessionStorage.png
@ -204,14 +179,12 @@ bin/chrome
%%DATADIR%%/resources/inspector/Images/splitviewDividerBackground.png
%%DATADIR%%/resources/inspector/Images/statusbarBackground.png
%%DATADIR%%/resources/inspector/Images/statusbarBackgroundChromium.png
%%DATADIR%%/resources/inspector/Images/statusbarBackgroundChromium2.png
%%DATADIR%%/resources/inspector/Images/statusbarBottomBackground.png
%%DATADIR%%/resources/inspector/Images/statusbarBottomBackgroundChromium.png
%%DATADIR%%/resources/inspector/Images/statusbarButtons.png
%%DATADIR%%/resources/inspector/Images/statusbarButtonsChromium.png
%%DATADIR%%/resources/inspector/Images/statusbarMenuButton.png
%%DATADIR%%/resources/inspector/Images/statusbarMenuButtonChromium.png
%%DATADIR%%/resources/inspector/Images/statusbarMenuButtonChromium2.png
%%DATADIR%%/resources/inspector/Images/statusbarMenuButtonSelected.png
%%DATADIR%%/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png
%%DATADIR%%/resources/inspector/Images/statusbarResizerHorizontal.png
@ -269,38 +242,18 @@ bin/chrome
%%DATADIR%%/resources/inspector/audits.css
%%DATADIR%%/resources/inspector/devTools.css
%%DATADIR%%/resources/inspector/devtools.html
%%DATADIR%%/resources/inspector/helpScreen.css
%%DATADIR%%/resources/inspector/inspector.css
%%DATADIR%%/resources/inspector/inspector.html
%%DATADIR%%/resources/inspector/inspectorSyntaxHighlight.css
%%DATADIR%%/resources/inspector/popover.css
%%DATADIR%%/resources/inspector/textViewer.css
%%DATADIR%%/resources/net_internals/detailsview.js
%%DATADIR%%/resources/net_internals/dnsview.js
%%DATADIR%%/resources/net_internals/index.html
%%DATADIR%%/resources/net_internals/loggrouper.js
%%DATADIR%%/resources/net_internals/logviewpainter.js
%%DATADIR%%/resources/net_internals/main.css
%%DATADIR%%/resources/net_internals/main.js
%%DATADIR%%/resources/net_internals/proxyview.js
%%DATADIR%%/resources/net_internals/requestsview.js
%%DATADIR%%/resources/net_internals/resizableverticalsplitview.js
%%DATADIR%%/resources/net_internals/sourceentry.js
%%DATADIR%%/resources/net_internals/tabswitcherview.js
%%DATADIR%%/resources/net_internals/timelineviewpainter.js
%%DATADIR%%/resources/net_internals/topmidbottomview.js
%%DATADIR%%/resources/net_internals/util.js
%%DATADIR%%/resources/net_internals/view.js
%%DATADIR%%/xdg-settings
@dirrm %%DATADIR%%/resources/bookmark_manager/css
@dirrm %%DATADIR%%/resources/bookmark_manager/images
@dirrm %%DATADIR%%/resources/bookmark_manager/js/bmm
@dirrm %%DATADIR%%/resources/bookmark_manager/js/cr/ui
@dirrm %%DATADIR%%/resources/bookmark_manager/js/cr
@dirrm %%DATADIR%%/resources/bookmark_manager/js
@dirrm %%DATADIR%%/resources/bookmark_manager
@dirrm %%DATADIR%%/locales
@dirrm %%DATADIR%%/resources/calendar_app
@dirrm %%DATADIR%%/resources/docs_app
@dirrm %%DATADIR%%/resources/gmail_app
@dirrm %%DATADIR%%/resources/inspector/Images
@dirrm %%DATADIR%%/resources/inspector
@dirrm %%DATADIR%%/resources/net_internals
@dirrm %%DATADIR%%/resources
@dirrm %%DATADIR%%/locales
@dirrm %%DATADIR%%