update to 14.0.835.163

avsm · Sep 19, 2011 · 1c550c5 · 1c550c5
1 parent 38d2179
commit 1c550c5
Show file tree

Hide file tree

Showing 138 changed files with 942 additions and 1,470 deletions.
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.69 2011/09/16 12:00:06 espie Exp $
+# $OpenBSD: Makefile,v 1.70 2011/09/19 08:55:26 robert Exp $
 
 ONLY_FOR_ARCHS=		i386 amd64
 
 COMMENT=		Chromium browser
 
-V=			13.0.782.220
+V=			14.0.835.163
 DISTNAME=		chromium-${V}
 
-REVISION=		1
-
 CATEGORIES=		www
 
 HOMEPAGE=		http://code.google.com/chromium/
@@ -31,7 +29,7 @@ WANTLIB += gtk-x11-2.0 jpeg m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 plc4 plds4 png pthread pthread-stubs xcb xml2
 WANTLIB += z execinfo bz2 nss3 nssutil3 ssl3 smime3 softokn3 gconf-2
 WANTLIB += GL Xxf86vm drm stdc++ xcb-render xcb-shm
-WANTLIB += Xtst event xslt vpx kvm>=10.0 sndio speex
+WANTLIB += Xtst event xslt kvm>=10.0 sndio speex
 WANTLIB += cups gcrypt
 
 MASTER_SITES=	http://blade2k.humppa.hu/distfiles/ \
@@ -59,7 +57,6 @@ LIB_DEPENDS=	devel/libexecinfo \
 		archivers/bzip2 \
 		security/nss \
 		devel/gconf2 \
-		multimedia/libvpx \
 		x11/gnome/libgnome-keyring \
 		textproc/libxslt \
 		x11/gtk+2 \
@@ -91,11 +88,13 @@ GYP_DEFS=	-Duse_system_bzip2=1 \
 		-Duse_system_libxml=1 \
 		-Duse_system_speex=1 \
 		-Duse_system_sqlite=0 \
-		-Duse_system_vpx=1 \
+		-Duse_system_vpx=0 \
 		-Duse_system_yasm=1 \
 		-Duse_system_zlib=0 \
 		-Ddisable_nacl=1 \
 		-Ddisable_sse2=1 \
+		-Dlinux_use_tcmalloc=0 \
+		-Dlinux_strip_binary=1 \
 		-DOS=openbsd
 
 pre-configure:

