cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 23.0.1271.64

Browse Source
This commit is contained in:
robert 2012-11-07 06:59:45 +00:00
parent e602fe3bbf
commit 94e6d86e3a
34 changed files with 222 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/chromium/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.109 2012/10/12 17:34:17 robert Exp $
# $OpenBSD: Makefile,v 1.110 2012/11/07 06:59:45 robert Exp $
ONLY_FOR_ARCHS= i386 amd64
COMMENT= Chromium browser
V= 22.0.1229.94
V= 23.0.1271.64
DISTNAME= chromium-${V}
REVISION= 0
CATEGORIES= www
@ -127,7 +126,7 @@ do-install:
chmod ${BINMODE} ${PREFIX}/bin/chrome
${INSTALL_MAN} ${BUILDDIR}/chrome.1 ${PREFIX}/man/man1
.for p in chrome content_resources resources theme_resources_100_percent ui_resources_100_percent
.for p in chrome chrome_100_percent content_resources resources
${INSTALL_DATA} ${BUILDDIR}/${p}.pak ${PREFIX}/chrome
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/chrome/locales

4
www/chromium/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (chromium-22.0.1229.94.tar.bz2) = oK9+aB70OnoXsyofbh3Bb/oqX3JflG3a7qE2YOujHK8=
SIZE (chromium-22.0.1229.94.tar.bz2) = 210379000
SHA256 (chromium-23.0.1271.64.tar.bz2) = 6JS7ItR0fGn8NLGBvjol4g/ZWZ7ZPwh3nfYA/jQC/+c=
SIZE (chromium-23.0.1271.64.tar.bz2) = 218498403

8
www/chromium/patches/patch-base_atomicops_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-base_atomicops_h,v 1.8 2012/10/12 16:46:09 robert Exp $
--- base/atomicops.h.orig Tue Sep 25 15:01:57 2012
+++ base/atomicops.h Wed Oct 10 17:19:28 2012
$OpenBSD: patch-base_atomicops_h,v 1.9 2012/11/07 06:59:45 robert Exp $
--- base/atomicops.h.orig Wed Oct 31 20:02:04 2012
+++ base/atomicops.h Tue Nov 6 22:45:22 2012
@@ -49,7 +49,11 @@ typedef intptr_t Atomic64;
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
@ -13,7 +13,7 @@ $OpenBSD: patch-base_atomicops_h,v 1.8 2012/10/12 16:46:09 robert Exp $
// Atomically execute:
// result = *ptr;
@@ -144,7 +148,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
@@ -145,7 +149,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
// On some platforms we need additional declarations to make
// AtomicWord compatible with our other Atomic* types.

