From 26018c5afec12186495fca98ac1eee55b599b764 Mon Sep 17 00:00:00 2001 From: robert Date: Fri, 12 Oct 2012 16:46:09 +0000 Subject: [PATCH] update to 22.0.1229.94 --- www/chromium/Makefile | 7 +- www/chromium/distinfo | 4 +- www/chromium/patches/patch-base_atomicops_h | 10 +- www/chromium/patches/patch-base_base_gyp | 14 +- www/chromium/patches/patch-base_base_gypi | 12 +- .../patch-base_debug_stack_trace_posix_cc | 15 - .../patch-base_threading_worker_pool_posix_cc | 12 - ...rowser_printing_print_system_task_proxy_cc | 8 +- .../patch-chrome_browser_ui_webui_about_ui_cc | 18 +- .../patches/patch-chrome_chrome_browser_gypi | 16 +- ...-chrome_common_chrome_notification_types_h | 8 +- .../patch-chrome_common_chrome_paths_cc | 8 +- .../patch-chrome_test_perf_perf_test_cc | 10 +- .../patch-content_app_content_main_runner_cc | 14 +- ...patch-content_browser_browser_main_loop_cc | 14 +- ...-content_browser_child_process_launcher_cc | 78 +- .../patch-content_content_browser_gypi | 41 +- .../patches/patch-content_content_common_gypi | 12 + .../patches/patch-content_content_gpu_gypi | 12 + ...t_public_browser_content_browser_client_cc | 12 - ...nt_public_browser_content_browser_client_h | 12 - ...r_renderer_main_platform_delegate_linux_cc | 16 +- www/chromium/patches/patch-media_media_gyp | 8 +- .../patch-net_disk_cache_disk_format_h | 8 +- www/chromium/patches/patch-net_net_gyp | 12 + .../patches/patch-printing_printing_gyp | 8 +- www/chromium/patches/patch-skia_skia_gyp | 16 +- ...um_config_Chromium_openbsd_ia32_config_asm | 112 ++- ...mium_config_Chromium_openbsd_ia32_config_h | 271 +++++-- ...mium_openbsd_ia32_libavcodec_codec_names_h | 687 ++++++++++++++++++ ...ium_config_Chromium_openbsd_x64_config_asm | 118 ++- ...omium_config_Chromium_openbsd_x64_config_h | 283 ++++++-- ...omium_openbsd_x64_libavcodec_codec_names_h | 687 ++++++++++++++++++ ...d_party_ffmpeg_libavcodec_x86_vp56_arith_h | 12 + .../patch-third_party_iccjpeg_iccjpeg_gyp | 12 +- ...atch-third_party_libXNVCtrl_libXNVCtrl_gyp | 13 + ...atch-third_party_libvpx_obj_int_extract_sh | 9 + ...source_libvpx_build_make_obj_int_extract_c | 15 + ...tch-third_party_libvpx_unpack_lib_posix_sh | 9 + ...obuf_src_google_protobuf_stubs_atomicops_h | 8 +- ...atch-tools_gyp_pylib_gyp_generator_make_py | 8 +- .../patches/patch-ui_base_l10n_l10n_util_cc | 8 +- ...-webkit_plugins_npapi_plugin_list_posix_cc | 8 +- ...kit_plugins_ppapi_ppapi_plugin_instance_cc | 8 +- www/chromium/pkg/PLIST | 18 +- 45 files changed, 2324 insertions(+), 367 deletions(-) delete mode 100644 www/chromium/patches/patch-base_debug_stack_trace_posix_cc delete mode 100644 www/chromium/patches/patch-base_threading_worker_pool_posix_cc create mode 100644 www/chromium/patches/patch-content_content_common_gypi create mode 100644 www/chromium/patches/patch-content_content_gpu_gypi delete mode 100644 www/chromium/patches/patch-content_public_browser_content_browser_client_cc delete mode 100644 www/chromium/patches/patch-content_public_browser_content_browser_client_h create mode 100644 www/chromium/patches/patch-net_net_gyp create mode 100644 www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_libavcodec_codec_names_h create mode 100644 www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_libavcodec_codec_names_h create mode 100644 www/chromium/patches/patch-third_party_ffmpeg_libavcodec_x86_vp56_arith_h create mode 100644 www/chromium/patches/patch-third_party_libXNVCtrl_libXNVCtrl_gyp create mode 100644 www/chromium/patches/patch-third_party_libvpx_obj_int_extract_sh create mode 100644 www/chromium/patches/patch-third_party_libvpx_source_libvpx_build_make_obj_int_extract_c create mode 100644 www/chromium/patches/patch-third_party_libvpx_unpack_lib_posix_sh diff --git a/www/chromium/Makefile b/www/chromium/Makefile index b310f6ab937..23d01db1e5b 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.107 2012/10/04 07:40:25 landry Exp $ +# $OpenBSD: Makefile,v 1.108 2012/10/12 16:46:09 robert Exp $ ONLY_FOR_ARCHS= i386 amd64 COMMENT= Chromium browser -V= 21.0.1180.89 +V= 22.0.1229.94 DISTNAME= chromium-${V} CATEGORIES= www @@ -125,7 +125,8 @@ do-install: ${FILESDIR}/chrome ${PREFIX}/bin/chrome chmod ${BINMODE} ${PREFIX}/bin/chrome ${INSTALL_MAN} ${BUILDDIR}/chrome.1 ${PREFIX}/man/man1 -.for p in chrome content_resources resources theme_resources_standard ui_resources_standard + +.for p in chrome content_resources resources theme_resources_100_percent ui_resources_100_percent ${INSTALL_DATA} ${BUILDDIR}/${p}.pak ${PREFIX}/chrome .endfor ${INSTALL_DATA_DIR} ${PREFIX}/chrome/locales diff --git a/www/chromium/distinfo b/www/chromium/distinfo index f7f3bbc1ab0..38d5682cd38 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,2 +1,2 @@ -SHA256 (chromium-21.0.1180.89.tar.bz2) = Fsyo2QozaYQPeabwbRF1ZRX8ikw1lQYHeNyrIeWSNcU= -SIZE (chromium-21.0.1180.89.tar.bz2) = 192638239 +SHA256 (chromium-22.0.1229.94.tar.bz2) = oK9+aB70OnoXsyofbh3Bb/oqX3JflG3a7qE2YOujHK8= +SIZE (chromium-22.0.1229.94.tar.bz2) = 210379000 diff --git a/www/chromium/patches/patch-base_atomicops_h b/www/chromium/patches/patch-base_atomicops_h index 7b8c236877b..51df3410874 100644 --- a/www/chromium/patches/patch-base_atomicops_h +++ b/www/chromium/patches/patch-base_atomicops_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_atomicops_h,v 1.7 2012/08/26 18:47:01 robert Exp $ ---- base/atomicops.h.orig Tue Aug 14 09:01:48 2012 -+++ base/atomicops.h Wed Aug 15 23:14:34 2012 -@@ -50,7 +50,11 @@ typedef intptr_t Atomic64; +$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 +@@ -49,7 +49,11 @@ typedef intptr_t Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. @@ -13,7 +13,7 @@ $OpenBSD: patch-base_atomicops_h,v 1.7 2012/08/26 18:47:01 robert Exp $ // Atomically execute: // result = *ptr; -@@ -145,7 +149,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); +@@ -144,7 +148,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); // On some platforms we need additional declarations to make // AtomicWord compatible with our other Atomic* types. diff --git a/www/chromium/patches/patch-base_base_gyp b/www/chromium/patches/patch-base_base_gyp index e18fa820a07..7e5fba2a604 100644 --- a/www/chromium/patches/patch-base_base_gyp +++ b/www/chromium/patches/patch-base_base_gyp @@ -1,9 +1,9 @@ -$OpenBSD: patch-base_base_gyp,v 1.13 2012/08/26 18:47:01 robert Exp $ ---- base/base.gyp.orig Tue Aug 14 09:01:48 2012 -+++ base/base.gyp Wed Aug 15 23:14:34 2012 -@@ -612,6 +612,13 @@ - ], - }], +$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', ], + 'conditions': [ + [ 'OS == "openbsd"', { @@ -14,4 +14,4 @@ $OpenBSD: patch-base_base_gyp,v 1.13 2012/08/26 18:47:01 robert Exp $ + ], }, { - 'target_name': 'check_example', + 'target_name': 'test_support_perf', diff --git a/www/chromium/patches/patch-base_base_gypi b/www/chromium/patches/patch-base_base_gypi index 3ff809e12e3..5d2fe08efa4 100644 --- a/www/chromium/patches/patch-base_base_gypi +++ b/www/chromium/patches/patch-base_base_gypi @@ -1,15 +1,15 @@ -$OpenBSD: patch-base_base_gypi,v 1.13 2012/08/26 18:47:01 robert Exp $ ---- base/base.gypi.orig Tue Aug 14 09:01:48 2012 -+++ base/base.gypi Wed Aug 15 23:14:34 2012 -@@ -130,7 +130,6 @@ - 'file_version_info_win.h', +$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 @@ + 'files/dir_reader_posix.h', 'files/file_path_watcher.cc', 'files/file_path_watcher.h', - 'files/file_path_watcher_kqueue.cc', 'files/file_path_watcher_linux.cc', 'files/file_path_watcher_stub.cc', 'files/file_path_watcher_win.cc', -@@ -602,7 +601,6 @@ +@@ -661,7 +660,6 @@ ['<(os_bsd)==1 and >(nacl_untrusted_build)==0', { 'sources/': [ ['exclude', '^files/file_path_watcher_linux\\.cc$'], diff --git a/www/chromium/patches/patch-base_debug_stack_trace_posix_cc b/www/chromium/patches/patch-base_debug_stack_trace_posix_cc deleted file mode 100644 index 6e84c66935d..00000000000 --- a/www/chromium/patches/patch-base_debug_stack_trace_posix_cc +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.5 2012/07/10 09:22:34 robert Exp $ ---- base/debug/stack_trace_posix.cc.orig Tue Jul 10 10:37:42 2012 -+++ base/debug/stack_trace_posix.cc Tue Jul 10 10:42:08 2012 -@@ -153,6 +153,11 @@ StackTrace::StackTrace() { - count_ = 0; - return; - } -+#elif defined(OS_BSD) -+ // Disable backtrace for now, libexecinfo crashes in getframeaddr -+ // in release build / i386. -+ count_ = 0; -+ return; - #endif - // Though the backtrace API man page does not list any possible negative - // return values, we take no chance. diff --git a/www/chromium/patches/patch-base_threading_worker_pool_posix_cc b/www/chromium/patches/patch-base_threading_worker_pool_posix_cc deleted file mode 100644 index b37bcfb394e..00000000000 --- a/www/chromium/patches/patch-base_threading_worker_pool_posix_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-base_threading_worker_pool_posix_cc,v 1.6 2012/07/10 09:22:34 robert Exp $ ---- base/threading/worker_pool_posix.cc.orig Thu Jun 28 15:01:48 2012 -+++ base/threading/worker_pool_posix.cc Sat Jul 7 09:50:22 2012 -@@ -28,7 +28,7 @@ base::LazyInstance::Leaky - const int kIdleSecondsBeforeExit = 10 * 60; - // A stack size of 64 KB is too small for the CERT_PKIXVerifyCert - // function of NSS because of NSS bug 439169. --const int kWorkerThreadStackSize = 128 * 1024; -+const int kWorkerThreadStackSize = 256 * 1024; - - class WorkerPoolImpl { - public: diff --git a/www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc b/www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc index 746269082c1..508ef3054a3 100644 --- a/www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc +++ b/www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc @@ -1,11 +1,11 @@ -$OpenBSD: patch-chrome_browser_printing_print_system_task_proxy_cc,v 1.3 2012/08/26 18:47:01 robert Exp $ +$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 Aug 14 09:02:00 2012 -+++ chrome/browser/printing/print_system_task_proxy.cc Wed Aug 15 23:14:34 2012 -@@ -445,10 +445,7 @@ bool PrintSystemTaskProxy::GetPrinterCapabilitiesCUPS( +--- 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( } } diff --git a/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc b/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc index 6cd93a9b4c2..0c600431346 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc @@ -1,16 +1,16 @@ -$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.4 2012/08/26 18:47:01 robert Exp $ ---- chrome/browser/ui/webui/about_ui.cc.orig Wed Aug 15 23:16:10 2012 -+++ chrome/browser/ui/webui/about_ui.cc Wed Aug 15 23:16:48 2012 -@@ -72,7 +72,7 @@ - #include "webkit/glue/webkit_glue.h" - #include "webkit/plugins/webplugininfo.h" +$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 @@ + #include "chrome/browser/ui/webui/theme_source.h" + #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) #include "content/public/browser/zygote_host_linux.h" #include "content/public/common/sandbox_linux.h" #endif -@@ -1027,6 +1027,7 @@ std::string AboutLinuxProxyConfig() { +@@ -940,6 +940,7 @@ std::string AboutLinuxProxyConfig() { return data; } @@ -18,7 +18,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.4 2012/08/26 18:47:01 ro void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, bool good) { data->append(""); -@@ -1083,6 +1084,7 @@ std::string AboutSandbox() { +@@ -1001,6 +1002,7 @@ std::string AboutSandbox() { return data; } #endif @@ -26,7 +26,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.4 2012/08/26 18:47:01 ro std::string AboutVersionStaticContent(const std::string& query) { return ResourceBundle::GetSharedInstance().GetRawDataResource( -@@ -1422,7 +1424,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st +@@ -1341,7 +1343,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st response = ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_OS_CREDITS_HTML, ui::SCALE_FACTOR_NONE).as_string(); #endif diff --git a/www/chromium/patches/patch-chrome_chrome_browser_gypi b/www/chromium/patches/patch-chrome_chrome_browser_gypi index c645884b2c6..159bdcb6cfb 100644 --- a/www/chromium/patches/patch-chrome_chrome_browser_gypi +++ b/www/chromium/patches/patch-chrome_chrome_browser_gypi @@ -1,12 +1,12 @@ -$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.13 2012/08/26 18:47:01 robert Exp $ ---- chrome/chrome_browser.gypi.orig Wed Aug 15 23:17:03 2012 -+++ chrome/chrome_browser.gypi Wed Aug 15 23:17:21 2012 -@@ -1356,8 +1356,6 @@ - 'browser/media/media_stream_capture_indicator.h', - 'browser/media/media_stream_devices_menu_model.cc', +$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', - 'browser/media_gallery/media_device_notifications_window_win.h', - 'browser/media_gallery/media_file_system_registry.cc', diff --git a/www/chromium/patches/patch-chrome_common_chrome_notification_types_h b/www/chromium/patches/patch-chrome_common_chrome_notification_types_h index ebdb60f284e..78ad85e0de1 100644 --- a/www/chromium/patches/patch-chrome_common_chrome_notification_types_h +++ b/www/chromium/patches/patch-chrome_common_chrome_notification_types_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_notification_types_h,v 1.1 2012/08/26 18:47:01 robert Exp $ ---- chrome/common/chrome_notification_types.h.orig Thu Aug 16 00:25:40 2012 -+++ chrome/common/chrome_notification_types.h Thu Aug 16 00:25:50 2012 -@@ -54,7 +54,7 @@ enum NotificationType { +$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 { // that was closed, no details are expected. NOTIFICATION_WINDOW_CLOSED, diff --git a/www/chromium/patches/patch-chrome_common_chrome_paths_cc b/www/chromium/patches/patch-chrome_common_chrome_paths_cc index dfe567052df..94a17ce6c2b 100644 --- a/www/chromium/patches/patch-chrome_common_chrome_paths_cc +++ b/www/chromium/patches/patch-chrome_common_chrome_paths_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.9 2012/08/26 18:47:01 robert Exp $ ---- chrome/common/chrome_paths.cc.orig Tue Aug 14 09:02:25 2012 -+++ chrome/common/chrome_paths.cc Wed Aug 15 23:14:34 2012 -@@ -358,7 +358,7 @@ bool PathProvider(int key, FilePath* result) { +$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) { if (!file_util::PathExists(cur)) // We don't want to create this return false; break; diff --git a/www/chromium/patches/patch-chrome_test_perf_perf_test_cc b/www/chromium/patches/patch-chrome_test_perf_perf_test_cc index 88951deb246..a5a6f844e74 100644 --- a/www/chromium/patches/patch-chrome_test_perf_perf_test_cc +++ b/www/chromium/patches/patch-chrome_test_perf_perf_test_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-chrome_test_perf_perf_test_cc,v 1.1 2012/08/26 18:47:01 robert Exp $ ---- chrome/test/perf/perf_test.cc.orig Thu Aug 16 09:20:53 2012 -+++ chrome/test/perf/perf_test.cc Thu Aug 16 09:23:52 2012 +$OpenBSD: patch-chrome_test_perf_perf_test_cc,v 1.2 2012/10/12 16:46:10 robert Exp $ +--- chrome/test/perf/perf_test.cc.orig Wed Oct 10 19:04:22 2012 ++++ chrome/test/perf/perf_test.cc Wed Oct 10 19:04:50 2012 @@ -389,7 +389,7 @@ std::string MemoryUsageInfoToString(const std::string& AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name, total_working_set_size, "bytes", false /* not important */); --#elif defined(OS_LINUX) || defined(OS_MACOSX) -+#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_ANDROID) ++#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_BSD) AppendResult(output, "vm_size_final_b", "", "vm_size_f_b" + trace_name, browser_virtual_size, "bytes", false /* not important */); diff --git a/www/chromium/patches/patch-content_app_content_main_runner_cc b/www/chromium/patches/patch-content_app_content_main_runner_cc index 90ff5fc0538..a85a7f31b2a 100644 --- a/www/chromium/patches/patch-content_app_content_main_runner_cc +++ b/www/chromium/patches/patch-content_app_content_main_runner_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_app_content_main_runner_cc,v 1.2 2012/08/26 18:47:01 robert Exp $ ---- content/app/content_main_runner.cc.orig Wed Aug 15 23:17:36 2012 -+++ content/app/content_main_runner.cc Thu Aug 16 10:40:04 2012 -@@ -84,7 +84,7 @@ extern int PpapiBrokerMain(const content::MainFunction +$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 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.2 2012/08/26 18:47:01 rob namespace content { extern int ZygoteMain(const MainFunctionParams&, ZygoteForkDelegate* forkdelegate); -@@ -268,7 +268,7 @@ struct MainFunction { +@@ -273,7 +273,7 @@ struct MainFunction { int (*function)(const MainFunctionParams&); }; @@ -19,7 +19,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.2 2012/08/26 18:47:01 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(). -@@ -372,7 +372,7 @@ int RunNamedProcessTypeMain( +@@ -377,7 +377,7 @@ int RunNamedProcessTypeMain( } } @@ -28,7 +28,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.2 2012/08/26 18:47:01 rob // Zygote startup is special -- see RunZygote comments above // for why we don't use ZygoteMain directly. if (process_type == switches::kZygoteProcess) -@@ -462,7 +462,7 @@ static void ReleaseFreeMemoryThunk() { +@@ -470,7 +470,7 @@ static void ReleaseFreeMemoryThunk() { kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); #endif diff --git a/www/chromium/patches/patch-content_browser_browser_main_loop_cc b/www/chromium/patches/patch-content_browser_browser_main_loop_cc index faf3e80def7..d89ca40674c 100644 --- a/www/chromium/patches/patch-content_browser_browser_main_loop_cc +++ b/www/chromium/patches/patch-content_browser_browser_main_loop_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.4 2012/08/26 18:47:01 robert Exp $ ---- content/browser/browser_main_loop.cc.orig Tue Aug 14 09:01:25 2012 -+++ content/browser/browser_main_loop.cc Wed Aug 15 23:14:34 2012 -@@ -69,7 +69,7 @@ +$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 @@ #include "ui/gfx/gtk_util.h" #endif @@ -9,8 +9,8 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.4 2012/08/26 18:47:01 r +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #include #include "content/browser/renderer_host/render_sandbox_host_linux.h" - #include "content/browser/zygote_host_impl_linux.h" -@@ -88,7 +88,7 @@ using content::TraceControllerImpl; + #include "content/browser/zygote_host/zygote_host_impl_linux.h" +@@ -97,7 +97,7 @@ using content::TraceControllerImpl; namespace { @@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.4 2012/08/26 18:47:01 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. -@@ -269,7 +269,7 @@ void BrowserMainLoop::EarlyInitialization() { +@@ -282,7 +282,7 @@ void BrowserMainLoop::EarlyInitialization() { } #endif // !defined(USE_OPENSSL) diff --git a/www/chromium/patches/patch-content_browser_child_process_launcher_cc b/www/chromium/patches/patch-content_browser_child_process_launcher_cc index a17cb14d084..8c6cb5d4861 100644 --- a/www/chromium/patches/patch-content_browser_child_process_launcher_cc +++ b/www/chromium/patches/patch-content_browser_child_process_launcher_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22:34 robert Exp $ ---- content/browser/child_process_launcher.cc.orig Sat Jul 7 15:53:55 2012 -+++ content/browser/child_process_launcher.cc Sat Jul 7 15:54:36 2012 -@@ -49,7 +49,7 @@ class ChildProcessLauncher::Context +$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.6 2012/10/12 16:46:10 robert Exp $ +--- content/browser/child_process_launcher.cc.orig Thu Oct 11 23:31:56 2012 ++++ content/browser/child_process_launcher.cc Thu Oct 11 23:48:24 2012 +@@ -52,7 +52,7 @@ class ChildProcessLauncher::Context termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), exit_code_(content::RESULT_CODE_NORMAL_EXIT), starting_(true) @@ -10,33 +10,25 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22 , zygote_(false) #endif { -@@ -132,7 +132,7 @@ class ChildProcessLauncher::Context - // to reliably detect child termination. - file_util::ScopedFD ipcfd_closer(&ipcfd); - --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - // On Linux, we need to add some extra file descriptors for crash handling. - std::string process_type = - cmd_line->GetSwitchValueASCII(switches::kProcessType); -@@ -157,7 +157,7 @@ class ChildProcessLauncher::Context - ipcfd, - kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor)); - --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - if (crash_signal_fd >= 0) { - fds_to_map.push_back(std::make_pair( - crash_signal_fd, -@@ -214,14 +214,14 @@ class ChildProcessLauncher::Context - base::Bind( - &Context::Notify, - this_object.get(), --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - use_zygote, +@@ -188,7 +188,7 @@ class ChildProcessLauncher::Context + base::GlobalDescriptors::Mapping files_to_register; + files_to_register.push_back(std::pair( + kPrimaryIPCChannel, ipcfd)); +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + content::GetContentClient()->browser()-> + GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register); + if (use_zygote) { +@@ -261,7 +261,7 @@ class ChildProcessLauncher::Context + base::Bind( + &Context::Notify, + this_object.get(), +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + use_zygote, #endif - handle)); + handle)); +@@ -269,7 +269,7 @@ class ChildProcessLauncher::Context } void Notify( @@ -45,7 +37,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22 bool zygote, #endif base::ProcessHandle handle) { -@@ -230,7 +230,7 @@ class ChildProcessLauncher::Context +@@ -282,7 +282,7 @@ class ChildProcessLauncher::Context if (!handle) LOG(ERROR) << "Failed to launch child process"; @@ -54,7 +46,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22 zygote_ = zygote; #endif if (client_) { -@@ -253,7 +253,7 @@ class ChildProcessLauncher::Context +@@ -305,7 +305,7 @@ class ChildProcessLauncher::Context BrowserThread::PROCESS_LAUNCHER, FROM_HERE, base::Bind( &Context::TerminateInternal, @@ -63,7 +55,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22 zygote_, #endif process_.handle())); -@@ -267,7 +267,7 @@ class ChildProcessLauncher::Context +@@ -319,7 +319,7 @@ class ChildProcessLauncher::Context } static void TerminateInternal( @@ -72,25 +64,25 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22 bool zygote, #endif base::ProcessHandle handle) { -@@ -277,7 +277,7 @@ class ChildProcessLauncher::Context +@@ -333,7 +333,7 @@ class ChildProcessLauncher::Context process.Terminate(content::RESULT_CODE_NORMAL_EXIT); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) --#if !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) if (zygote) { // If the renderer was created via a zygote, we have to proxy the reaping // through the zygote process. -@@ -301,7 +301,7 @@ class ChildProcessLauncher::Context - // shutdown. Default behavior is to terminate the child. - bool terminate_child_on_shutdown_; - --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) +@@ -360,7 +360,7 @@ class ChildProcessLauncher::Context + #if defined(OS_ANDROID) + // The fd to close after creating the process. + int ipcfd_; +-#elif defined(OS_POSIX) && !defined(OS_MACOSX) ++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) bool zygote_; #endif }; -@@ -352,7 +352,7 @@ base::TerminationStatus ChildProcessLauncher::GetChild +@@ -413,7 +413,7 @@ base::TerminationStatus ChildProcessLauncher::GetChild *exit_code = context_->exit_code_; return context_->termination_status_; } diff --git a/www/chromium/patches/patch-content_content_browser_gypi b/www/chromium/patches/patch-content_content_browser_gypi index 444253d9ae9..0eaa5ef8284 100644 --- a/www/chromium/patches/patch-content_content_browser_gypi +++ b/www/chromium/patches/patch-content_content_browser_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_content_browser_gypi,v 1.11 2012/08/26 18:47:01 robert Exp $ ---- content/content_browser.gypi.orig Wed Aug 15 23:18:24 2012 -+++ content/content_browser.gypi Wed Aug 15 23:18:52 2012 -@@ -164,7 +164,6 @@ +$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 @@ 'public/browser/web_ui_message_handler.h', 'public/browser/worker_service.h', 'public/browser/worker_service_observer.h', @@ -9,12 +9,39 @@ $OpenBSD: patch-content_content_browser_gypi,v 1.11 2012/08/26 18:47:01 robert E 'browser/accessibility/browser_accessibility.cc', 'browser/accessibility/browser_accessibility.h', 'browser/accessibility/browser_accessibility_cocoa.h', -@@ -760,11 +759,6 @@ +@@ -273,8 +272,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_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', + 'browser/download/drag_download_util.h', +- 'browser/download/file_metadata_linux.cc', +- 'browser/download/file_metadata_linux.h', + 'browser/download/file_metadata_mac.h', + 'browser/download/file_metadata_mac.mm', + 'browser/download/mhtml_generation_manager.cc', +@@ -743,8 +738,6 @@ + 'browser/system_message_window_win.h', + 'browser/tcmalloc_internals_request_job.cc', + 'browser/tcmalloc_internals_request_job.h', +- 'browser/udev_linux.cc', +- 'browser/udev_linux.h', + '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', 'browser/worker_host/worker_service_impl.h', -- 'browser/zygote_host_impl_linux.cc', -- 'browser/zygote_host_impl_linux.h', +- 'browser/zygote_host/zygote_host_impl_linux.cc', +- 'browser/zygote_host/zygote_host_impl_linux.h', - 'zygote/zygote_linux.cc', - 'zygote/zygote_linux.h', - 'zygote/zygote_main_linux.cc', diff --git a/www/chromium/patches/patch-content_content_common_gypi b/www/chromium/patches/patch-content_content_common_gypi new file mode 100644 index 00000000000..1715f09ded9 --- /dev/null +++ b/www/chromium/patches/patch-content_content_common_gypi @@ -0,0 +1,12 @@ +$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 @@ + 'common/sandbox_linux.cc', + 'common/sandbox_policy.cc', + 'common/sandbox_policy.h', +- 'common/sandbox_seccomp_bpf_linux.cc', +- 'common/sandbox_seccomp_bpf_linux.h', + 'common/savable_url_schemes.cc', + 'common/savable_url_schemes.h', + 'common/set_process_title.cc', diff --git a/www/chromium/patches/patch-content_content_gpu_gypi b/www/chromium/patches/patch-content_content_gpu_gypi new file mode 100644 index 00000000000..ab74b0a7f31 --- /dev/null +++ b/www/chromium/patches/patch-content_content_gpu_gypi @@ -0,0 +1,12 @@ +$OpenBSD: patch-content_content_gpu_gypi,v 1.1 2012/10/12 16:46:10 robert Exp $ +--- content/content_gpu.gypi.orig Thu Oct 11 23:31:06 2012 ++++ content/content_gpu.gypi Thu Oct 11 23:31:26 2012 +@@ -95,7 +95,7 @@ + '../third_party/amd/amd_videocard_info_win.cc', + ], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'dependencies': [ + '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl', + ], diff --git a/www/chromium/patches/patch-content_public_browser_content_browser_client_cc b/www/chromium/patches/patch-content_public_browser_content_browser_client_cc deleted file mode 100644 index 96d2cf8b67b..00000000000 --- a/www/chromium/patches/patch-content_public_browser_content_browser_client_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-content_public_browser_content_browser_client_cc,v 1.1 2012/08/26 18:47:01 robert Exp $ ---- content/public/browser/content_browser_client.cc.orig Mon Aug 20 11:28:14 2012 -+++ content/public/browser/content_browser_client.cc Mon Aug 20 11:28:24 2012 -@@ -208,7 +208,7 @@ bool ContentBrowserClient::AllowPepperPrivateFileAPI() - return false; - } - --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - int ContentBrowserClient::GetCrashSignalFD(const CommandLine& command_line) { - return -1; - } diff --git a/www/chromium/patches/patch-content_public_browser_content_browser_client_h b/www/chromium/patches/patch-content_public_browser_content_browser_client_h deleted file mode 100644 index c1766d6da5d..00000000000 --- a/www/chromium/patches/patch-content_public_browser_content_browser_client_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-content_public_browser_content_browser_client_h,v 1.2 2012/08/26 18:47:01 robert Exp $ ---- content/public/browser/content_browser_client.h.orig Tue Aug 14 09:01:26 2012 -+++ content/public/browser/content_browser_client.h Wed Aug 15 23:14:34 2012 -@@ -396,7 +396,7 @@ class CONTENT_EXPORT ContentBrowserClient { - // Returns true if renderer processes can use private Pepper File APIs. - virtual bool AllowPepperPrivateFileAPI(); - --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - // Can return an optional fd for crash handling, otherwise returns -1. The - // passed |command_line| will be used to start the process in question. - virtual int GetCrashSignalFD(const CommandLine& command_line); diff --git a/www/chromium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc b/www/chromium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc index b90e333e9a2..a52b41fb1d1 100644 --- a/www/chromium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc +++ b/www/chromium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc @@ -1,11 +1,11 @@ -$OpenBSD: patch-content_renderer_renderer_main_platform_delegate_linux_cc,v 1.4 2012/07/10 09:22:34 robert Exp $ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig Sat Jul 7 17:27:38 2012 -+++ content/renderer/renderer_main_platform_delegate_linux.cc Sat Jul 7 17:27:45 2012 -@@ -41,8 +41,8 @@ bool RendererMainPlatformDelegate::EnableSandbox() { - // a file descriptor for "/proc". - if (SeccompSandboxEnabled() && SupportsSeccompSandbox(-1)) - StartSeccompSandbox(); --#endif +$OpenBSD: patch-content_renderer_renderer_main_platform_delegate_linux_cc,v 1.5 2012/10/12 16:46:10 robert Exp $ +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig Wed Oct 10 22:54:20 2012 ++++ content/renderer/renderer_main_platform_delegate_linux.cc Wed Oct 10 22:54:33 2012 +@@ -34,7 +34,9 @@ bool RendererMainPlatformDelegate::EnableSandbox() { + // + // The seccomp sandbox mode 1 (sandbox/linux/seccomp-legacy) and mode 2 + // (sandbox/linux/seccomp-bpf) are started in InitializeSandbox(). ++#if !defined(OS_BSD) content::InitializeSandbox(); +#endif return true; diff --git a/www/chromium/patches/patch-media_media_gyp b/www/chromium/patches/patch-media_media_gyp index 4810ff4e73e..4c9c837ef6d 100644 --- a/www/chromium/patches/patch-media_media_gyp +++ b/www/chromium/patches/patch-media_media_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-media_media_gyp,v 1.13 2012/08/26 18:47:01 robert Exp $ ---- media/media.gyp.orig Tue Aug 14 09:01:11 2012 -+++ media/media.gyp Wed Aug 15 23:14:34 2012 -@@ -367,6 +367,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 @@ }], ['OS=="openbsd"', { 'sources/': [ ['exclude', '/alsa_' ], diff --git a/www/chromium/patches/patch-net_disk_cache_disk_format_h b/www/chromium/patches/patch-net_disk_cache_disk_format_h index 3c9d9f54684..182d502d0f0 100644 --- a/www/chromium/patches/patch-net_disk_cache_disk_format_h +++ b/www/chromium/patches/patch-net_disk_cache_disk_format_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_disk_cache_disk_format_h,v 1.4 2012/02/17 10:19:51 robert Exp $ ---- net/disk_cache/disk_format.h.orig Fri Jan 27 09:01:26 2012 -+++ net/disk_cache/disk_format.h Thu Feb 9 09:31:06 2012 -@@ -158,7 +158,7 @@ struct RankingsNode { +$OpenBSD: patch-net_disk_cache_disk_format_h,v 1.5 2012/10/12 16:46:10 robert Exp $ +--- net/disk_cache/disk_format.h.orig Tue Sep 25 15:01:37 2012 ++++ net/disk_cache/disk_format.h Wed Oct 10 17:19:28 2012 +@@ -157,7 +157,7 @@ struct RankingsNode { }; #pragma pack(pop) diff --git a/www/chromium/patches/patch-net_net_gyp b/www/chromium/patches/patch-net_net_gyp new file mode 100644 index 00000000000..e956ce1145f --- /dev/null +++ b/www/chromium/patches/patch-net_net_gyp @@ -0,0 +1,12 @@ +$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 @@ + 'base/address_family.h', + 'base/address_list.cc', + 'base/address_list.h', +- 'base/address_tracker_linux.cc', +- 'base/address_tracker_linux.h', + 'base/asn1_util.cc', + 'base/asn1_util.h', + 'base/auth.cc', diff --git a/www/chromium/patches/patch-printing_printing_gyp b/www/chromium/patches/patch-printing_printing_gyp index 24e72e8dbce..e61bcec8de4 100644 --- a/www/chromium/patches/patch-printing_printing_gyp +++ b/www/chromium/patches/patch-printing_printing_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-printing_printing_gyp,v 1.12 2012/08/26 18:47:01 robert Exp $ ---- printing/printing.gyp.orig Tue Aug 14 09:01:15 2012 -+++ printing/printing.gyp Wed Aug 15 23:14:35 2012 -@@ -270,6 +270,11 @@ +$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 @@ ' ++#else + #include "elf.h" ++#endif + + #define COPY_STRUCT(dst, buf, ofst, sz) do {\ + if(ofst + sizeof((*(dst))) > sz) goto bail;\ diff --git a/www/chromium/patches/patch-third_party_libvpx_unpack_lib_posix_sh b/www/chromium/patches/patch-third_party_libvpx_unpack_lib_posix_sh new file mode 100644 index 00000000000..2d073cad70c --- /dev/null +++ b/www/chromium/patches/patch-third_party_libvpx_unpack_lib_posix_sh @@ -0,0 +1,9 @@ +$OpenBSD: patch-third_party_libvpx_unpack_lib_posix_sh,v 1.1 2012/10/12 16:46:10 robert Exp $ +--- third_party/libvpx/unpack_lib_posix.sh.orig Wed Oct 10 23:00:29 2012 ++++ third_party/libvpx/unpack_lib_posix.sh Wed Oct 10 23:00:42 2012 +@@ -1,4 +1,4 @@ +-#!/bin/bash -e ++#!/usr/bin/env bash + # + # Copyright (c) 2012 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-third_party_protobuf_src_google_protobuf_stubs_atomicops_h b/www/chromium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h index bf8a80c2c61..8046281be12 100644 --- a/www/chromium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h +++ b/www/chromium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h,v 1.1 2012/08/26 18:47:01 robert Exp $ ---- third_party/protobuf/src/google/protobuf/stubs/atomicops.h.orig Sun Aug 26 11:49:41 2012 -+++ third_party/protobuf/src/google/protobuf/stubs/atomicops.h Sun Aug 26 11:51:09 2012 -@@ -74,7 +74,11 @@ typedef intptr_t Atomic64; +$OpenBSD: patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h,v 1.2 2012/10/12 16:46:10 robert Exp $ +--- third_party/protobuf/src/google/protobuf/stubs/atomicops.h.orig Tue Sep 25 15:01:42 2012 ++++ third_party/protobuf/src/google/protobuf/stubs/atomicops.h Wed Oct 10 17:19:29 2012 +@@ -77,7 +77,11 @@ typedef intptr_t Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. diff --git a/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py b/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py index 66c391ef33d..416b3de47c8 100644 --- a/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py +++ b/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py @@ -1,7 +1,7 @@ -$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.11 2012/08/26 18:47:01 robert Exp $ ---- tools/gyp/pylib/gyp/generator/make.py.orig Tue Aug 14 09:04:19 2012 -+++ tools/gyp/pylib/gyp/generator/make.py Wed Aug 15 23:14:39 2012 -@@ -270,13 +270,13 @@ ARFLAGS.target ?= %(ARFLAGS.target)s +$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. # TODO(evan): move all cross-compilation logic to gyp-time so we don't need # to replicate this environment fallback in make as well. diff --git a/www/chromium/patches/patch-ui_base_l10n_l10n_util_cc b/www/chromium/patches/patch-ui_base_l10n_l10n_util_cc index c435814e1d5..750cb69bd77 100644 --- a/www/chromium/patches/patch-ui_base_l10n_l10n_util_cc +++ b/www/chromium/patches/patch-ui_base_l10n_l10n_util_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-ui_base_l10n_l10n_util_cc,v 1.5 2012/07/10 09:22:34 robert Exp $ ---- ui/base/l10n/l10n_util.cc.orig Sat Jul 7 12:46:25 2012 -+++ ui/base/l10n/l10n_util.cc Sat Jul 7 13:01:04 2012 +$OpenBSD: patch-ui_base_l10n_l10n_util_cc,v 1.6 2012/10/12 16:46:10 robert Exp $ +--- ui/base/l10n/l10n_util.cc.orig Tue Sep 25 15:02:45 2012 ++++ ui/base/l10n/l10n_util.cc Wed Oct 10 17:19:32 2012 @@ -33,7 +33,7 @@ #include "base/android/locale_utils.h" #endif @@ -10,7 +10,7 @@ $OpenBSD: patch-ui_base_l10n_l10n_util_cc,v 1.5 2012/07/10 09:22:34 robert Exp $ #include #endif -@@ -417,7 +417,7 @@ std::string GetApplicationLocale(const std::string& pr +@@ -419,7 +419,7 @@ std::string GetApplicationLocale(const std::string& pr if (!pref_locale.empty()) candidates.push_back(pref_locale); diff --git a/www/chromium/patches/patch-webkit_plugins_npapi_plugin_list_posix_cc b/www/chromium/patches/patch-webkit_plugins_npapi_plugin_list_posix_cc index a75ae4b4205..b9f22b8f4af 100644 --- a/www/chromium/patches/patch-webkit_plugins_npapi_plugin_list_posix_cc +++ b/www/chromium/patches/patch-webkit_plugins_npapi_plugin_list_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-webkit_plugins_npapi_plugin_list_posix_cc,v 1.2 2012/08/26 18:47:01 robert Exp $ ---- webkit/plugins/npapi/plugin_list_posix.cc.orig Tue Aug 14 09:01:13 2012 -+++ webkit/plugins/npapi/plugin_list_posix.cc Thu Aug 16 07:52:35 2012 -@@ -149,7 +149,7 @@ void PluginList::GetPluginDirectories(std::vectorpush_back(FilePath("/usr/lib/browser-plugins")); diff --git a/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc b/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc index cf6bd0819a1..9c6c1c6a9bc 100644 --- a/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc +++ b/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.11 2012/08/26 18:47:01 robert Exp $ ---- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig Tue Aug 14 09:01:13 2012 -+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc Wed Aug 15 23:14:41 2012 -@@ -1465,7 +1465,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_ +$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_ #endif // defined(OS_WIN) bool ret = false; diff --git a/www/chromium/pkg/PLIST b/www/chromium/pkg/PLIST index 51e2e124e67..7f4184f249f 100644 --- a/www/chromium/pkg/PLIST +++ b/www/chromium/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.19 2012/08/26 18:47:01 robert Exp $ +@comment $OpenBSD: PLIST,v 1.20 2012/10/12 16:46:10 robert Exp $ bin/chrome chrome/ @bin chrome/chrome @@ -166,17 +166,7 @@ chrome/resources/inspector/Images/spinnerInactive.gif chrome/resources/inspector/Images/spinnerInactiveSelected.gif chrome/resources/inspector/Images/splitviewDimple.png chrome/resources/inspector/Images/splitviewDividerBackground.png -chrome/resources/inspector/Images/statusbarBackground.png -chrome/resources/inspector/Images/statusbarBackgroundChromium.png -chrome/resources/inspector/Images/statusbarBottomBackground.png -chrome/resources/inspector/Images/statusbarBottomBackgroundChromium.png chrome/resources/inspector/Images/statusbarButtonGlyphs.png -chrome/resources/inspector/Images/statusbarButtons.png -chrome/resources/inspector/Images/statusbarButtonsChromium.png -chrome/resources/inspector/Images/statusbarMenuButton.png -chrome/resources/inspector/Images/statusbarMenuButtonChromium.png -chrome/resources/inspector/Images/statusbarMenuButtonSelected.png -chrome/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png chrome/resources/inspector/Images/statusbarResizerHorizontal.png chrome/resources/inspector/Images/statusbarResizerVertical.png chrome/resources/inspector/Images/successGreenDot.png @@ -243,11 +233,11 @@ chrome/resources/inspector/revisionHistory.css chrome/resources/inspector/scriptsPanel.css chrome/resources/inspector/splitView.css chrome/resources/inspector/tabbedPane.css +chrome/resources/inspector/textEditor.css chrome/resources/inspector/textPrompt.css -chrome/resources/inspector/textViewer.css chrome/resources/inspector/timelinePanel.css -chrome/theme_resources_standard.pak -chrome/ui_resources_standard.pak +chrome/theme_resources_100_percent.pak +chrome/ui_resources_100_percent.pak @man man/man1/chrome.1 share/applications/chrome.desktop share/icons/hicolor/128x128/apps/chrome.png