diff --git a/www/chromium/distinfo b/www/chromium/distinfo
@@ -1,5 +1,5 @@
-MD5 (chromium-13.0.782.220.tar.bz2) = sW1DikSlS2+eiO2dPHupNw==
-RMD160 (chromium-13.0.782.220.tar.bz2) = xfcOZs1tZGP4aWsRcAj6d1kmbis=
-SHA1 (chromium-13.0.782.220.tar.bz2) = Jx3dfoci2MV9Vtnx/uQoEd01hHA=
-SHA256 (chromium-13.0.782.220.tar.bz2) = 73vwq+JkKZI1ZZsu4/wgCMbJzyLVMRj61YkaMKFdus0=
-SIZE (chromium-13.0.782.220.tar.bz2) = 155301680
+MD5 (chromium-14.0.835.163.tar.bz2) = 8j8LO0XjDB5gtO8XQyItug==
+RMD160 (chromium-14.0.835.163.tar.bz2) = NgCeo9tycKkP/p13ujpS2G1dWoQ=
+SHA1 (chromium-14.0.835.163.tar.bz2) = 846INfTBKmFzTrme4KFtE4bicm0=
+SHA256 (chromium-14.0.835.163.tar.bz2) = KhaQj85l/aKURIxD7Bbbvj/wdgPwaVEm5ehF9yfGtao=
+SIZE (chromium-14.0.835.163.tar.bz2) = 155868619
diff --git a/www/chromium/patches/patch-app_app_base_gypi b/www/chromium/patches/patch-app_app_base_gypi
diff --git a/www/chromium/patches/patch-base_allocator_allocator_gyp b/www/chromium/patches/patch-base_allocator_allocator_gyp
@@ -0,0 +1,11 @@
+$OpenBSD: patch-base_allocator_allocator_gyp,v 1.1 2011/09/19 08:55:26 robert Exp $
+--- base/allocator/allocator.gyp.orig	Thu Aug 25 09:51:44 2011
++++ base/allocator/allocator.gyp	Thu Aug 25 09:51:53 2011
+@@ -338,7 +338,6 @@
+           # http://code.google.com/p/google-perftools/source/browse/trunk/Makefile.am
+           'cflags': [
+             '-Wno-sign-compare',
+-            '-Wno-unused-result',
+           ],
+           'cflags!': [
+             '-fvisibility=hidden',
diff --git a/www/chromium/patches/patch-base_atomicops_h b/www/chromium/patches/patch-base_atomicops_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_atomicops_h,v 1.4 2011/06/10 07:41:24 robert Exp $
---- base/atomicops.h.orig	Mon Jun  6 11:11:47 2011
-+++ base/atomicops.h	Thu Jun  9 13:03:29 2011
+$OpenBSD: patch-base_atomicops_h,v 1.5 2011/09/19 08:55:26 robert Exp $
+--- base/atomicops.h.orig	Wed Sep 14 10:01:29 2011
++++ base/atomicops.h	Fri Sep 16 18:17:22 2011
 @@ -54,7 +54,11 @@ typedef intptr_t Atomic64;
 
  // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or

diff --git a/www/chromium/patches/patch-base_base_gyp b/www/chromium/patches/patch-base_base_gyp
@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_base_gyp,v 1.6 2011/08/16 08:17:44 robert Exp $
---- base/base.gyp.orig	Wed Jul 27 10:01:28 2011
-+++ base/base.gyp	Tue Aug  2 20:12:17 2011
+$OpenBSD: patch-base_base_gyp,v 1.7 2011/09/19 08:55:26 robert Exp $
+--- base/base.gyp.orig	Wed Sep 14 10:01:29 2011
++++ base/base.gyp	Fri Sep 16 18:17:22 2011
 @@ -293,6 +293,13 @@
            ],
          }],

diff --git a/www/chromium/patches/patch-base_base_gypi b/www/chromium/patches/patch-base_base_gypi
@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_base_gypi,v 1.7 2011/08/16 08:17:44 robert Exp $
---- base/base.gypi.orig	Tue Aug  2 20:13:45 2011
-+++ base/base.gypi	Tue Aug  2 20:15:07 2011
+$OpenBSD: patch-base_base_gypi,v 1.8 2011/09/19 08:55:26 robert Exp $
+--- base/base.gypi.orig	Wed Sep 14 10:01:29 2011
++++ base/base.gypi	Fri Sep 16 18:17:22 2011
 @@ -191,6 +191,7 @@
            'process_util.h',
            'process_util_linux.cc',
@@ -9,9 +9,9 @@ $OpenBSD: patch-base_base_gypi,v 1.7 2011/08/16 08:17:44 robert Exp $
            'process_util_posix.cc',
            'process_util_win.cc',
            'process_win.cc',