16
www/chromium/patches/patch-base_base_gyp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-base_base_gyp,v 1.14 2012/10/12 16:46:09 robert Exp $
--- base/base.gyp.orig Tue Sep 25 15:01:57 2012
+++ base/base.gyp Wed Oct 10 17:19:28 2012
@@ -731,6 +731,13 @@
'test/values_test_util.cc',
'test/values_test_util.h',
$OpenBSD: patch-base_base_gyp,v 1.15 2012/11/07 06:59:45 robert Exp $
--- base/base.gyp.orig Wed Oct 31 20:02:04 2012
+++ base/base.gyp Tue Nov 6 22:45:22 2012
@@ -788,6 +788,13 @@
],
}],
],
+ 'conditions': [
+ [ 'OS == "openbsd"', {
@ -13,5 +13,5 @@ $OpenBSD: patch-base_base_gyp,v 1.14 2012/10/12 16:46:09 robert Exp $
+ ],
+ ],
},
{
'target_name': 'test_support_perf',
],
'conditions': [

10
www/chromium/patches/patch-base_base_gypi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-base_base_gypi,v 1.14 2012/10/12 16:46:09 robert Exp $
--- base/base.gypi.orig Tue Sep 25 15:01:57 2012
+++ base/base.gypi Wed Oct 10 17:19:28 2012
@@ -137,7 +137,6 @@
$OpenBSD: patch-base_base_gypi,v 1.15 2012/11/07 06:59:45 robert Exp $
--- base/base.gypi.orig Wed Oct 31 20:02:04 2012
+++ base/base.gypi Tue Nov 6 22:45:22 2012
@@ -138,7 +138,6 @@
'files/dir_reader_posix.h',
'files/file_path_watcher.cc',
'files/file_path_watcher.h',
@ -9,7 +9,7 @@ $OpenBSD: patch-base_base_gypi,v 1.14 2012/10/12 16:46:09 robert Exp $
'files/file_path_watcher_linux.cc',
'files/file_path_watcher_stub.cc',
'files/file_path_watcher_win.cc',
@@ -661,7 +660,6 @@
@@ -673,7 +672,6 @@
['<(os_bsd)==1 and >(nacl_untrusted_build)==0', {
'sources/': [
['exclude', '^files/file_path_watcher_linux\\.cc$'],

26
www/chromium/patches/patch-base_sys_info_openbsd_cc Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-base_sys_info_openbsd_cc,v 1.4 2012/11/07 06:59:45 robert Exp $
--- base/sys_info_openbsd.cc.orig Wed Nov 7 07:48:17 2012
+++ base/sys_info_openbsd.cc Wed Nov 7 07:52:57 2012
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -43,6 +43,16 @@ size_t SysInfo::MaxSharedMemorySize() {
return 0;
}
return limit;
+}
+
+// static
+std::string SysInfo::CPUModelName() {
+ int mib[] = { CTL_HW, HW_MODEL };
+ char name[256];
+ size_t len = arraysize(name);
+ if (sysctl(mib, arraysize(mib), &name, &len, NULL, 0) == 0)
+ return name;
+ return std::string();
}
} // namespace base

8
www/chromium/patches/patch-chrome_browser_chrome_browser_main_posix_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.3 2012/07/10 09:22:34 robert Exp $
--- chrome/browser/chrome_browser_main_posix.cc.orig Fri Jun 1 06:14:35 2012
+++ chrome/browser/chrome_browser_main_posix.cc Fri Jun 1 06:14:42 2012
@@ -216,7 +216,7 @@ void ChromeBrowserMainPartsPosix::PreEarlyInitializati
$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.4 2012/11/07 06:59:45 robert Exp $
--- chrome/browser/chrome_browser_main_posix.cc.orig Wed Oct 31 20:02:26 2012
+++ chrome/browser/chrome_browser_main_posix.cc Tue Nov 6 22:45:22 2012
@@ -212,7 +212,7 @@ void ChromeBrowserMainPartsPosix::PreEarlyInitializati
if (!fd_limit_string.empty()) {
base::StringToInt(fd_limit_string, &fd_limit);
}

8
www/chromium/patches/patch-chrome_browser_component_updater_component_updater_configurator_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_component_updater_component_updater_configurator_cc,v 1.3 2012/07/10 09:22:34 robert Exp $
--- chrome/browser/component_updater/component_updater_configurator.cc.orig Wed May 23 03:50:22 2012
+++ chrome/browser/component_updater/component_updater_configurator.cc Fri Jun 1 06:13:04 2012
@@ -89,6 +89,12 @@ const char kExtraInfo[] =
$OpenBSD: patch-chrome_browser_component_updater_component_updater_configurator_cc,v 1.4 2012/11/07 06:59:45 robert Exp $
--- chrome/browser/component_updater/component_updater_configurator.cc.orig Wed Oct 31 20:02:17 2012
+++ chrome/browser/component_updater/component_updater_configurator.cc Tue Nov 6 22:45:22 2012
@@ -90,6 +90,12 @@ const char kExtraInfo[] =
#else
"os=openbsd&arch=unknown";
#endif

8
www/chromium/patches/patch-chrome_browser_memory_details_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.10 2012/08/26 18:47:01 robert Exp $
--- chrome/browser/memory_details.cc.orig Fri Aug 17 03:02:07 2012
+++ chrome/browser/memory_details.cc Wed Aug 22 09:56:05 2012
$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.11 2012/11/07 06:59:45 robert Exp $
--- chrome/browser/memory_details.cc.orig Wed Oct 31 20:02:26 2012
+++ chrome/browser/memory_details.cc Tue Nov 6 22:45:22 2012
@@ -31,7 +31,7 @@
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.10 2012/08/26 18:47:01 robe
const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
const pid_t sandbox_helper_pid =
content::ZygoteHost::GetInstance()->GetSandboxHelperPid();
@@ -333,7 +333,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
}
}

