head	1.4;
access;
symbols
	RELEASE_7_4_0:1.3
	RELEASE_8_2_0:1.3
	RELEASE_6_EOL:1.2;
locks; strict;
comment	@# @;


1.4
date	2011.04.01.16.45.01;	author rene;	state dead;
branches;
next	1.3;

1.3
date	2010.12.05.20.00.51;	author itetcu;	state Exp;
branches;
next	1.2;

1.2
date	2010.11.13.09.22.45;	author rene;	state Exp;
branches;
next	1.1;

1.1
date	2010.10.25.22.35.00;	author kwm;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update to 10.0.648.204, which is the latest release from the Stable series.

There are still some problems with it on 8.X (and presumably 7.X), see
pkg-message for a possible workaround.

This would not have been possible without:
- portmgr@@ for drawing me into this in October last year
- beat@@ for providing a development repository
- dhw@@ for creating the freebsd-chromium list
- all the patch contributors and testers on the freebsd-chromium list
@
text
@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
@@@@ -5,7 +5,7 @@@@
 #include <signal.h>
 #include <string.h>
 #include <sys/types.h>
-#include <syscall.h>
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #include "build/build_config.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>
 #endif  // POSIX

 #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
@@@@ -57,6 +57,8 @@@@
 #if !defined(SK_RESTRICT)
     #define SK_RESTRICT __restrict__
 #endif
+#undef SK_RESTRICT
+#define SK_RESTRICT
 
 //////////////////////////////////////////////////////////////////////
 
@


1.3
log
@Change maintainer.

While concerns have been raised within the ports community about the "pay as
you go" plan of the previous maintainer, given the fact that we have ports for
commercial software this in itself would not warrant such a measure.

However complete and obstinate disregard to the security vulnerabilities of the
version in the ports tree, including refusal to even document them
contradicts the idea of maintainership as the community understands it
and as it is documented.

Rene Ladan - rene@@ has graciously offered his services to work directly
with google/chrome developers, push FreeBSD patches upstream and
generally maintain this port in accordance with our standards.

Approved by:    portmgr@@
@
text
@@


1.2
log
@- Update to 6.0.472.63, again without the Courgette code
- 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
@
text
@@


1.1
log
@Add patches so chromium builds with clang.

Submitted by:	maintainer
@
text
@d1 41
d54 31
a84 5
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>
a88 1
 #define _alloca alloca
d90 2
a91 1
 #include <stdlib.h>
a103 97
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) {
@