-@@ -371,12 +372,11 @@
-                 'message_pump_glib_x.cc',
-               ],
+@@ -383,12 +384,11 @@
+           }, {
+             'sources!' : [ 'message_pump_gtk.cc', ],
            }],
 -          [ 'OS != "linux"', {
 +          [ 'OS != "linux" and OS !="openbsd"', {
@@ -23,7 +23,7 @@ $OpenBSD: patch-base_base_gypi,v 1.7 2011/08/16 08:17:44 robert Exp $
                ],
              },
            ],
-@@ -491,6 +491,12 @@
+@@ -499,6 +499,12 @@
              ],
          }],
          [ 'OS == "freebsd" or OS == "openbsd"', {

diff --git a/www/chromium/patches/patch-base_base_paths_linux_cc b/www/chromium/patches/patch-base_base_paths_linux_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_base_paths_linux_cc,v 1.5 2011/06/08 20:36:56 robert Exp $
---- base/base_paths_linux.cc.orig	Wed Jun  8 10:15:34 2011
-+++ base/base_paths_linux.cc	Wed Jun  8 10:16:04 2011
+$OpenBSD: patch-base_base_paths_linux_cc,v 1.6 2011/09/19 08:55:26 robert Exp $
+--- base/base_paths_linux.cc.orig	Tue Aug 23 10:28:48 2011
++++ base/base_paths_linux.cc	Wed Aug 24 10:54:22 2011
 @@ -16,7 +16,7 @@
  #include "base/path_service.h"
  #include "base/nix/xdg_util.h"
@@ -9,7 +9,7 @@ $OpenBSD: patch-base_base_paths_linux_cc,v 1.5 2011/06/08 20:36:56 robert Exp $
 +#if defined(OS_FREEBSD) || defined(OS_OPENBSD)
  #include <sys/param.h>
  #include <sys/sysctl.h>
- #endif
+ #elif defined(OS_SOLARIS)
 @@ -57,6 +57,10 @@ bool PathProviderPosix(int key, FilePath* result) {
        }
        bin_dir[strlen(bin_dir)] = 0;
@@ -19,5 +19,5 @@ $OpenBSD: patch-base_base_paths_linux_cc,v 1.5 2011/06/08 20:36:56 robert Exp $
 +      *result = FilePath("/usr/local/chrome/chrome");
 +      //*result = FilePath("/home/pobj/chromium-11.0.696.71/chromium-11.0.696.71/out/Release/chrome");
        return true;
- #endif
-     }
+ #elif defined(OS_SOLARIS)
+       char bin_dir[PATH_MAX + 1];
diff --git a/www/chromium/patches/patch-base_debug_debugger_posix_cc b/www/chromium/patches/patch-base_debug_debugger_posix_cc
@@ -1,17 +1,7 @@
-$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- base/debug/debugger_posix.cc.orig	Mon Jun  6 11:11:46 2011
-+++ base/debug/debugger_posix.cc	Wed Jun  8 09:58:35 2011
-@@ -12,6 +12,9 @@
- #include <stdlib.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-+#if defined(OS_OPENBSD)
-+#include <sys/param.h>
-+#endif
- #if !defined(OS_NACL)
- #include <sys/sysctl.h>
- #endif
-@@ -51,7 +54,7 @@ bool SpawnDebuggerOnProcess(unsigned /* process_id */)
+$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.5 2011/09/19 08:55:26 robert Exp $
+--- base/debug/debugger_posix.cc.orig	Wed Aug 24 10:55:26 2011
++++ base/debug/debugger_posix.cc	Wed Aug 24 13:01:47 2011
+@@ -57,7 +57,7 @@ bool SpawnDebuggerOnProcess(unsigned /* process_id */)
    return false;
  }
 
@@ -20,7 +10,7 @@ $OpenBSD: patch-base_debug_debugger_posix_cc,v 1.4 2011/06/08 20:36:56 robert Ex
 
  // Based on Apple's recommended method as described in
  // http://developer.apple.com/qa/qa2004/qa1361.html