19
www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-chrome_browser_printing_print_system_task_proxy_cc,v 1.4 2012/10/12 16:46:09 robert Exp $
Fix build with cups >= 1.6
error: 'ppd_attr_t* ppdFindAttr(ppd_file_t*, const char*, const char*)' is deprecated
--- chrome/browser/printing/print_system_task_proxy.cc.orig Tue Sep 25 15:02:11 2012
+++ chrome/browser/printing/print_system_task_proxy.cc Wed Oct 10 17:19:28 2012
@@ -421,10 +421,7 @@ bool PrintSystemTaskProxy::ParsePrinterCapabilities(
}
}
- bool is_color_device = false;
- ppd_attr_t* attr = ppdFindAttr(ppd, kColorDevice, NULL);
- if (attr && attr->value)
- is_color_device = ppd->color_device;
+ bool is_color_device = ppd->color_device;
*set_color_as_default = is_color_device;
if (!((is_color_device && getBasicColorModelSettings(

14
www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.5 2012/10/12 16:46:10 robert Exp $
--- chrome/browser/ui/webui/about_ui.cc.orig Tue Sep 25 15:02:14 2012
+++ chrome/browser/ui/webui/about_ui.cc Wed Oct 10 17:19:28 2012
@@ -74,7 +74,7 @@
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.6 2012/11/07 06:59:45 robert Exp $
--- chrome/browser/ui/webui/about_ui.cc.orig Wed Oct 31 20:02:22 2012
+++ chrome/browser/ui/webui/about_ui.cc Tue Nov 6 22:45:22 2012
@@ -78,7 +78,7 @@
#include "chrome/browser/ui/webui/theme_source.h"
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.5 2012/10/12 16:46:10 ro
#include "content/public/browser/zygote_host_linux.h"
#include "content/public/common/sandbox_linux.h"
#endif
@@ -940,6 +940,7 @@ std::string AboutLinuxProxyConfig() {
@@ -944,6 +944,7 @@ std::string AboutLinuxProxyConfig() {
return data;
}
@ -18,7 +18,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.5 2012/10/12 16:46:10 ro
void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
bool good) {
data->append("<tr><td>");
@@ -1001,6 +1002,7 @@ std::string AboutSandbox() {
@@ -1005,6 +1006,7 @@ std::string AboutSandbox() {
return data;
}
#endif
@ -26,7 +26,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.5 2012/10/12 16:46:10 ro
std::string AboutVersionStaticContent(const std::string& query) {
return ResourceBundle::GetSharedInstance().GetRawDataResource(
@@ -1341,7 +1343,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st
@@ -1412,7 +1414,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st
response = ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_OS_CREDITS_HTML, ui::SCALE_FACTOR_NONE).as_string();
#endif

24
www/chromium/patches/patch-chrome_chrome_browser_gypi
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.14 2012/10/12 16:46:10 robert Exp $
--- chrome/chrome_browser.gypi.orig Wed Oct 10 18:38:26 2012
+++ chrome/chrome_browser.gypi Wed Oct 10 18:38:55 2012
@@ -1426,8 +1426,6 @@
'browser/media/media_stream_devices_menu_model.h',
'browser/media_gallery/media_device_notifications_chromeos.cc',
'browser/media_gallery/media_device_notifications_chromeos.h',
- 'browser/media_gallery/media_device_notifications_linux.cc',
- 'browser/media_gallery/media_device_notifications_linux.h',
'browser/media_gallery/media_device_notifications_utils.cc',
'browser/media_gallery/media_device_notifications_utils.h',
'browser/media_gallery/media_device_notifications_window_win.cc',
$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.15 2012/11/07 06:59:45 robert Exp $
--- chrome/chrome_browser.gypi.orig Tue Nov 6 22:55:08 2012
+++ chrome/chrome_browser.gypi Tue Nov 6 22:55:18 2012
@@ -1934,8 +1934,6 @@
'browser/system_monitor/media_storage_util.h',
'browser/system_monitor/removable_device_notifications_chromeos.cc',
'browser/system_monitor/removable_device_notifications_chromeos.h',
- 'browser/system_monitor/removable_device_notifications_linux.cc',
- 'browser/system_monitor/removable_device_notifications_linux.h',
'browser/system_monitor/removable_device_notifications_mac.h',
'browser/system_monitor/removable_device_notifications_mac.mm',
'browser/system_monitor/removable_device_notifications_window_win.cc',

8
www/chromium/patches/patch-chrome_chrome_gyp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_chrome_gyp,v 1.13 2012/07/10 09:22:34 robert Exp $
--- chrome/chrome.gyp.orig Wed May 23 03:50:48 2012
+++ chrome/chrome.gyp Fri Jun 1 06:13:04 2012
@@ -147,7 +147,6 @@
$OpenBSD: patch-chrome_chrome_gyp,v 1.14 2012/11/07 06:59:45 robert Exp $
--- chrome/chrome.gyp.orig Wed Oct 31 20:02:48 2012
+++ chrome/chrome.gyp Tue Nov 6 22:45:22 2012
@@ -148,7 +148,6 @@
'chrome_renderer.gypi',
'chrome_tests.gypi',
'common_constants.gypi',

8
www/chromium/patches/patch-chrome_common_chrome_notification_types_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_common_chrome_notification_types_h,v 1.2 2012/10/12 16:46:10 robert Exp $
--- chrome/common/chrome_notification_types.h.orig Tue Sep 25 15:02:43 2012
+++ chrome/common/chrome_notification_types.h Wed Oct 10 17:19:28 2012
@@ -46,7 +46,7 @@ enum NotificationType {
$OpenBSD: patch-chrome_common_chrome_notification_types_h,v 1.3 2012/11/07 06:59:45 robert Exp $
--- chrome/common/chrome_notification_types.h.orig Wed Oct 31 20:02:48 2012
+++ chrome/common/chrome_notification_types.h Tue Nov 6 22:45:22 2012
@@ -47,7 +47,7 @@ enum NotificationType {
// that was closed, no details are expected.
NOTIFICATION_WINDOW_CLOSED,

8
www/chromium/patches/patch-chrome_common_chrome_paths_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.10 2012/10/12 16:46:10 robert Exp $
--- chrome/common/chrome_paths.cc.orig Tue Sep 25 15:02:43 2012
+++ chrome/common/chrome_paths.cc Wed Oct 10 17:19:28 2012
@@ -367,7 +367,7 @@ bool PathProvider(int key, FilePath* result) {
$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.11 2012/11/07 06:59:45 robert Exp $
--- chrome/common/chrome_paths.cc.orig Wed Oct 31 20:02:48 2012
+++ chrome/common/chrome_paths.cc Tue Nov 6 22:45:22 2012
@@ -384,7 +384,7 @@ bool PathProvider(int key, FilePath* result) {
if (!file_util::PathExists(cur)) // We don't want to create this
return false;
break;

8
www/chromium/patches/patch-chrome_test_automation_proxy_launcher_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_test_automation_proxy_launcher_cc,v 1.4 2012/07/10 09:22:34 robert Exp $
--- chrome/test/automation/proxy_launcher.cc.orig Wed May 23 03:50:30 2012
+++ chrome/test/automation/proxy_launcher.cc Fri Jun 1 06:13:04 2012
@@ -35,6 +35,10 @@
$OpenBSD: patch-chrome_test_automation_proxy_launcher_cc,v 1.5 2012/11/07 06:59:45 robert Exp $
--- chrome/test/automation/proxy_launcher.cc.orig Wed Oct 31 20:02:27 2012
+++ chrome/test/automation/proxy_launcher.cc Tue Nov 6 22:45:22 2012
@@ -34,6 +34,10 @@
#include <signal.h>
#endif

8
www/chromium/patches/patch-chrome_test_ui_ui_test_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_test_ui_ui_test_cc,v 1.6 2012/04/03 13:59:35 robert Exp $
--- chrome/test/ui/ui_test.cc.orig Tue Mar 27 03:02:35 2012
+++ chrome/test/ui/ui_test.cc Sun Apr 1 20:04:43 2012
@@ -69,7 +69,7 @@ const wchar_t UITestBase::kFailedNoCrashService[] =
$OpenBSD: patch-chrome_test_ui_ui_test_cc,v 1.7 2012/11/07 06:59:45 robert Exp $
--- chrome/test/ui/ui_test.cc.orig Wed Oct 31 20:02:43 2012
+++ chrome/test/ui/ui_test.cc Tue Nov 6 22:45:22 2012
@@ -70,7 +70,7 @@ const wchar_t UITestBase::kFailedNoCrashService[] =
L"NOTE: This test is expected to fail if crash_service.exe is not "
L"running. Start it manually before running this test (see the build "
L"output directory).";

16
www/chromium/patches/patch-content_app_content_main_runner_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_app_content_main_runner_cc,v 1.3 2012/10/12 16:46:10 robert Exp $
--- content/app/content_main_runner.cc.orig Tue Sep 25 15:01:30 2012
+++ content/app/content_main_runner.cc Wed Oct 10 17:19:28 2012
@@ -85,7 +85,7 @@ extern int PpapiBrokerMain(const content::MainFunction
$OpenBSD: patch-content_app_content_main_runner_cc,v 1.4 2012/11/07 06:59:45 robert Exp $
--- content/app/content_main_runner.cc.orig Wed Oct 31 20:01:34 2012
+++ content/app/content_main_runner.cc Tue Nov 6 22:45:22 2012
@@ -91,7 +91,7 @@ extern int PpapiBrokerMain(const content::MainFunction
extern int RendererMain(const content::MainFunctionParams&);
extern int WorkerMain(const content::MainFunctionParams&);
extern int UtilityMain(const content::MainFunctionParams&);
@ -10,7 +10,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.3 2012/10/12 16:46:10 rob
namespace content {
extern int ZygoteMain(const MainFunctionParams&,
ZygoteForkDelegate* forkdelegate);
@@ -273,7 +273,7 @@ struct MainFunction {
@@ -333,7 +333,7 @@ struct MainFunction {
int (*function)(const MainFunctionParams&);
};
@ -19,7 +19,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.3 2012/10/12 16:46:10 rob
// On platforms that use the zygote, we have a special subset of
// subprocesses that are launched via the zygote. This function
// fills in some process-launching bits around ZygoteMain().
@@ -377,7 +377,7 @@ int RunNamedProcessTypeMain(
@@ -438,7 +438,7 @@ int RunNamedProcessTypeMain(
}
}
@ -28,9 +28,9 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.3 2012/10/12 16:46:10 rob
// Zygote startup is special -- see RunZygote comments above
// for why we don't use ZygoteMain directly.
if (process_type == switches::kZygoteProcess)
@@ -470,7 +470,7 @@ static void ReleaseFreeMemoryThunk() {
@@ -548,7 +548,7 @@ static void ReleaseFreeMemoryThunk() {
kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
#endif
#endif // !OS_ANDROID && !OS_IOS
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX)

16
www/chromium/patches/patch-content_browser_browser_main_loop_cc
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.5 2012/10/12 16:46:10 robert Exp $
--- content/browser/browser_main_loop.cc.orig Tue Sep 25 15:01:32 2012
+++ content/browser/browser_main_loop.cc Wed Oct 10 17:19:28 2012
@@ -78,7 +78,7 @@
$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.6 2012/11/07 06:59:45 robert Exp $
--- content/browser/browser_main_loop.cc.orig Wed Oct 31 20:01:35 2012
+++ content/browser/browser_main_loop.cc Tue Nov 6 22:45:22 2012
@@ -79,7 +79,7 @@
#include "ui/gfx/gtk_util.h"
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
#include <sys/stat.h>
#include "content/browser/renderer_host/render_sandbox_host_linux.h"
#include "content/browser/zygote_host/zygote_host_impl_linux.h"
@@ -97,7 +97,7 @@ using content::TraceControllerImpl;
#include "base/process_util.h"
@@ -100,7 +100,7 @@ using content::TraceControllerImpl;
namespace {
@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.5 2012/10/12 16:46:10 r
void SetupSandbox(const CommandLine& parsed_command_line) {
// TODO(evanm): move this into SandboxWrapper; I'm just trying to move this
// code en masse out of chrome_main for now.
@@ -282,7 +282,7 @@ void BrowserMainLoop::EarlyInitialization() {
@@ -286,7 +286,7 @@ void BrowserMainLoop::EarlyInitialization() {
}
#endif // !defined(USE_OPENSSL)

22
www/chromium/patches/patch-content_content_browser_gypi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_content_browser_gypi,v 1.12 2012/10/12 16:46:10 robert Exp $
--- content/content_browser.gypi.orig Wed Oct 10 23:06:08 2012
+++ content/content_browser.gypi Wed Oct 10 23:21:19 2012
@@ -168,7 +168,6 @@
$OpenBSD: patch-content_content_browser_gypi,v 1.13 2012/11/07 06:59:45 robert Exp $
--- content/content_browser.gypi.orig Tue Nov 6 22:55:23 2012
+++ content/content_browser.gypi Tue Nov 6 22:55:52 2012
@@ -165,7 +165,6 @@
'public/browser/web_ui_message_handler.h',
'public/browser/worker_service.h',
'public/browser/worker_service_observer.h',
@ -9,15 +9,15 @@ $OpenBSD: patch-content_content_browser_gypi,v 1.12 2012/10/12 16:46:10 robert E
'browser/accessibility/browser_accessibility.cc',
'browser/accessibility/browser_accessibility.h',
'browser/accessibility/browser_accessibility_cocoa.h',
@@ -273,8 +272,6 @@
@@ -267,8 +266,6 @@
'browser/debugger/worker_devtools_manager.h',
'browser/debugger/worker_devtools_message_filter.cc',
'browser/debugger/worker_devtools_message_filter.h',
- 'browser/device_monitor_linux.cc',
- 'browser/device_monitor_linux.h',
'browser/device_monitor_mac.cc',
'browser/device_monitor_mac.h',
'browser/device_orientation/accelerometer_mac.cc',
'browser/device_orientation/accelerometer_mac.h',
'browser/device_orientation/data_fetcher.h',
@@ -331,8 +328,6 @@
'browser/download/drag_download_file.h',
'browser/download/drag_download_util.cc',
@ -27,7 +27,7 @@ $OpenBSD: patch-content_content_browser_gypi,v 1.12 2012/10/12 16:46:10 robert E
'browser/download/file_metadata_mac.h',
'browser/download/file_metadata_mac.mm',
'browser/download/mhtml_generation_manager.cc',
@@ -743,8 +738,6 @@
@@ -760,8 +755,6 @@
'browser/system_message_window_win.h',
'browser/tcmalloc_internals_request_job.cc',
'browser/tcmalloc_internals_request_job.h',
@ -36,10 +36,10 @@ $OpenBSD: patch-content_content_browser_gypi,v 1.12 2012/10/12 16:46:10 robert E
'browser/web_contents/debug_urls.cc',
'browser/web_contents/debug_urls.h',
'browser/web_contents/drag_utils_gtk.cc',
@@ -807,11 +800,6 @@
'browser/worker_host/worker_process_host.h',
'browser/worker_host/worker_service_impl.cc',
@@ -826,11 +819,6 @@
'browser/worker_host/worker_service_impl.h',
'browser/worker_host/worker_storage_partition.cc',
'browser/worker_host/worker_storage_partition.h',
- 'browser/zygote_host/zygote_host_impl_linux.cc',
- 'browser/zygote_host/zygote_host_impl_linux.h',
- 'zygote/zygote_linux.cc',

8
www/chromium/patches/patch-content_content_common_gypi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_content_common_gypi,v 1.1 2012/10/12 16:46:10 robert Exp $
--- content/content_common.gypi.orig Wed Oct 10 22:34:13 2012
+++ content/content_common.gypi Wed Oct 10 22:34:17 2012
@@ -324,8 +324,6 @@
$OpenBSD: patch-content_content_common_gypi,v 1.2 2012/11/07 06:59:45 robert Exp $
--- content/content_common.gypi.orig Wed Oct 31 20:01:37 2012
+++ content/content_common.gypi Tue Nov 6 22:45:29 2012
@@ -330,8 +330,6 @@
'common/sandbox_linux.cc',
'common/sandbox_policy.cc',
'common/sandbox_policy.h',

8
www/chromium/patches/patch-media__audio__pulse__pulse_output.h
View File

@ -1,8 +1,8 @@
--- media/audio/pulse/pulse_output.h.orig Tue Aug 14 09:01:11 2012
+++ media/audio/pulse/pulse_output.h Wed Aug 15 23:14:34 2012
@@ -30,7 +30,7 @@ namespace media {
--- media/audio/pulse/pulse_output.h.orig Wed Oct 31 20:01:19 2012
+++ media/audio/pulse/pulse_output.h Tue Nov 6 22:45:35 2012
@@ -28,7 +28,7 @@
class SeekableBuffer;
namespace media {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)

8
www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_cc,v 1.10 2012/07/10 09:22:34 robert Exp $
--- media/audio/openbsd/audio_manager_openbsd.cc.orig Thu Jun 28 15:01:10 2012
+++ media/audio/openbsd/audio_manager_openbsd.cc Sat Jul 7 09:50:30 2012
@@ -65,26 +65,26 @@ void AudioManagerOpenBSD::UnMuteAll() {
$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_cc,v 1.11 2012/11/07 06:59:45 robert Exp $
--- media/audio/openbsd/audio_manager_openbsd.cc.orig Wed Oct 31 20:01:19 2012
+++ media/audio/openbsd/audio_manager_openbsd.cc Tue Nov 6 22:45:35 2012
@@ -57,26 +57,26 @@ void AudioManagerOpenBSD::Init() {
AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream(
const AudioParameters& params) {

8
www/chromium/patches/patch-media_media_gyp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-media_media_gyp,v 1.14 2012/10/12 16:46:10 robert Exp $
--- media/media.gyp.orig Tue Sep 25 15:01:15 2012
+++ media/media.gyp Wed Oct 10 17:19:28 2012
@@ -385,6 +385,7 @@
$OpenBSD: patch-media_media_gyp,v 1.15 2012/11/07 06:59:45 robert Exp $
--- media/media.gyp.orig Wed Oct 31 20:01:20 2012
+++ media/media.gyp Tue Nov 6 22:45:35 2012
@@ -433,6 +433,7 @@
}],
['OS=="openbsd"', {
'sources/': [ ['exclude', '/alsa_' ],

8
www/chromium/patches/patch-net_base_network_change_notifier_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-net_base_network_change_notifier_cc,v 1.6 2012/08/26 18:47:01 robert Exp $
--- net/base/network_change_notifier.cc.orig Tue Aug 14 09:01:30 2012
+++ net/base/network_change_notifier.cc Wed Aug 15 23:14:35 2012
@@ -71,7 +71,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
$OpenBSD: patch-net_base_network_change_notifier_cc,v 1.7 2012/11/07 06:59:45 robert Exp $
--- net/base/network_change_notifier.cc.orig Wed Oct 31 20:01:42 2012
+++ net/base/network_change_notifier.cc Tue Nov 6 22:45:35 2012
@@ -229,7 +229,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
#elif defined(OS_MACOSX)
return new NetworkChangeNotifierMac();
#else

8
www/chromium/patches/patch-net_net_gyp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-net_net_gyp,v 1.11 2012/10/12 16:46:10 robert Exp $
--- net/net.gyp.orig Wed Oct 10 19:48:32 2012
+++ net/net.gyp Wed Oct 10 19:48:38 2012
@@ -55,8 +55,6 @@
$OpenBSD: patch-net_net_gyp,v 1.12 2012/11/07 06:59:45 robert Exp $
--- net/net.gyp.orig Wed Oct 31 20:01:42 2012
+++ net/net.gyp Tue Nov 6 22:45:36 2012
@@ -67,8 +67,6 @@
'base/address_family.h',
'base/address_list.cc',
'base/address_list.h',

12
www/chromium/patches/patch-ppapi_shared_impl_private_net_address_private_impl_cc
View File

@ -1,13 +1,15 @@
$OpenBSD: patch-ppapi_shared_impl_private_net_address_private_impl_cc,v 1.1 2012/08/26 18:47:01 robert Exp $
--- ppapi/shared_impl/private/net_address_private_impl.cc.orig Mon Aug 20 10:07:38 2012
+++ ppapi/shared_impl/private/net_address_private_impl.cc Mon Aug 20 10:08:04 2012
@@ -21,6 +21,9 @@
$OpenBSD: patch-ppapi_shared_impl_private_net_address_private_impl_cc,v 1.2 2012/11/07 06:59:45 robert Exp $
--- ppapi/shared_impl/private/net_address_private_impl.cc.orig Wed Oct 31 20:01:33 2012
+++ ppapi/shared_impl/private/net_address_private_impl.cc Tue Nov 6 23:21:59 2012
@@ -26,7 +26,10 @@
#include "ppapi/shared_impl/var.h"
#include "ppapi/thunk/thunk.h"
-#if defined(OS_MACOSX)
+#include <sys/types.h>
+#include <netinet/in.h>
+
#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
// This is a bit evil, but it's standard operating procedure for |s6_addr|....
#define s6_addr16 __u6_addr.__u6_addr16
#endif

15
www/chromium/patches/patch-printing_backend_cups_helper_cc Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-printing_backend_cups_helper_cc,v 1.1 2012/11/07 06:59:45 robert Exp $
--- printing/backend/cups_helper.cc.orig Tue Nov 6 23:26:46 2012
+++ printing/backend/cups_helper.cc Tue Nov 6 23:28:26 2012
@@ -281,10 +281,7 @@ bool GetColorModelSettings(ppd_file_t* ppd,
int* cm_black,
int* cm_color,
bool* is_color) {
- bool is_color_device = false;
- ppd_attr_t* attr = ppdFindAttr(ppd, kColorDevice, NULL);
- if (attr && attr->value)
- is_color_device = ppd->color_device;
+ bool is_color_device = ppd->color_device;
*is_color = is_color_device;
return (is_color_device &&

8
www/chromium/patches/patch-printing_printing_gyp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-printing_printing_gyp,v 1.13 2012/10/12 16:46:10 robert Exp $
--- printing/printing.gyp.orig Tue Sep 25 15:01:20 2012
+++ printing/printing.gyp Wed Oct 10 17:19:28 2012
@@ -276,6 +276,11 @@
$OpenBSD: patch-printing_printing_gyp,v 1.14 2012/11/07 06:59:45 robert Exp $
--- printing/printing.gyp.orig Wed Oct 31 20:01:25 2012
+++ printing/printing.gyp Tue Nov 6 22:45:36 2012
@@ -285,6 +285,11 @@
'<!@(python cups_config_helper.py --cflags)',
],
}],

16
www/chromium/patches/patch-skia_skia_gyp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-skia_skia_gyp,v 1.5 2012/10/12 16:46:10 robert Exp $
--- skia/skia.gyp.orig Tue Sep 25 15:01:38 2012
+++ skia/skia.gyp Wed Oct 10 17:19:29 2012
@@ -914,7 +914,7 @@
$OpenBSD: patch-skia_skia_gyp,v 1.6 2012/11/07 06:59:45 robert Exp $
--- skia/skia.gyp.orig Wed Oct 31 20:01:43 2012
+++ skia/skia.gyp Tue Nov 6 22:45:36 2012
@@ -339,7 +339,7 @@
'__ARM_HAVE_NEON',
],
}],
@ -10,7 +10,7 @@ $OpenBSD: patch-skia_skia_gyp,v 1.5 2012/10/12 16:46:10 robert Exp $
'sources!': [
'../third_party/skia/src/opts/opts_check_SSE2.cpp'
],
@@ -1209,7 +1209,7 @@
@@ -664,7 +664,7 @@
'SK_BUILD_FOR_ANDROID_NDK',
],
}],
@ -19,7 +19,7 @@ $OpenBSD: patch-skia_skia_gyp,v 1.5 2012/10/12 16:46:10 robert Exp $
'sources': [
'../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
@@ -1224,8 +1224,14 @@
@@ -679,8 +679,14 @@
],
}],
],
@ -36,7 +36,7 @@ $OpenBSD: patch-skia_skia_gyp,v 1.5 2012/10/12 16:46:10 robert Exp $
'conditions': [
['order_profiling != 0', {
'target_conditions' : [
@@ -1310,7 +1316,7 @@
@@ -768,7 +774,7 @@
'../third_party/skia/src/core',
],
'conditions': [
@ -45,7 +45,7 @@ $OpenBSD: patch-skia_skia_gyp,v 1.5 2012/10/12 16:46:10 robert Exp $
'cflags': [
'-mssse3',
],
@@ -1337,7 +1343,7 @@
@@ -795,7 +801,7 @@
],
},
}],

26
www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py
View File

@ -1,24 +1,18 @@
$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.12 2012/10/12 16:46:10 robert Exp $
--- tools/gyp/pylib/gyp/generator/make.py.orig Tue Sep 25 15:04:38 2012
+++ tools/gyp/pylib/gyp/generator/make.py Wed Oct 10 17:19:32 2012
@@ -268,13 +268,13 @@ ARFLAGS.target ?= %(ARFLAGS.target)s
# in gyp's make.py where ARFLAGS.host etc. is computed.
$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.13 2012/11/07 06:59:45 robert Exp $
--- tools/gyp/pylib/gyp/generator/make.py.orig Tue Nov 6 22:55:58 2012
+++ tools/gyp/pylib/gyp/generator/make.py Tue Nov 6 22:56:54 2012
@@ -270,11 +270,11 @@ ARFLAGS.target ?= %(ARFLAGS.target)s
# TODO(evan): move all cross-compilation logic to gyp-time so we don't need
# to replicate this environment fallback in make as well.
-CC.host ?= gcc
CC.host ?= %(CC.host)s
-CFLAGS.host ?=
-CXX.host ?= g++
-CXXFLAGS.host ?=
-LINK.host ?= g++
-LDFLAGS.host ?=
-AR.host ?= ar
+CC.host ?= $(CC)
+CFLAGS.host ?= $(CFLAGS)
+CXX.host ?= $(CXX)
CXX.host ?= %(CXX.host)s
-CXXFLAGS.host ?=
+CXXFLAGS.host ?= $(CXXFLAGS)
+LINK.host ?= $(LINK)
LINK.host ?= %(LINK.host)s
-LDFLAGS.host ?=
+LDFLAGS.host ?= $(LDFLAGS)
+AR.host ?= $(AR)
AR.host ?= %(AR.host)s
ARFLAGS.host := %(ARFLAGS.host)s
# Define a dir function that can handle spaces.

8
www/chromium/patches/patch-v8_src_platform_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-v8_src_platform_h,v 1.6 2012/07/10 09:22:34 robert Exp $
--- v8/src/platform.h.orig Wed May 23 03:52:53 2012
+++ v8/src/platform.h Fri Jun 1 06:13:04 2012
@@ -89,7 +89,11 @@ namespace internal {
$OpenBSD: patch-v8_src_platform_h,v 1.7 2012/11/07 06:59:45 robert Exp $
--- v8/src/platform.h.orig Wed Oct 31 20:04:19 2012
+++ v8/src/platform.h Tue Nov 6 22:45:41 2012
@@ -107,7 +107,11 @@ namespace internal {
// Use AtomicWord for a machine-sized pointer. It is assumed that
// reads and writes of naturally aligned values of this type are atomic.

8
www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.12 2012/10/12 16:46:10 robert Exp $
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig Tue Sep 25 15:01:17 2012
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc Wed Oct 10 17:19:34 2012
@@ -1485,7 +1485,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_
$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.13 2012/11/07 06:59:45 robert Exp $
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig Wed Oct 31 20:01:22 2012
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc Tue Nov 6 22:45:41 2012
@@ -1776,7 +1776,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_
#endif // defined(OS_WIN)
bool ret = false;

23
www/chromium/pkg/PLIST
View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.20 2012/10/12 16:46:10 robert Exp $
@comment $OpenBSD: PLIST,v 1.21 2012/11/07 06:59:45 robert Exp $
bin/chrome
chrome/
@bin chrome/chrome
chrome/chrome.pak
chrome/chrome_100_percent.pak
chrome/content_resources.pak
chrome/libffmpegsumo.so
chrome/locales/
@ -68,7 +69,10 @@ chrome/resources/extension/
chrome/resources/extension/demo/
chrome/resources/extension/demo/library.js
chrome/resources/inspector/
chrome/resources/inspector/AuditsPanel.js
chrome/resources/inspector/CodeMirrorTextEditor.js
chrome/resources/inspector/DevTools.js
chrome/resources/inspector/ElementsPanel.js
chrome/resources/inspector/HeapSnapshotWorker.js
chrome/resources/inspector/Images/
chrome/resources/inspector/Images/applicationCache.png
@ -115,6 +119,7 @@ chrome/resources/inspector/Images/indexedDB.png
chrome/resources/inspector/Images/indexedDBIndex.png
chrome/resources/inspector/Images/indexedDBObjectStore.png
chrome/resources/inspector/Images/localStorage.png
chrome/resources/inspector/Images/namedFlowOverflow.png
chrome/resources/inspector/Images/navigatorShowHideButton.png
chrome/resources/inspector/Images/paneAddButtons.png
chrome/resources/inspector/Images/paneBottomGrow.png
@ -132,6 +137,9 @@ chrome/resources/inspector/Images/profileSmallIcon.png
chrome/resources/inspector/Images/profilesSilhouette.png
chrome/resources/inspector/Images/programCounterBorder.png
chrome/resources/inspector/Images/radioDot.png
chrome/resources/inspector/Images/regionEmpty.png
chrome/resources/inspector/Images/regionFit.png
chrome/resources/inspector/Images/regionOverset.png
chrome/resources/inspector/Images/resourceCSSIcon.png
chrome/resources/inspector/Images/resourceDocumentIcon.png
chrome/resources/inspector/Images/resourceDocumentIconSmall.png
@ -167,6 +175,7 @@ chrome/resources/inspector/Images/spinnerInactiveSelected.gif
chrome/resources/inspector/Images/splitviewDimple.png
chrome/resources/inspector/Images/splitviewDividerBackground.png
chrome/resources/inspector/Images/statusbarButtonGlyphs.png
chrome/resources/inspector/Images/statusbarButtonGlyphs2x.png
chrome/resources/inspector/Images/statusbarResizerHorizontal.png
chrome/resources/inspector/Images/statusbarResizerVertical.png
chrome/resources/inspector/Images/successGreenDot.png
@ -209,8 +218,17 @@ chrome/resources/inspector/Images/warningIcon.png
chrome/resources/inspector/Images/warningMediumIcon.png
chrome/resources/inspector/Images/warningOrangeDot.png
chrome/resources/inspector/Images/warningsErrors.png
chrome/resources/inspector/NetworkPanel.js
chrome/resources/inspector/ProfilesPanel.js
chrome/resources/inspector/ResourcesPanel.js
chrome/resources/inspector/ScriptFormatterWorker.js
chrome/resources/inspector/ScriptsPanel.js
chrome/resources/inspector/TimelinePanel.js
chrome/resources/inspector/auditsPanel.css
chrome/resources/inspector/breadcrumbList.css
chrome/resources/inspector/cmdevtools.css
chrome/resources/inspector/codemirror.css
chrome/resources/inspector/cssNamedFlows.css
chrome/resources/inspector/dataGrid.css
chrome/resources/inspector/devTools.css
chrome/resources/inspector/devtools.html
@ -236,8 +254,7 @@ chrome/resources/inspector/tabbedPane.css
chrome/resources/inspector/textEditor.css
chrome/resources/inspector/textPrompt.css
chrome/resources/inspector/timelinePanel.css
chrome/theme_resources_100_percent.pak
chrome/ui_resources_100_percent.pak
chrome/resources/inspector/webGLProfiler.css
@man man/man1/chrome.1
share/applications/chrome.desktop
share/icons/hicolor/128x128/apps/chrome.png