-@@ -72,6 +75,10 @@ bool BeingDebugged() {
+@@ -78,6 +78,10 @@ bool BeingDebugged() {
      KERN_PROC,
      KERN_PROC_PID,
      getpid()
@@ -31,7 +21,7 @@ $OpenBSD: patch-base_debug_debugger_posix_cc,v 1.4 2011/06/08 20:36:56 robert Ex
    };
 
    // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
-@@ -89,7 +96,11 @@ bool BeingDebugged() {
+@@ -95,7 +99,11 @@ bool BeingDebugged() {
 
    // This process is being debugged if the P_TRACED flag is set.
    is_set = true;

diff --git a/www/chromium/patches/patch-base_debug_stack_trace_posix_cc b/www/chromium/patches/patch-base_debug_stack_trace_posix_cc
diff --git a/www/chromium/patches/patch-base_file_util_posix_cc b/www/chromium/patches/patch-base_file_util_posix_cc
@@ -1,9 +1,9 @@
-$OpenBSD: patch-base_file_util_posix_cc,v 1.4 2011/08/16 08:17:44 robert Exp $
---- base/file_util_posix.cc.orig	Wed Jul 27 10:01:28 2011
-+++ base/file_util_posix.cc	Tue Aug  2 20:12:17 2011
-@@ -844,7 +844,11 @@ bool GetTempDir(FilePath* path) {
- }
+$OpenBSD: patch-base_file_util_posix_cc,v 1.5 2011/09/19 08:55:26 robert Exp $
+--- base/file_util_posix.cc.orig	Tue Aug 23 10:28:48 2011
++++ base/file_util_posix.cc	Wed Aug 24 10:54:22 2011
+@@ -863,7 +863,11 @@ bool GetTempDir(FilePath* path) {
 
+ #if !defined(OS_ANDROID)
  bool GetShmemTempDir(FilePath* path) {
 +#if defined(OS_LINUX)
    *path = FilePath("/dev/shm");
@@ -12,4 +12,4 @@ $OpenBSD: patch-base_file_util_posix_cc,v 1.4 2011/08/16 08:17:44 robert Exp $
 +#endif
    return true;
  }
-
+ #endif
diff --git a/www/chromium/patches/patch-base_i18n_number_formatting_cc b/www/chromium/patches/patch-base_i18n_number_formatting_cc
@@ -1,12 +1,12 @@
-$OpenBSD: patch-base_i18n_number_formatting_cc,v 1.4 2011/08/16 08:17:44 robert Exp $
---- base/i18n/number_formatting.cc.orig	Wed Jul 27 10:01:28 2011
-+++ base/i18n/number_formatting.cc	Tue Aug  2 20:12:17 2011
-@@ -36,7 +36,7 @@ struct NumberFormatWrapper {
+$OpenBSD: patch-base_i18n_number_formatting_cc,v 1.5 2011/09/19 08:55:26 robert Exp $
+--- base/i18n/number_formatting.cc.orig	Wed Aug 24 10:57:42 2011
++++ base/i18n/number_formatting.cc	Wed Aug 24 10:57:51 2011
+@@ -41,7 +41,7 @@ LazyInstance<NumberFormatWrapper> g_number_format_floa
 
- static LazyInstance<NumberFormatWrapper> g_number_format(LINKER_INITIALIZED);
+ }  // namespace
 
 -string16 FormatNumber(int64 number) {
 +string16 FormatNumber(int64_t number) {
-   icu::NumberFormat* number_format = g_number_format.Get().number_format.get();
+   icu::NumberFormat* number_format =
+       g_number_format_int.Get().number_format.get();
 
-   if (!number_format) {
diff --git a/www/chromium/patches/patch-base_i18n_number_formatting_h b/www/chromium/patches/patch-base_i18n_number_formatting_h
@@ -1,12 +1,12 @@
-$OpenBSD: patch-base_i18n_number_formatting_h,v 1.1 2011/02/08 09:43:02 espie Exp $
---- base/i18n/number_formatting.h.orig	Fri Jan 21 10:20:15 2011
-+++ base/i18n/number_formatting.h	Mon Jan 24 10:51:19 2011
-@@ -11,7 +11,7 @@
-
- namespace base {
-
+$OpenBSD: patch-base_i18n_number_formatting_h,v 1.2 2011/09/19 08:55:26 robert Exp $
+--- base/i18n/number_formatting.h.orig	Wed Aug 24 10:57:59 2011
++++ base/i18n/number_formatting.h	Wed Aug 24 10:58:05 2011
+@@ -14,7 +14,7 @@ namespace base {
+ // Return a number formatted with separators in the user's locale.
+ // Ex: FormatNumber(1234567)
+ //         => "1,234,567" in English, "1.234.567" in German
 -string16 FormatNumber(int64 number);
 +string16 FormatNumber(int64_t number);
 
- }  // namespace base
-
+ // Return a number formatted with separators in the user's locale.
+ // Ex: FormatDouble(1234567.8, 1)
diff --git a/www/chromium/patches/patch-base_logging_cc b/www/chromium/patches/patch-base_logging_cc
@@ -1,10 +1,10 @@
-$OpenBSD: patch-base_logging_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- base/logging.cc.orig	Mon Jun  6 11:11:47 2011
-+++ base/logging.cc	Wed Jun  8 09:58:35 2011
-@@ -129,7 +129,7 @@ int32 CurrentThreadId() {
-   return mach_thread_self();
- #elif defined(OS_LINUX)
+$OpenBSD: patch-base_logging_cc,v 1.5 2011/09/19 08:55:26 robert Exp $
+--- base/logging.cc.orig	Wed Aug 24 10:58:14 2011
++++ base/logging.cc	Wed Aug 24 10:58:36 2011
+@@ -135,7 +135,7 @@ int32 CurrentThreadId() {
    return syscall(__NR_gettid);
+ #elif defined(OS_ANDROID)
+   return gettid();
 -#elif defined(OS_FREEBSD)
 +#elif defined(OS_FREEBSD) || defined(OS_OPENBSD)
    // TODO(BSD): find a better thread ID

diff --git a/www/chromium/patches/patch-base_process_util_h b/www/chromium/patches/patch-base_process_util_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_process_util_h,v 1.7 2011/08/16 08:17:44 robert Exp $
---- base/process_util.h.orig	Wed Jul 27 10:01:28 2011
-+++ base/process_util.h	Tue Aug  2 20:12:17 2011
+$OpenBSD: patch-base_process_util_h,v 1.8 2011/09/19 08:55:26 robert Exp $
+--- base/process_util.h.orig	Wed Sep 14 10:01:29 2011
++++ base/process_util.h	Fri Sep 16 18:17:22 2011
 @@ -14,14 +14,16 @@
  #if defined(OS_WIN)
  #include <windows.h>
@@ -19,7 +19,7 @@ $OpenBSD: patch-base_process_util_h,v 1.7 2011/08/16 08:17:44 robert Exp $
  #elif defined(OS_POSIX)
  #include <dirent.h>
  #include <limits.h>
-@@ -447,7 +449,7 @@ class BASE_API ProcessIterator {
+@@ -467,7 +469,7 @@ class BASE_API ProcessIterator {
  #if defined(OS_WIN)
    HANDLE snapshot_;
    bool started_iteration_;

diff --git a/www/chromium/patches/patch-base_process_util_openbsd_cc b/www/chromium/patches/patch-base_process_util_openbsd_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_process_util_openbsd_cc,v 1.4 2011/06/08 21:23:04 robert Exp $
---- base/process_util_openbsd.cc.orig	Wed Jun  8 18:32:02 2011
-+++ base/process_util_openbsd.cc	Wed Jun  8 18:36:39 2011
+$OpenBSD: patch-base_process_util_openbsd_cc,v 1.5 2011/09/19 08:55:26 robert Exp $
+--- base/process_util_openbsd.cc.orig	Fri Sep 16 18:17:22 2011
++++ base/process_util_openbsd.cc	Sun Sep 18 12:32:09 2011
 @@ -0,0 +1,339 @@
 +// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be

diff --git a/www/chromium/patches/patch-base_process_util_posix_cc b/www/chromium/patches/patch-base_process_util_posix_cc
@@ -1,26 +1,12 @@
-$OpenBSD: patch-base_process_util_posix_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- base/process_util_posix.cc.orig	Mon Jun  6 11:11:47 2011
-+++ base/process_util_posix.cc	Wed Jun  8 12:29:53 2011
-@@ -104,11 +104,11 @@ int WaitpidWithTimeout(ProcessHandle handle, int64 wai
-   return status;
- }
+$OpenBSD: patch-base_process_util_posix_cc,v 1.5 2011/09/19 08:55:26 robert Exp $
+--- base/process_util_posix.cc.orig	Wed Aug 24 10:58:43 2011
++++ base/process_util_posix.cc	Wed Aug 24 11:00:22 2011
+@@ -127,7 +127,7 @@ int WaitpidWithTimeout(ProcessHandle handle, int64 wai
 
+ // Android has built-in crash handling.
+ #if !defined(OS_ANDROID)
 -void StackDumpSignalHandler(int signal, siginfo_t* info, ucontext_t* context) {
-+void StackDumpSignalHandler(int signal, siginfo_t* info /*, ucontext_t* context */) {
-   LOG(ERROR) << "Received signal " << signal;
-   debug::StackTrace().PrintBacktrace();
-
--  // TODO(shess): Port to Linux.
-+  // TODO(shess): Port to Linux and OpenBSD.
- #if defined(OS_MACOSX)
-   // TODO(shess): Port to 64-bit.
- #if ARCH_CPU_32_BITS
-@@ -289,7 +289,7 @@ typedef scoped_ptr_malloc<DIR, ScopedDIRClose> ScopedD
-   static const rlim_t kSystemDefaultMaxFds = 8192;
-   static const char kFDDir[] = "/dev/fd";
- #elif defined(OS_OPENBSD)
--  static const rlim_t kSystemDefaultMaxFds = 256;
-+  static const rlim_t kSystemDefaultMaxFds = 128;
-   static const char kFDDir[] = "/dev/fd";
- #endif
++void StackDumpSignalHandler(int signal, siginfo_t* info/*, ucontext_t* context*/) {
+   if (debug::BeingDebugged())
+     debug::BreakDebugger();
 
diff --git a/www/chromium/patches/patch-base_shared_memory_posix_cc b/www/chromium/patches/patch-base_shared_memory_posix_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_shared_memory_posix_cc,v 1.3 2011/08/16 08:17:44 robert Exp $
---- base/shared_memory_posix.cc.orig	Wed Jul 27 10:01:28 2011
-+++ base/shared_memory_posix.cc	Tue Aug  2 20:12:17 2011
-@@ -154,7 +154,7 @@ bool SharedMemory::CreateNamed(const std::string& name
+$OpenBSD: patch-base_shared_memory_posix_cc,v 1.4 2011/09/19 08:55:26 robert Exp $
+--- base/shared_memory_posix.cc.orig	Tue Aug 23 10:28:48 2011
++++ base/shared_memory_posix.cc	Wed Aug 24 10:54:22 2011
+@@ -168,7 +168,7 @@ bool SharedMemory::CreateNamed(const std::string& name
      created_size_ = size;
    }
    if (fp == NULL) {

diff --git a/www/chromium/patches/patch-base_test_test_file_util_linux_cc b/www/chromium/patches/patch-base_test_test_file_util_linux_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_test_test_file_util_linux_cc,v 1.1 2011/02/08 09:43:02 espie Exp $
---- base/test/test_file_util_linux.cc.orig	Wed Feb  2 10:50:04 2011
-+++ base/test/test_file_util_linux.cc	Wed Feb  2 10:51:00 2011
-@@ -16,10 +16,15 @@ bool EvictFileFromSystemCache(const FilePath& file) {
+$OpenBSD: patch-base_test_test_file_util_linux_cc,v 1.2 2011/09/19 08:55:26 robert Exp $
+--- base/test/test_file_util_linux.cc.orig	Tue Aug 23 10:28:47 2011
++++ base/test/test_file_util_linux.cc	Wed Aug 24 10:54:22 2011
+@@ -17,10 +17,15 @@ bool EvictFileFromSystemCache(const FilePath& file) {
    int fd = open(file.value().c_str(), O_RDONLY);
    if (fd < 0)
      return false;