From 0d68a1e68664d184cdeed2254541ae9ab815a8a1 Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 27 Apr 2015 16:38:25 +0000 Subject: [PATCH] update to 42.0.2311.90 --- www/chromium/Makefile | 6 +- www/chromium/distinfo | 4 +- www/chromium/patches/patch-base_atomicops_h | 8 +- www/chromium/patches/patch-base_base_gypi | 8 +- .../patch-base_message_loop_message_loop_cc | 8 +- .../patches/patch-base_process_launch_h | 12 +- .../patches/patch-base_process_memory_cc | 13 + www/chromium/patches/patch-build_all_gyp | 8 +- www/chromium/patches/patch-build_common_gypi | 27 +- .../patch-chrome_app_chrome_main_delegate_cc | 26 +- .../patch-chrome_app_chrome_main_delegate_h | 8 +- .../patch-chrome_app_chromium_strings_grd | 8 +- ...patch-chrome_app_google_chrome_strings_grd | 8 +- ...patch-chrome_app_theme_theme_resources_grd | 8 +- .../patch-chrome_browser_about_flags_cc | 8 +- ...patch-chrome_browser_browser_resources_grd | 8 +- ...e_browser_chrome_content_browser_client_cc | 26 +- ...me_browser_chrome_content_browser_client_h | 12 +- ...wnload_chrome_download_manager_delegate_cc | 8 +- ...er_download_download_shelf_context_menu_cc | 36 +-- ...me_browser_first_run_upgrade_util_linux_cc | 8 +- .../patch-chrome_browser_memory_details_cc | 12 +- ...hrome_browser_net_async_dns_field_trial_cc | 8 +- ...ons_message_center_notification_manager_cc | 8 +- ...atch-chrome_browser_platform_util_linux_cc | 10 +- ...hrome_browser_renderer_preferences_util_cc | 10 +- ...ch-chrome_browser_ssl_ssl_blocking_page_cc | 8 +- ...nc_profile_sync_components_factory_impl_cc | 8 +- ..._browser_tracing_crash_service_uploader_cc | 12 + ...wser_ui_ash_system_tray_delegate_common_cc | 8 +- .../patch-chrome_browser_ui_browser_cc | 8 +- ...e_browser_ui_browser_command_controller_cc | 16 +- ...wser_ui_startup_startup_browser_creator_cc | 8 +- ...me_browser_ui_toolbar_wrench_menu_model_cc | 8 +- ...ews_apps_chrome_native_app_window_views_cc | 8 +- ..._browser_ui_views_chrome_views_delegate_cc | 12 +- ...e_browser_ui_views_chrome_views_delegate_h | 10 +- ..._views_frame_desktop_browser_frame_aura_cc | 21 -- ...i_views_frame_opaque_browser_frame_view_cc | 23 +- ...essage_center_message_center_frame_view_cc | 8 +- ...-chrome_browser_ui_views_tabs_tab_strip_cc | 8 +- .../patch-chrome_browser_ui_webui_about_ui_cc | 29 +- ..._webui_chrome_web_ui_controller_factory_cc | 8 +- ...i_webui_options_browser_options_handler_cc | 18 +- ...chrome_browser_web_applications_web_app_cc | 8 +- ...-chrome_browser_web_applications_web_app_h | 8 +- ...atch-chrome_chrome_browser_extensions_gypi | 14 +- .../patches/patch-chrome_chrome_browser_gypi | 20 +- .../patch-chrome_chrome_browser_ui_gypi | 14 +- .../patches/patch-chrome_chrome_exe_gypi | 18 +- .../patch-chrome_common_chrome_paths_cc | 8 +- .../patch-chrome_common_chrome_paths_h | 8 +- .../patch-chrome_common_chrome_switches_cc | 8 +- .../patch-chrome_common_chrome_switches_h | 8 +- ...-chrome_common_extensions_api_schemas_gypi | 8 +- .../patches/patch-chrome_common_pref_names_cc | 10 +- .../patches/patch-chrome_common_pref_names_h | 10 +- .../patch-chrome_test_perf_perf_test_cc | 8 +- ...patch-components_audio_modem_modem_impl_cc | 12 + ...nts_policy_resources_policy_templates_json | 12 +- ...printing_renderer_print_web_view_helper_h} | 8 +- .../patch-content_app_content_main_runner_cc | 13 +- ...patch-content_browser_browser_main_loop_cc | 12 +- ...-content_browser_child_process_launcher_cc | 36 +-- ...er_geolocation_location_arbitrator_impl_cc | 8 +- ...derer_host_render_widget_host_view_aura_cc | 10 +- ...atch-content_browser_tracing_tracing_ui_cc | 12 - .../patch-content_content_browser_gypi | 19 +- .../patches/patch-content_content_common_gypi | 35 ++- .../patch-content_content_renderer_gypi | 8 +- .../patches/patch-content_gpu_gpu_main_cc | 18 +- ...-content_public_common_content_switches_cc | 8 +- ...h-content_public_common_content_switches_h | 8 +- ...tch-content_renderer_render_thread_impl_cc | 10 +- ...t_renderer_renderer_blink_platform_impl_cc | 12 +- www/chromium/patches/patch-dbus_property_cc | 29 ++ www/chromium/patches/patch-device_hid_hid_gyp | 8 +- ...patch-device_serial_serial_service_impl_cc | 8 +- .../patch-device_usb_usb_service_impl_cc | 48 +--- .../patch-device_usb_usb_service_impl_h | 27 ++ ...ervice_async_pixel_transfer_manager_egl_cc | 8 +- ...patch-gpu_config_gpu_info_collector_x11_cc | 15 +- ...atch-media_audio_audio_input_controller_cc | 8 +- www/chromium/patches/patch-media_media_gyp | 18 +- ...inux_video_capture_device_factory_linux_cc | 249 +++++++++++++++--- .../patches/patch-net_base_net_util_linux_cc | 72 +++-- ...tch-net_disk_cache_blockfile_disk_format_h | 8 +- .../patch-net_http_http_network_session_cc | 8 +- www/chromium/patches/patch-net_net_gypi | 8 +- .../patch-net_udp_udp_socket_libevent_cc | 12 +- www/chromium/patches/patch-pdf_pdf_gyp | 21 -- .../patches/patch-pdf_pdfium_pdfium_engine_cc | 48 ++++ .../patches/patch-remoting_remoting_host_gypi | 54 ++-- .../patch-skia_ext_SkMemory_new_handler_cpp | 12 + .../patches/patch-skia_skia_chrome_gypi | 10 +- ...Source_bindings_core_v8_V8ScriptRunner_cpp | 8 +- ...ch-third_party_WebKit_Source_core_core_gyp | 40 ++- ..._WebKit_Source_platform_blink_platform_gyp | 14 +- ...urce_platform_fonts_skia_FontCacheSkia_cpp | 27 +- ...t_Source_platform_heap_StackFrameDepth_cpp | 43 +++ ...ebKit_Source_platform_heap_ThreadState_cpp | 30 +-- ..._WebKit_Source_platform_heap_ThreadState_h | 8 +- ...d_party_WebKit_Source_web_PopupListBox_cpp | 8 +- ...atch-third_party_WebKit_Source_web_web_gyp | 12 +- ...mium_config_Chrome_openbsd_ia32_config_asm | 28 +- ...romium_config_Chrome_openbsd_ia32_config_h | 30 ++- ...omium_config_Chrome_openbsd_x64_config_asm | 28 +- ...hromium_config_Chrome_openbsd_x64_config_h | 30 ++- .../patch-third_party_libjingle_libjingle_gyp | 12 +- ..._fx_libopenjpeg_libopenjpeg20_opj_malloc_h | 12 + .../patch-third_party_pdfium_pdfium_gyp | 21 ++ .../patch-third_party_skia_gyp_ports_gyp | 10 +- .../patch-third_party_webrtc_base_base_gyp | 8 +- ...atch-third_party_webrtc_base_httpcommon_cc | 8 +- .../patch-third_party_webrtc_base_network_cc | 10 +- ...d_party_webrtc_base_thread_checker_impl_cc | 17 ++ ...patch-third_party_webrtc_build_common_gypi | 8 +- ...rtc_system_wrappers_source_thread_posix_cc | 70 ++--- ...atch-tools_gyp_pylib_gyp_generator_make_py | 8 +- ...tch-tools_gyp_pylib_gyp_generator_ninja_py | 12 +- .../patch-ui_app_list_app_list_constants_cc | 12 +- .../patch-ui_app_list_app_list_constants_h | 12 +- ...ch-ui_app_list_views_app_list_item_view_cc | 8 +- .../patch-ui_app_list_views_app_list_view_cc | 10 +- .../patch-ui_base_resource_resource_bundle_cc | 8 +- .../patches/patch-ui_base_ui_base_gyp | 8 +- .../patch-ui_base_webui_web_ui_util_cc | 8 +- ...nts_devices_x11_device_data_manager_x11_cc | 10 +- .../patches/patch-ui_gl_generate_bindings_py | 8 +- .../patch-ui_gl_gl_bindings_api_autogen_glx_h | 11 + .../patch-ui_gl_gl_bindings_autogen_glx_cc | 184 +++++++++++++ .../patch-ui_gl_gl_bindings_autogen_glx_h | 45 ++++ www/chromium/patches/patch-ui_gl_gl_gyp | 21 +- .../patch-ui_resources_ui_resources_grd | 8 +- .../patch-ui_views_bubble_bubble_delegate_cc | 8 +- ...h-ui_views_controls_button_label_button_cc | 10 +- ...h-ui_views_controls_textfield_textfield_cc | 16 +- www/chromium/patches/patch-ui_views_views_gyp | 17 +- .../patches/patch-v8_src_base_macros_h | 12 - ...tch-v8_src_base_platform_platform-posix_cc | 10 +- www/chromium/pkg/PLIST | 6 +- 141 files changed, 1580 insertions(+), 943 deletions(-) create mode 100644 www/chromium/patches/patch-base_process_memory_cc create mode 100644 www/chromium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc delete mode 100644 www/chromium/patches/patch-chrome_browser_ui_views_frame_desktop_browser_frame_aura_cc create mode 100644 www/chromium/patches/patch-components_audio_modem_modem_impl_cc rename www/chromium/patches/{patch-chrome_renderer_printing_print_web_view_helper_h => patch-components_printing_renderer_print_web_view_helper_h} (52%) delete mode 100644 www/chromium/patches/patch-content_browser_tracing_tracing_ui_cc create mode 100644 www/chromium/patches/patch-dbus_property_cc create mode 100644 www/chromium/patches/patch-device_usb_usb_service_impl_h delete mode 100644 www/chromium/patches/patch-pdf_pdf_gyp create mode 100644 www/chromium/patches/patch-pdf_pdfium_pdfium_engine_cc create mode 100644 www/chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp create mode 100644 www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp create mode 100644 www/chromium/patches/patch-third_party_pdfium_core_src_fxcodec_fx_libopenjpeg_libopenjpeg20_opj_malloc_h create mode 100644 www/chromium/patches/patch-third_party_pdfium_pdfium_gyp create mode 100644 www/chromium/patches/patch-third_party_webrtc_base_thread_checker_impl_cc create mode 100644 www/chromium/patches/patch-ui_gl_gl_bindings_api_autogen_glx_h create mode 100644 www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc create mode 100644 www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_h delete mode 100644 www/chromium/patches/patch-v8_src_base_macros_h diff --git a/www/chromium/Makefile b/www/chromium/Makefile index cdfdff92341..84d361a8ba8 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.209 2015/04/04 09:21:04 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.210 2015/04/27 16:38:25 robert Exp $ ONLY_FOR_ARCHS= i386 amd64 DPB_PROPERTIES= parallel COMMENT= Chromium browser -V= 41.0.2272.118 +V= 42.0.2311.90 DISTNAME= chromium-${V} -REVISION= 0 CATEGORIES= www @@ -121,6 +120,7 @@ GYP_DEFS= -Duse_system_bzip2=1 \ -Dwerror= \ -Dno_gc_sections=1 \ -Ddisable_fatal_linker_warnings=1 \ + -Dv8_use_external_startup_data=0 \ -DOS=openbsd # Note: these keys are for OpenBSD use ONLY. For your own distribution, diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 4f097d73a52..f0a10e77e4b 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,2 +1,2 @@ -SHA256 (chromium-41.0.2272.118.tar.xz) = wEPS7KQayqvU9waKXZohg12sLKdwXdhl03bIpzLsjDw= -SIZE (chromium-41.0.2272.118.tar.xz) = 301445804 +SHA256 (chromium-42.0.2311.90.tar.xz) = YLDrOMHD0MyZja5wtzM+U7cVz/KEfBZS4D0XIzANtMk= +SIZE (chromium-42.0.2311.90.tar.xz) = 306502344 diff --git a/www/chromium/patches/patch-base_atomicops_h b/www/chromium/patches/patch-base_atomicops_h index 3dc13f7174f..8608ab1c734 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.14 2015/01/22 11:16:40 robert Exp $ ---- base/atomicops.h.orig.port Wed Dec 3 03:13:19 2014 -+++ base/atomicops.h Sat Dec 6 11:34:24 2014 -@@ -62,7 +62,11 @@ typedef intptr_t Atomic64; +$OpenBSD: patch-base_atomicops_h,v 1.15 2015/04/27 16:38:25 robert Exp $ +--- base/atomicops.h.orig.port Wed Apr 15 00:18:48 2015 ++++ base/atomicops.h Wed Apr 15 08:32:49 2015 +@@ -66,7 +66,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-base_base_gypi b/www/chromium/patches/patch-base_base_gypi index 45f410948dd..148eb5fe1cb 100644 --- a/www/chromium/patches/patch-base_base_gypi +++ b/www/chromium/patches/patch-base_base_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_base_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $ ---- base/base.gypi.orig.port Tue Mar 10 23:41:39 2015 -+++ base/base.gypi Wed Mar 11 07:22:49 2015 -@@ -972,11 +972,17 @@ +$OpenBSD: patch-base_base_gypi,v 1.33 2015/04/27 16:38:25 robert Exp $ +--- base/base.gypi.orig.port Wed Apr 15 00:31:20 2015 ++++ base/base.gypi Wed Apr 15 08:32:50 2015 +@@ -990,11 +990,17 @@ 'process/memory_stubs.cc', ], 'sources/': [ diff --git a/www/chromium/patches/patch-base_message_loop_message_loop_cc b/www/chromium/patches/patch-base_message_loop_message_loop_cc index fdf99f8441c..11331f60bb3 100644 --- a/www/chromium/patches/patch-base_message_loop_message_loop_cc +++ b/www/chromium/patches/patch-base_message_loop_message_loop_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_message_loop_message_loop_cc,v 1.2 2015/03/18 19:26:29 robert Exp $ ---- base/message_loop/message_loop.cc.orig.port Tue Mar 10 23:41:39 2015 -+++ base/message_loop/message_loop.cc Wed Mar 11 07:22:49 2015 -@@ -212,7 +212,7 @@ scoped_ptr MessageLoop::CreateMessagePump +$OpenBSD: patch-base_message_loop_message_loop_cc,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- base/message_loop/message_loop.cc.orig.port Wed Apr 15 00:31:20 2015 ++++ base/message_loop/message_loop.cc Wed Apr 15 08:32:50 2015 +@@ -221,7 +221,7 @@ scoped_ptr MessageLoop::CreateMessagePump // TODO(rvargas): Get rid of the OS guards. #if defined(USE_GLIB) && !defined(OS_NACL) typedef MessagePumpGlib MessagePumpForUI; diff --git a/www/chromium/patches/patch-base_process_launch_h b/www/chromium/patches/patch-base_process_launch_h index 6908d1b5017..0a2dbf2a320 100644 --- a/www/chromium/patches/patch-base_process_launch_h +++ b/www/chromium/patches/patch-base_process_launch_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-base_process_launch_h,v 1.1 2014/10/13 06:49:19 robert Exp $ ---- base/process/launch.h.orig.port Sat Oct 11 16:35:37 2014 -+++ base/process/launch.h Sat Oct 11 16:35:45 2014 -@@ -113,7 +113,7 @@ struct BASE_EXPORT LaunchOptions { +$OpenBSD: patch-base_process_launch_h,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- base/process/launch.h.orig.port Wed Apr 15 00:31:20 2015 ++++ base/process/launch.h Wed Apr 15 08:32:50 2015 +@@ -131,7 +131,7 @@ struct BASE_EXPORT LaunchOptions { // will be the same as its pid. bool new_process_group; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // If non-zero, start the process using clone(), using flags as provided. - int clone_flags; - + // Unlike in clone, clone_flags may not contain a custom termination signal + // that is sent to the parent when the child dies. The termination signal will diff --git a/www/chromium/patches/patch-base_process_memory_cc b/www/chromium/patches/patch-base_process_memory_cc new file mode 100644 index 00000000000..f6ded470176 --- /dev/null +++ b/www/chromium/patches/patch-base_process_memory_cc @@ -0,0 +1,13 @@ +$OpenBSD: patch-base_process_memory_cc,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- base/process/memory.cc.orig.port Thu Apr 23 16:15:00 2015 ++++ base/process/memory.cc Thu Apr 23 16:15:41 2015 +@@ -27,4 +27,9 @@ bool UncheckedCalloc(size_t num_items, size_t size, vo + + #endif + ++bool UncheckedMalloc(size_t size, void** result) { ++ *result = malloc(size); ++ return *result != NULL; ++} ++ + } diff --git a/www/chromium/patches/patch-build_all_gyp b/www/chromium/patches/patch-build_all_gyp index 6dfdd2e4361..f02c60a0f3c 100644 --- a/www/chromium/patches/patch-build_all_gyp +++ b/www/chromium/patches/patch-build_all_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-build_all_gyp,v 1.22 2015/03/18 19:26:29 robert Exp $ ---- build/all.gyp.orig.port Tue Mar 10 23:41:39 2015 -+++ build/all.gyp Wed Mar 11 07:22:49 2015 -@@ -349,7 +349,6 @@ +$OpenBSD: patch-build_all_gyp,v 1.23 2015/04/27 16:38:25 robert Exp $ +--- build/all.gyp.orig.port Wed Apr 15 00:31:20 2015 ++++ build/all.gyp Wed Apr 15 08:32:50 2015 +@@ -340,7 +340,6 @@ '../media/media.gyp:media_unittests', '../mojo/mojo.gyp:mojo', '../ppapi/ppapi_internal.gyp:ppapi_unittests', diff --git a/www/chromium/patches/patch-build_common_gypi b/www/chromium/patches/patch-build_common_gypi index 639895f5c67..16dd42ac51f 100644 --- a/www/chromium/patches/patch-build_common_gypi +++ b/www/chromium/patches/patch-build_common_gypi @@ -1,6 +1,6 @@ -$OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $ ---- build/common.gypi.orig.port Tue Mar 10 23:41:39 2015 -+++ build/common.gypi Wed Mar 11 07:22:50 2015 +$OpenBSD: patch-build_common_gypi,v 1.33 2015/04/27 16:38:25 robert Exp $ +--- build/common.gypi.orig.port Wed Apr 15 00:31:20 2015 ++++ build/common.gypi Thu Apr 23 08:26:31 2015 @@ -94,7 +94,7 @@ 'conditions': [ @@ -10,7 +10,16 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $ 'use_ash%': 1, 'use_aura%': 1, }], -@@ -800,7 +800,7 @@ +@@ -694,7 +694,7 @@ + }], + + # DBus usage. +- ['OS=="linux" and embedded==0', { ++ ['(OS=="linux" or OS=="openbsd") and embedded==0', { + 'use_dbus%': 1, + }, { + 'use_dbus%': 0, +@@ -803,7 +803,7 @@ # Use GPU accelerated cross process image transport by default # on linux builds with the Aura window manager @@ -19,7 +28,7 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $ 'ui_compositor_image_transport%': 1, }, { 'ui_compositor_image_transport%': 0, -@@ -925,7 +925,7 @@ +@@ -928,7 +928,7 @@ # --help for more information. Meant to be overriden with GYP_DEFINES. # TODO(maruel): Remove the conditions as more configurations are # supported. @@ -28,7 +37,7 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $ 'test_isolation_mode%': 'check', }, { 'test_isolation_mode%': 'noop', -@@ -941,7 +941,7 @@ +@@ -944,7 +944,7 @@ }, { 'use_openmax_dl_fft%': 0, }], @@ -37,7 +46,7 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $ 'enable_mdns%' : 1, }], -@@ -3510,6 +3510,14 @@ +@@ -3488,6 +3488,14 @@ }, }, 'conditions': [ @@ -52,7 +61,7 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $ ['os_posix==1', { 'target_defaults': { 'ldflags': [ -@@ -4460,7 +4468,7 @@ +@@ -4474,7 +4482,7 @@ }], # FreeBSD-specific options; note that most FreeBSD options are set above, # with Linux. @@ -61,7 +70,7 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $ 'target_defaults': { 'ldflags': [ '-Wl,--no-keep-memory', -@@ -5696,8 +5704,8 @@ +@@ -5754,8 +5762,8 @@ ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' 'and OS!="win"', { 'make_global_settings': [ diff --git a/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc b/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc index 4eab9dfd51a..6631887b0dc 100644 --- a/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc +++ b/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 robert Exp $ ---- chrome/app/chrome_main_delegate.cc.orig.port Fri Mar 20 04:21:21 2015 -+++ chrome/app/chrome_main_delegate.cc Sat Mar 21 11:55:17 2015 -@@ -98,11 +98,11 @@ +$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.21 2015/04/27 16:38:25 robert Exp $ +--- chrome/app/chrome_main_delegate.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/app/chrome_main_delegate.cc Wed Apr 15 08:32:50 2015 +@@ -96,11 +96,11 @@ #include "ui/base/x/x11_util.h" #endif @@ -15,8 +15,8 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro #include "base/environment.h" #endif -@@ -133,7 +133,7 @@ base::LazyInstance - g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; +@@ -138,7 +138,7 @@ base::LazyInstance + g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; #endif -#if defined(OS_POSIX) @@ -24,7 +24,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro base::LazyInstance::Leaky g_chrome_crash_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -234,7 +234,7 @@ bool SubprocessNeedsResourceBundle(const std::string& +@@ -239,7 +239,7 @@ bool SubprocessNeedsResourceBundle(const std::string& // Mac needs them for the plugin process name. process_type == switches::kPluginProcess || #endif @@ -33,7 +33,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -288,7 +288,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -293,7 +293,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } #endif @@ -42,7 +42,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro void SIGTERMProfilingShutdown(int signal) { Profiling::Stop(); struct sigaction sigact; -@@ -322,7 +322,7 @@ void InitializeUserDataDir() { +@@ -327,7 +327,7 @@ void InitializeUserDataDir() { std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -51,7 +51,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -658,7 +658,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -639,7 +639,7 @@ void ChromeMainDelegate::PreSandboxStartup() { std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -60,16 +60,16 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -785,7 +785,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -764,7 +764,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + chrome::InitializePDF(); #endif - } -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -908,7 +908,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization( +@@ -891,7 +891,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization( #endif return process_type == switches::kRelauncherProcess; } diff --git a/www/chromium/patches/patch-chrome_app_chrome_main_delegate_h b/www/chromium/patches/patch-chrome_app_chrome_main_delegate_h index 2f55179e6c1..2e771d3ea37 100644 --- a/www/chromium/patches/patch-chrome_app_chrome_main_delegate_h +++ b/www/chromium/patches/patch-chrome_app_chrome_main_delegate_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.4 2015/01/22 11:16:40 robert Exp $ ---- chrome/app/chrome_main_delegate.h.orig.port Sat Dec 6 11:40:55 2014 -+++ chrome/app/chrome_main_delegate.h Sat Dec 6 11:41:05 2014 -@@ -37,7 +37,7 @@ class ChromeMainDelegate : public content::ContentMain +$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.5 2015/04/27 16:38:25 robert Exp $ +--- chrome/app/chrome_main_delegate.h.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/app/chrome_main_delegate.h Wed Apr 15 08:32:50 2015 +@@ -36,7 +36,7 @@ class ChromeMainDelegate : public content::ContentMain const std::string& process_type) override; bool ShouldSendMachPort(const std::string& process_type) override; bool DelaySandboxInitialization(const std::string& process_type) override; diff --git a/www/chromium/patches/patch-chrome_app_chromium_strings_grd b/www/chromium/patches/patch-chrome_app_chromium_strings_grd index 5eb5f379718..7fe29a641e6 100644 --- a/www/chromium/patches/patch-chrome_app_chromium_strings_grd +++ b/www/chromium/patches/patch-chrome_app_chromium_strings_grd @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.6 2015/01/22 11:16:40 robert Exp $ ---- chrome/app/chromium_strings.grd.orig.port Wed Dec 3 03:32:11 2014 -+++ chrome/app/chromium_strings.grd Sat Dec 6 11:34:24 2014 -@@ -1154,7 +1154,7 @@ Signing in anyway will merge Chromium information like +$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.7 2015/04/27 16:38:25 robert Exp $ +--- chrome/app/chromium_strings.grd.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/app/chromium_strings.grd Wed Apr 15 08:32:50 2015 +@@ -1121,7 +1121,7 @@ Signing in anyway will merge Chromium information like diff --git a/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd b/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd index 3c6145d00d6..14a5d47fb35 100644 --- a/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd +++ b/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.5 2015/01/22 11:16:40 robert Exp $ ---- chrome/app/google_chrome_strings.grd.orig.port Wed Dec 3 03:32:11 2014 -+++ chrome/app/google_chrome_strings.grd Sat Dec 6 11:34:25 2014 -@@ -1079,7 +1079,7 @@ Signing in anyway will merge Chrome information like b +$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- chrome/app/google_chrome_strings.grd.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/app/google_chrome_strings.grd Wed Apr 15 08:32:50 2015 +@@ -1044,7 +1044,7 @@ Signing in anyway will merge Chrome information like b diff --git a/www/chromium/patches/patch-chrome_app_theme_theme_resources_grd b/www/chromium/patches/patch-chrome_app_theme_theme_resources_grd index b322fa2cd24..14e15104e2a 100644 --- a/www/chromium/patches/patch-chrome_app_theme_theme_resources_grd +++ b/www/chromium/patches/patch-chrome_app_theme_theme_resources_grd @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_app_theme_theme_resources_grd,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- chrome/app/theme/theme_resources.grd.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/app/theme/theme_resources.grd Wed Mar 11 07:22:50 2015 -@@ -511,7 +511,7 @@ +$OpenBSD: patch-chrome_app_theme_theme_resources_grd,v 1.13 2015/04/27 16:38:25 robert Exp $ +--- chrome/app/theme/theme_resources.grd.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/app/theme/theme_resources.grd Wed Apr 15 08:32:50 2015 +@@ -518,7 +518,7 @@ diff --git a/www/chromium/patches/patch-chrome_browser_about_flags_cc b/www/chromium/patches/patch-chrome_browser_about_flags_cc index 5d71141f95a..d4da08522d2 100644 --- a/www/chromium/patches/patch-chrome_browser_about_flags_cc +++ b/www/chromium/patches/patch-chrome_browser_about_flags_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.16 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/about_flags.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/about_flags.cc Wed Mar 11 07:22:50 2015 -@@ -1426,7 +1426,7 @@ const Experiment kExperiments[] = { +$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.17 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/about_flags.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/about_flags.cc Wed Apr 15 08:32:50 2015 +@@ -1463,7 +1463,7 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kResetAppListInstallState) }, #if defined(ENABLE_APP_LIST) diff --git a/www/chromium/patches/patch-chrome_browser_browser_resources_grd b/www/chromium/patches/patch-chrome_browser_browser_resources_grd index 7ca56c45cb0..b0d127c8699 100644 --- a/www/chromium/patches/patch-chrome_browser_browser_resources_grd +++ b/www/chromium/patches/patch-chrome_browser_browser_resources_grd @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.17 2015/01/22 11:16:40 robert Exp $ ---- chrome/browser/browser_resources.grd.orig.port Wed Dec 3 03:32:11 2014 -+++ chrome/browser/browser_resources.grd Sat Dec 6 11:34:25 2014 -@@ -241,7 +241,7 @@ +$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.18 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/browser_resources.grd.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/browser_resources.grd Wed Apr 15 08:32:50 2015 +@@ -229,7 +229,7 @@ diff --git a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc index ac456d01fca..13efccefaff 100644 --- a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc +++ b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.17 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/chrome_content_browser_client.cc.orig.port Wed Mar 11 07:29:41 2015 -+++ chrome/browser/chrome_content_browser_client.cc Wed Mar 11 07:30:28 2015 -@@ -167,7 +167,7 @@ - #include "chrome/browser/chrome_browser_main_posix.h" +$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.18 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/chrome_content_browser_client.cc.orig.port Wed Apr 15 09:22:59 2015 ++++ chrome/browser/chrome_content_browser_client.cc Wed Apr 15 09:23:54 2015 +@@ -171,7 +171,7 @@ + #include "chrome/browser/media/protected_media_identifier_permission_context_factory.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.17 2015/03/1 #include "base/debug/leak_annotations.h" #include "components/crash/app/breakpad_linux.h" #include "components/crash/browser/crash_handler_host_linux.h" -@@ -443,7 +443,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer +@@ -446,7 +446,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer return false; } @@ -19,16 +19,16 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.17 2015/03/1 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -1232,7 +1232,7 @@ bool IsAutoReloadVisibleOnlyEnabled() { - void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( - base::CommandLine* command_line, - int child_process_id) { --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) +@@ -1295,7 +1295,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + command_line->AppendSwitchASCII(switches::kMetricsClientID, + client_info->client_id); + } +-#elif defined(OS_POSIX) ++#elif defined(OS_POSIX) && !defined(OS_BSD) if (breakpad::IsCrashReporterEnabled()) { scoped_ptr client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -2434,7 +2434,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -2409,7 +2409,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } diff --git a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h index 255c0720b6a..5138a2daee0 100644 --- a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h +++ b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.11 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/chrome_content_browser_client.h.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/chrome_content_browser_client.h Wed Mar 11 07:22:50 2015 -@@ -258,7 +258,7 @@ class ChromeContentBrowserClient : public content::Con - net::CookieStore* OverrideCookieStoreForRenderProcess( - int render_process_id) override; +$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.12 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/chrome_content_browser_client.h.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/chrome_content_browser_client.h Wed Apr 15 08:32:50 2015 +@@ -266,7 +266,7 @@ class ChromeContentBrowserClient : public content::Con + content::RenderFrameHost* render_frame_host, + blink::WebPageVisibilityState* visibility_state) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) diff --git a/www/chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc b/www/chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc index 84c9cfcf7ca..4a48a735a1c 100644 --- a/www/chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc +++ b/www/chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.1 2015/02/15 19:51:28 robert Exp $ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port Sun Feb 15 11:06:29 2015 -+++ chrome/browser/download/chrome_download_manager_delegate.cc Sun Feb 15 11:06:44 2015 -@@ -719,7 +719,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/download/chrome_download_manager_delegate.cc Wed Apr 15 08:32:50 2015 +@@ -720,7 +720,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/chromium/patches/patch-chrome_browser_download_download_shelf_context_menu_cc b/www/chromium/patches/patch-chrome_browser_download_download_shelf_context_menu_cc index bf52c3adcda..20793f7952b 100644 --- a/www/chromium/patches/patch-chrome_browser_download_download_shelf_context_menu_cc +++ b/www/chromium/patches/patch-chrome_browser_download_download_shelf_context_menu_cc @@ -1,28 +1,28 @@ -$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.1 2015/01/22 11:16:40 robert Exp $ ---- chrome/browser/download/download_shelf_context_menu.cc.orig.port Sat Dec 6 16:55:11 2014 -+++ chrome/browser/download/download_shelf_context_menu.cc Sat Dec 6 16:56:00 2014 -@@ -122,7 +122,7 @@ bool DownloadShelfContextMenu::IsCommandIdChecked(int - return download_item_->GetOpenWhenComplete() || +$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/download/download_shelf_context_menu.cc.orig.port Wed Apr 15 09:23:59 2015 ++++ chrome/browser/download/download_shelf_context_menu.cc Wed Apr 15 09:24:37 2015 +@@ -123,7 +123,7 @@ bool DownloadShelfContextMenu::IsCommandIdChecked(int download_crx_util::IsExtensionDownload(*download_item_); case ALWAYS_OPEN_TYPE: --#if defined(OS_WIN) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - (defined(OS_MACOSX) && !defined(OS_IOS)) + #if defined(OS_WIN) || defined(OS_LINUX) || \ +- (defined(OS_MACOSX) && !defined(OS_IOS)) ++ (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD) if (CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( -@@ -162,7 +162,7 @@ void DownloadShelfContextMenu::ExecuteCommand(int comm - bool is_checked = IsCommandIdChecked(ALWAYS_OPEN_TYPE); + download_item_->GetBrowserContext()); +@@ -163,7 +163,7 @@ void DownloadShelfContextMenu::ExecuteCommand(int comm DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( download_item_->GetBrowserContext()); --#if defined(OS_WIN) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - (defined(OS_MACOSX) && !defined(OS_IOS)) + #if defined(OS_WIN) || defined(OS_LINUX) || \ +- (defined(OS_MACOSX) && !defined(OS_IOS)) ++ (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD) if (CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); -@@ -390,14 +390,14 @@ int DownloadShelfContextMenu::GetAlwaysOpenStringId() - #if defined(OS_WIN) - if (CanOpenPdfInSystemViewer()) - return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER; + DownloadItemModel(download_item_).SetShouldPreferOpeningInBrowser( +@@ -392,14 +392,14 @@ int DownloadShelfContextMenu::GetAlwaysOpenStringId() + return IsAdobeReaderDefaultPDFViewer() + ? IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER + : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; -#elif defined(OS_MACOSX) || defined(OS_LINUX) +#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) if (CanOpenPdfInSystemViewer()) @@ -36,7 +36,7 @@ $OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.1 201 bool DownloadShelfContextMenu::IsDownloadPdf() const { base::FilePath path = download_item_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -409,7 +409,7 @@ bool DownloadShelfContextMenu::CanOpenPdfInSystemViewe +@@ -411,7 +411,7 @@ bool DownloadShelfContextMenu::CanOpenPdfInSystemViewe return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date_ : true); diff --git a/www/chromium/patches/patch-chrome_browser_first_run_upgrade_util_linux_cc b/www/chromium/patches/patch-chrome_browser_first_run_upgrade_util_linux_cc index d17f2985bcf..4bd13676ef9 100644 --- a/www/chromium/patches/patch-chrome_browser_first_run_upgrade_util_linux_cc +++ b/www/chromium/patches/patch-chrome_browser_first_run_upgrade_util_linux_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_first_run_upgrade_util_linux_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/first_run/upgrade_util_linux.cc.orig.port Wed Mar 11 07:30:40 2015 -+++ chrome/browser/first_run/upgrade_util_linux.cc Wed Mar 11 07:31:09 2015 +$OpenBSD: patch-chrome_browser_first_run_upgrade_util_linux_cc,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/first_run/upgrade_util_linux.cc.orig.port Wed Apr 15 09:24:43 2015 ++++ chrome/browser/first_run/upgrade_util_linux.cc Wed Apr 15 09:25:11 2015 @@ -22,10 +22,15 @@ double saved_last_modified_time_of_exe = 0; namespace upgrade_util { @@ -9,7 +9,7 @@ $OpenBSD: patch-chrome_browser_first_run_upgrade_util_linux_cc,v 1.3 2015/03/18 base::LaunchOptions options; // Don't set NO_NEW_PRIVS on the relaunched browser process. options.allow_new_privs = true; - return base::LaunchProcess(command_line, options, NULL); + return base::LaunchProcess(command_line, options).IsValid(); +#else + NOTIMPLEMENTED(); + return false; diff --git a/www/chromium/patches/patch-chrome_browser_memory_details_cc b/www/chromium/patches/patch-chrome_browser_memory_details_cc index 756835008cf..ad8c24e9204 100644 --- a/www/chromium/patches/patch-chrome_browser_memory_details_cc +++ b/www/chromium/patches/patch-chrome_browser_memory_details_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.25 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/memory_details.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/memory_details.cc Wed Mar 11 07:22:50 2015 -@@ -27,7 +27,7 @@ +$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.26 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/memory_details.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/memory_details.cc Wed Apr 15 08:32:50 2015 +@@ -30,7 +30,7 @@ #include "content/public/common/content_constants.h" #include "ui/base/l10n/l10n_util.h" @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.25 2015/03/18 19:26:29 robe #include "content/public/browser/zygote_host_linux.h" #endif -@@ -247,7 +247,7 @@ void MemoryDetails::CollectChildInfoOnIOThread() { +@@ -209,7 +209,7 @@ void MemoryDetails::CollectChildInfoOnIOThread(Collect void MemoryDetails::CollectChildInfoOnUIThread() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.25 2015/03/18 19:26:29 robe const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid(); #endif -@@ -389,7 +389,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -351,7 +351,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { } } diff --git a/www/chromium/patches/patch-chrome_browser_net_async_dns_field_trial_cc b/www/chromium/patches/patch-chrome_browser_net_async_dns_field_trial_cc index 5d1a5b1a682..ff2de8eecb8 100644 --- a/www/chromium/patches/patch-chrome_browser_net_async_dns_field_trial_cc +++ b/www/chromium/patches/patch-chrome_browser_net_async_dns_field_trial_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_net_async_dns_field_trial_cc,v 1.1 2014/07/20 17:22:33 robert Exp $ ---- chrome/browser/net/async_dns_field_trial.cc.orig.port Sat Jul 19 11:17:49 2014 -+++ chrome/browser/net/async_dns_field_trial.cc Sat Jul 19 11:29:34 2014 -@@ -16,7 +16,7 @@ bool ConfigureAsyncDnsFieldTrial() { +$OpenBSD: patch-chrome_browser_net_async_dns_field_trial_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/net/async_dns_field_trial.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/net/async_dns_field_trial.cc Wed Apr 15 08:32:50 2015 +@@ -67,7 +67,7 @@ bool ConfigureAsyncDnsFieldTrial() { return false; #endif diff --git a/www/chromium/patches/patch-chrome_browser_notifications_message_center_notification_manager_cc b/www/chromium/patches/patch-chrome_browser_notifications_message_center_notification_manager_cc index 6d3f3d9c5c4..e3ec5f2312e 100644 --- a/www/chromium/patches/patch-chrome_browser_notifications_message_center_notification_manager_cc +++ b/www/chromium/patches/patch-chrome_browser_notifications_message_center_notification_manager_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_notifications_message_center_notification_manager_cc,v 1.1 2015/01/22 11:16:40 robert Exp $ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig.port Sat Dec 27 12:59:28 2014 -+++ chrome/browser/notifications/message_center_notification_manager.cc Sat Dec 27 13:04:12 2014 -@@ -83,7 +83,7 @@ MessageCenterNotificationManager::MessageCenterNotific +$OpenBSD: patch-chrome_browser_notifications_message_center_notification_manager_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/notifications/message_center_notification_manager.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/notifications/message_center_notification_manager.cc Wed Apr 15 08:32:50 2015 +@@ -80,7 +80,7 @@ MessageCenterNotificationManager::MessageCenterNotific #endif blockers_.push_back(new FullscreenNotificationBlocker(message_center)); diff --git a/www/chromium/patches/patch-chrome_browser_platform_util_linux_cc b/www/chromium/patches/patch-chrome_browser_platform_util_linux_cc index 86fe57bc8e2..a559da488f8 100644 --- a/www/chromium/patches/patch-chrome_browser_platform_util_linux_cc +++ b/www/chromium/patches/patch-chrome_browser_platform_util_linux_cc @@ -1,10 +1,10 @@ -$OpenBSD: patch-chrome_browser_platform_util_linux_cc,v 1.1 2014/07/20 17:22:33 robert Exp $ ---- chrome/browser/platform_util_linux.cc.orig.port Fri Jul 18 03:49:32 2014 -+++ chrome/browser/platform_util_linux.cc Fri Jul 18 03:49:55 2014 -@@ -22,7 +22,9 @@ void XDGUtil(const std::string& util, const std::strin - argv.push_back(arg); +$OpenBSD: patch-chrome_browser_platform_util_linux_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/platform_util_linux.cc.orig.port Wed Apr 15 09:25:47 2015 ++++ chrome/browser/platform_util_linux.cc Wed Apr 15 09:25:58 2015 +@@ -28,7 +28,9 @@ void XDGUtil(const std::string& util, base::LaunchOptions options; + options.current_directory = working_directory; +#if !defined(OS_BSD) options.allow_new_privs = true; +#endif diff --git a/www/chromium/patches/patch-chrome_browser_renderer_preferences_util_cc b/www/chromium/patches/patch-chrome_browser_renderer_preferences_util_cc index c66b9b3f918..9ca8cabafb1 100644 --- a/www/chromium/patches/patch-chrome_browser_renderer_preferences_util_cc +++ b/www/chromium/patches/patch-chrome_browser_renderer_preferences_util_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.8 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/renderer_preferences_util.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/renderer_preferences_util.cc Wed Mar 11 07:22:50 2015 +$OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.9 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/renderer_preferences_util.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/renderer_preferences_util.cc Wed Apr 15 08:32:50 2015 @@ -13,7 +13,7 @@ #include "content/public/common/renderer_preferences.h" #include "third_party/skia/include/core/SkColor.h" @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.8 2015/03/18 19: #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -76,7 +76,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -84,7 +84,7 @@ void UpdateFromSystemSettings(content::RendererPrefere prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0; #endif @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.8 2015/03/18 19: views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -98,7 +98,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -106,7 +106,7 @@ void UpdateFromSystemSettings(content::RendererPrefere } #endif diff --git a/www/chromium/patches/patch-chrome_browser_ssl_ssl_blocking_page_cc b/www/chromium/patches/patch-chrome_browser_ssl_ssl_blocking_page_cc index a39b97620ac..b76375ed5c6 100644 --- a/www/chromium/patches/patch-chrome_browser_ssl_ssl_blocking_page_cc +++ b/www/chromium/patches/patch-chrome_browser_ssl_ssl_blocking_page_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ssl_ssl_blocking_page_cc,v 1.4 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ssl/ssl_blocking_page.cc.orig.port Wed Mar 11 07:31:17 2015 -+++ chrome/browser/ssl/ssl_blocking_page.cc Wed Mar 11 07:31:39 2015 -@@ -236,7 +236,7 @@ void LaunchDateAndTimeSettings() { +$OpenBSD: patch-chrome_browser_ssl_ssl_blocking_page_cc,v 1.5 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ssl/ssl_blocking_page.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/ssl/ssl_blocking_page.cc Wed Apr 15 08:32:50 2015 +@@ -132,7 +132,7 @@ void LaunchDateAndTimeSettings() { // iOS does not have a way to launch the date and time settings. NOTREACHED(); diff --git a/www/chromium/patches/patch-chrome_browser_sync_profile_sync_components_factory_impl_cc b/www/chromium/patches/patch-chrome_browser_sync_profile_sync_components_factory_impl_cc index 8eb6744a356..ee3e72f7542 100644 --- a/www/chromium/patches/patch-chrome_browser_sync_profile_sync_components_factory_impl_cc +++ b/www/chromium/patches/patch-chrome_browser_sync_profile_sync_components_factory_impl_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_sync_profile_sync_components_factory_impl_cc,v 1.11 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/sync/profile_sync_components_factory_impl.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/sync/profile_sync_components_factory_impl.cc Wed Mar 11 07:22:50 2015 -@@ -382,7 +382,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktop +$OpenBSD: patch-chrome_browser_sync_profile_sync_components_factory_impl_cc,v 1.12 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/sync/profile_sync_components_factory_impl.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/sync/profile_sync_components_factory_impl.cc Wed Apr 15 08:32:50 2015 +@@ -396,7 +396,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktop } #endif diff --git a/www/chromium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc b/www/chromium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc new file mode 100644 index 00000000000..dffcaba4d66 --- /dev/null +++ b/www/chromium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/tracing/crash_service_uploader.cc.orig.port Wed Apr 15 15:38:34 2015 ++++ chrome/browser/tracing/crash_service_uploader.cc Wed Apr 15 15:38:45 2015 +@@ -127,6 +127,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread( + const char product[] = "Chrome_Android"; + #elif defined(OS_CHROMEOS) + const char product[] = "Chrome_ChromeOS"; ++#elif defined(OS_OPENBSD) ++ const char product[] = "Chrome_OpenBSD"; + #else + #error Platform not supported. + #endif diff --git a/www/chromium/patches/patch-chrome_browser_ui_ash_system_tray_delegate_common_cc b/www/chromium/patches/patch-chrome_browser_ui_ash_system_tray_delegate_common_cc index 45b96b343c3..09e2e85f626 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_ash_system_tray_delegate_common_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_ash_system_tray_delegate_common_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_ash_system_tray_delegate_common_cc,v 1.2 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/ash/system_tray_delegate_common.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/ash/system_tray_delegate_common.cc Wed Mar 11 07:22:50 2015 -@@ -118,7 +118,7 @@ void SystemTrayDelegateCommon::ShowDisplaySettings() { +$OpenBSD: patch-chrome_browser_ui_ash_system_tray_delegate_common_cc,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/ash/system_tray_delegate_common.cc.orig.port Wed Apr 15 00:18:50 2015 ++++ chrome/browser/ui/ash/system_tray_delegate_common.cc Wed Apr 15 08:32:50 2015 +@@ -79,7 +79,7 @@ base::HourClockType SystemTrayDelegateCommon::GetHourC } void SystemTrayDelegateCommon::ShowChromeSlow() { diff --git a/www/chromium/patches/patch-chrome_browser_ui_browser_cc b/www/chromium/patches/patch-chrome_browser_ui_browser_cc index 5ddcd45fa98..cdd14884cd6 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_browser_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_browser_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.7 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/browser.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/browser.cc Wed Mar 11 07:22:50 2015 -@@ -1288,7 +1288,7 @@ void Browser::OnWindowDidShow() { +$OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.8 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/browser.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/ui/browser.cc Wed Apr 15 08:32:50 2015 +@@ -1284,7 +1284,7 @@ void Browser::OnWindowDidShow() { window_has_shown_ = true; // CurrentProcessInfo::CreationTime() is missing on some platforms. diff --git a/www/chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc b/www/chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc index 1286ceafc4f..4d673753514 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.6 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/browser_command_controller.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/browser_command_controller.cc Wed Mar 11 07:22:50 2015 -@@ -68,7 +68,7 @@ - #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" +$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.7 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/browser_command_controller.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/ui/browser_command_controller.cc Wed Apr 15 08:32:50 2015 +@@ -69,7 +69,7 @@ + #include "chrome/browser/ui/browser_commands_chromeos.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.6 2015/03/18 #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -280,7 +280,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -281,7 +281,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) return true; @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.6 2015/03/18 // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -473,7 +473,7 @@ void BrowserCommandController::ExecuteCommandWithDispo +@@ -474,7 +474,7 @@ void BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.6 2015/03/18 case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = browser_->profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -897,7 +897,7 @@ void BrowserCommandController::InitCommandState() { +@@ -903,7 +903,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif diff --git a/www/chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc b/www/chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc index 972be76a9d9..842626f25c6 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.6 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/startup/startup_browser_creator.cc Wed Mar 11 07:22:50 2015 -@@ -581,8 +581,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.7 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/ui/startup/startup_browser_creator.cc Wed Apr 15 08:32:50 2015 +@@ -577,8 +577,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( } #endif // OS_CHROMEOS diff --git a/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc b/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc index ccbc302008d..5ea2cbf72c7 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.10 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/toolbar/wrench_menu_model.cc Wed Mar 11 07:22:50 2015 -@@ -747,7 +747,7 @@ bool WrenchMenuModel::IsCommandIdVisible(int command_i +$OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.11 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/ui/toolbar/wrench_menu_model.cc Wed Apr 15 08:32:50 2015 +@@ -762,7 +762,7 @@ bool WrenchMenuModel::IsCommandIdVisible(int command_i #endif case IDC_UPGRADE_DIALOG: return UpgradeDetector::GetInstance()->notify_upgrade(); diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc b/www/chromium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc index 2c5aa9c267c..9353f9fbecc 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc,v 1.6 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc Wed Mar 11 07:22:50 2015 +$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc,v 1.7 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc Wed Apr 15 08:32:50 2015 @@ -30,7 +30,7 @@ #include "ui/wm/core/easy_resize_window_targeter.h" #include "ui/wm/core/shadow_types.h" @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc,v #include "chrome/browser/shell_integration_linux.h" #endif -@@ -223,7 +223,7 @@ void ChromeNativeAppWindowViews::InitializeDefaultWind +@@ -230,7 +230,7 @@ void ChromeNativeAppWindowViews::InitializeDefaultWind init_params.visible_on_all_workspaces = create_params.visible_on_all_workspaces; diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc b/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc index a4def3fcc02..90216be652f 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.6 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/views/chrome_views_delegate.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/views/chrome_views_delegate.cc Wed Mar 11 07:22:50 2015 -@@ -44,7 +44,7 @@ +$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.7 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/views/chrome_views_delegate.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/ui/views/chrome_views_delegate.cc Wed Apr 15 08:32:50 2015 +@@ -43,7 +43,7 @@ #include "ui/views/widget/native_widget_aura.h" #endif @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.6 2015/03/1 #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -238,7 +238,7 @@ bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeW +@@ -224,7 +224,7 @@ bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeW return chrome::IsNativeViewInAsh(window); } @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.6 2015/03/1 gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); -@@ -377,7 +377,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit( +@@ -363,7 +363,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit( #endif } diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h b/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h index d12d78225ae..f35593ddf47 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h +++ b/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.5 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/views/chrome_views_delegate.h Wed Mar 11 07:22:50 2015 -@@ -36,7 +36,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat +$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/views/chrome_views_delegate.h.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/ui/views/chrome_views_delegate.h Wed Apr 15 08:32:50 2015 +@@ -31,7 +31,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat virtual HICON GetDefaultWindowIcon() const override; virtual HICON GetSmallWindowIcon() const override; virtual bool IsWindowInMetro(gfx::NativeWindow window) const override; @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.5 2015/03/18 gfx::ImageSkia* GetDefaultWindowIcon() const override; #endif -@@ -49,7 +49,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat void OnBeforeWidgetInit( views::Widget::InitParams* params, views::internal::NativeWidgetDelegate* delegate) override; diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_frame_desktop_browser_frame_aura_cc b/www/chromium/patches/patch-chrome_browser_ui_views_frame_desktop_browser_frame_aura_cc deleted file mode 100644 index f458092e56d..00000000000 --- a/www/chromium/patches/patch-chrome_browser_ui_views_frame_desktop_browser_frame_aura_cc +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_views_frame_desktop_browser_frame_aura_cc,v 1.1 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc.orig.port Wed Mar 11 07:33:50 2015 -+++ chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc Wed Mar 11 07:34:09 2015 -@@ -21,7 +21,7 @@ - #include "ui/views/view.h" - #include "ui/wm/core/visibility_controller.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "chrome/browser/shell_integration_linux.h" - #endif - -@@ -85,7 +85,7 @@ views::Widget::InitParams DesktopBrowserFrameAura::Get - views::Widget::InitParams params; - params.native_widget = this; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Set up a custom WM_CLASS for some sorts of window types. This allows - // task switchers in X11 environments to distinguish between main browser - // windows and e.g app windows. diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc b/www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc index b25e2b488d8..c75f8c63697 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.9 2015/01/22 11:16:41 robert Exp $ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig.port Wed Dec 3 03:32:11 2014 -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc Sat Dec 6 11:34:25 2014 +$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.10 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig.port Wed Apr 15 09:27:17 2015 ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc Wed Apr 15 09:27:53 2015 @@ -54,7 +54,7 @@ #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h" #endif @@ -15,11 +15,11 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.9 const int kIconMinimumSize = 16; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) // The number of pixels to move the frame background image upwards when using // the GTK+ theme and the titlebar is condensed. const int kGTKThemeCondensedFrameTopInset = 15; -@@ -335,7 +335,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt +@@ -341,7 +341,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, const gfx::Point& point) { @@ -28,21 +28,12 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.9 views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), views::MenuRunner::HAS_MNEMONICS); ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), -@@ -588,7 +588,7 @@ gfx::Rect OpaqueBrowserFrameView::IconBounds() const { - } - - bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - // Do not show the custom title bar if the system title bar option is enabled. - if (!frame()->UseCustomFrame()) - return false; -@@ -633,7 +633,7 @@ void OpaqueBrowserFrameView::PaintMaximizedFrameBorder +@@ -637,7 +637,7 @@ void OpaqueBrowserFrameView::PaintMaximizedFrameBorder frame_background_->set_theme_image(GetFrameImage()); frame_background_->set_theme_overlay_image(GetFrameOverlayImage()); frame_background_->set_top_area_height(GetTopAreaHeight()); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) // The window manager typically shows a gradient in the native title bar (when // the system title bar pref is set, or when maximized on Ubuntu). Hide the // gradient in the tab strip (by shifting it up vertically) to avoid a diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc b/www/chromium/patches/patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc index 0bd5da2ce2e..8bb217eb19f 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc,v 1.1 2014/07/20 17:22:34 robert Exp $ ---- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig.port Sat Jul 19 03:27:25 2014 -+++ chrome/browser/ui/views/message_center/message_center_frame_view.cc Sat Jul 19 03:30:52 2014 -@@ -12,7 +12,7 @@ +$OpenBSD: patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig.port Wed Apr 15 00:31:21 2015 ++++ chrome/browser/ui/views/message_center/message_center_frame_view.cc Wed Apr 15 08:32:50 2015 +@@ -13,7 +13,7 @@ namespace message_center { MessageCenterFrameView::MessageCenterFrameView() { diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc b/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc index 85c8e6c4725..5849e9c73bf 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_cc,v 1.9 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/views/tabs/tab_strip.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/views/tabs/tab_strip.cc Wed Mar 11 07:22:50 2015 -@@ -282,7 +282,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views: +$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_cc,v 1.10 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/views/tabs/tab_strip.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/browser/ui/views/tabs/tab_strip.cc Wed Apr 15 08:32:50 2015 +@@ -284,7 +284,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views: : views::ImageButton(listener), tab_strip_(tab_strip), destroyed_(NULL) { 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 de1841055e3..bef2a8916b8 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,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.25 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/webui/about_ui.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/webui/about_ui.cc Wed Mar 11 07:22:50 2015 -@@ -65,7 +65,7 @@ +$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.26 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/webui/about_ui.cc.orig.port Wed Apr 15 00:18:50 2015 ++++ chrome/browser/ui/webui/about_ui.cc Sat Apr 25 16:24:39 2015 +@@ -64,7 +64,7 @@ #include "chrome/browser/ui/webui/theme_source.h" #endif @@ -10,15 +10,15 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.25 2015/03/18 19:26:29 r #include "content/public/browser/zygote_host_linux.h" #include "content/public/common/sandbox_linux.h" #endif -@@ -844,6 +844,7 @@ std::string AboutLinuxProxyConfig() { +@@ -675,6 +675,7 @@ std::string AboutLinuxProxyConfig() { return data; } -+#if !defined(OS_OPENBSD) - void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, - bool good) { ++#if !defined(OS_BSD) + void AboutSandboxRow(std::string* data, int name_id, bool good) { data->append(""); -@@ -918,6 +919,7 @@ std::string AboutSandbox() { + data->append(l10n_util::GetStringUTF8(name_id)); +@@ -742,6 +743,7 @@ std::string AboutSandbox() { return data; } #endif @@ -26,7 +26,16 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.25 2015/03/18 19:26:29 r // AboutMemoryHandler ---------------------------------------------------------- -@@ -1103,7 +1105,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -914,7 +916,7 @@ void AboutUIHTMLSource::StartDataRequest( + } else if (source_name_ == chrome::kChromeUIDNSHost) { + AboutDnsHandler::Start(profile(), callback); + return; +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { + response = AboutLinuxProxyConfig(); + #endif +@@ -928,7 +930,7 @@ void AboutUIHTMLSource::StartDataRequest( ChromeOSCreditsHandler::Start(path, callback); return; #endif diff --git a/www/chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc b/www/chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc index 212ed6cb23e..a2ef61e5eb0 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.2 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig.port Wed Mar 11 07:34:47 2015 -+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc Wed Mar 11 07:35:05 2015 -@@ -481,7 +481,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc Wed Apr 15 08:32:50 2015 +@@ -480,7 +480,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host() == chrome::kChromeUINaClHost) return &NewWebUI; #endif diff --git a/www/chromium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc b/www/chromium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc index b8e739e7c1a..9082c9a705e 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc @@ -1,10 +1,10 @@ -$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/ui/webui/options/browser_options_handler.cc Wed Mar 11 07:22:50 2015 -@@ -368,7 +368,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D - { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, - { "translateEnableTranslate", - IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, +$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.13 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig.port Wed Apr 15 09:29:04 2015 ++++ chrome/browser/ui/webui/options/browser_options_handler.cc Wed Apr 15 09:29:29 2015 +@@ -470,7 +470,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D + { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, + #endif // defined(OS_CHROMEOS) + -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.1 web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1372,7 +1372,7 @@ void BrowserOptionsHandler::ObserveThemeChanged() { +@@ -1384,7 +1384,7 @@ void BrowserOptionsHandler::ObserveThemeChanged() { ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_system_theme = false; @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.1 bool profile_is_supervised = profile->IsSupervised(); is_system_theme = theme_service->UsingSystemTheme(); base::FundamentalValue native_theme_enabled(!is_system_theme && -@@ -1394,7 +1394,7 @@ void BrowserOptionsHandler::ThemesReset(const base::Li +@@ -1406,7 +1406,7 @@ void BrowserOptionsHandler::ThemesReset(const base::Li ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } diff --git a/www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc b/www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc index 853deb6cd83..26b4fef498f 100644 --- a/www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc +++ b/www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/web_applications/web_app.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/web_applications/web_app.cc Wed Mar 11 07:22:50 2015 +$OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.13 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/web_applications/web_app.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/browser/web_applications/web_app.cc Wed Apr 15 08:32:50 2015 @@ -54,7 +54,7 @@ namespace { #if defined(OS_MACOSX) const int kDesiredSizes[] = {16, 32, 128, 256, 512}; @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.12 2015/03/18 19: // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512}; -@@ -471,7 +471,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info, +@@ -480,7 +480,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info, } #endif diff --git a/www/chromium/patches/patch-chrome_browser_web_applications_web_app_h b/www/chromium/patches/patch-chrome_browser_web_applications_web_app_h index 3f13e933fe4..35014a9b5cd 100644 --- a/www/chromium/patches/patch-chrome_browser_web_applications_web_app_h +++ b/www/chromium/patches/patch-chrome_browser_web_applications_web_app_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_web_applications_web_app_h,v 1.5 2015/03/18 19:26:29 robert Exp $ ---- chrome/browser/web_applications/web_app.h.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/browser/web_applications/web_app.h Wed Mar 11 07:22:50 2015 -@@ -213,7 +213,7 @@ typedef std::vector Icon +$OpenBSD: patch-chrome_browser_web_applications_web_app_h,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- chrome/browser/web_applications/web_app.h.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/browser/web_applications/web_app.h Wed Apr 15 08:32:50 2015 +@@ -214,7 +214,7 @@ typedef std::vector Icon void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); #endif diff --git a/www/chromium/patches/patch-chrome_chrome_browser_extensions_gypi b/www/chromium/patches/patch-chrome_chrome_browser_extensions_gypi index 77e2ca97c1d..fd2415cd1e6 100644 --- a/www/chromium/patches/patch-chrome_chrome_browser_extensions_gypi +++ b/www/chromium/patches/patch-chrome_chrome_browser_extensions_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_chrome_browser_extensions_gypi,v 1.17 2015/03/18 19:26:29 robert Exp $ ---- chrome/chrome_browser_extensions.gypi.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/chrome_browser_extensions.gypi Wed Mar 11 07:22:50 2015 -@@ -971,6 +971,11 @@ +$OpenBSD: patch-chrome_chrome_browser_extensions_gypi,v 1.18 2015/04/27 16:38:25 robert Exp $ +--- chrome/chrome_browser_extensions.gypi.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/chrome_browser_extensions.gypi Wed Apr 15 08:32:50 2015 +@@ -917,6 +917,11 @@ '<@(chrome_browser_extensions_enabled_sources)', ], 'conditions': [ @@ -13,9 +13,9 @@ $OpenBSD: patch-chrome_chrome_browser_extensions_gypi,v 1.17 2015/03/18 19:26:29 ['chromeos==1', { 'include_dirs': [ '../third_party/libjingle/source', -@@ -1009,7 +1014,7 @@ - }, { - 'sources': ['<@(chrome_browser_extensions_non_athena_sources)'], +@@ -950,7 +955,7 @@ + '../ui/keyboard/keyboard.gyp:keyboard_resources', + ], }], - ['OS=="linux"', { + ['OS=="linux" or OS=="openbsd"', { diff --git a/www/chromium/patches/patch-chrome_chrome_browser_gypi b/www/chromium/patches/patch-chrome_chrome_browser_gypi index fb97781f0ac..1cd99d6d2b9 100644 --- a/www/chromium/patches/patch-chrome_chrome_browser_gypi +++ b/www/chromium/patches/patch-chrome_chrome_browser_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.34 2015/03/18 19:26:29 robert Exp $ ---- chrome/chrome_browser.gypi.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/chrome_browser.gypi Wed Mar 11 07:22:50 2015 -@@ -3245,7 +3245,7 @@ +$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.35 2015/04/27 16:38:25 robert Exp $ +--- chrome/chrome_browser.gypi.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/chrome_browser.gypi Wed Apr 15 08:32:50 2015 +@@ -3260,7 +3260,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], @@ -10,18 +10,18 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.34 2015/03/18 19:26:29 robert Exp 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3302,7 +3302,7 @@ - }], - ], +@@ -3316,7 +3316,7 @@ + ['use_x11==1', { + 'sources': [ '<@(chrome_browser_x11_sources)' ], }], - ['os_posix == 1 and OS != "mac" and OS != "ios"', { + ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', { 'sources': [ 'app/chrome_crash_reporter_client.cc', 'app/chrome_crash_reporter_client.h', -@@ -3391,6 +3391,13 @@ +@@ -3412,6 +3412,13 @@ + }], ], - 'sources': [ '<@(chrome_browser_android_sources)' ], }], + ['os_bsd==1', { + 'sources/': [ @@ -33,7 +33,7 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.34 2015/03/18 19:26:29 robert Exp ['OS=="mac"', { 'dependencies': [ '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', -@@ -3474,7 +3481,7 @@ +@@ -3496,7 +3503,7 @@ }], ], }], diff --git a/www/chromium/patches/patch-chrome_chrome_browser_ui_gypi b/www/chromium/patches/patch-chrome_chrome_browser_ui_gypi index 9d4950d406b..39ac162c7f4 100644 --- a/www/chromium/patches/patch-chrome_chrome_browser_ui_gypi +++ b/www/chromium/patches/patch-chrome_chrome_browser_ui_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.10 2015/03/18 19:26:29 robert Exp $ ---- chrome/chrome_browser_ui.gypi.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/chrome_browser_ui.gypi Wed Mar 11 07:22:50 2015 -@@ -2891,7 +2891,7 @@ +$OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.11 2015/04/27 16:38:25 robert Exp $ +--- chrome/chrome_browser_ui.gypi.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/chrome_browser_ui.gypi Wed Apr 15 08:32:50 2015 +@@ -2875,7 +2875,7 @@ }], ], }], @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.10 2015/03/18 19:26:29 robert 'dependencies': [ # gtk2 is the only component that can interact with gtk2 in our new # world. -@@ -2899,7 +2899,7 @@ +@@ -2883,7 +2883,7 @@ '../build/linux/system.gyp:gio', ], }], @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.10 2015/03/18 19:26:29 robert 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ], }], ['use_aura==1', { -@@ -2934,7 +2934,7 @@ +@@ -2918,7 +2918,7 @@ ['enable_print_preview==1', { 'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ], }], @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.10 2015/03/18 19:26:29 robert 'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ], }], ['OS=="android"', { -@@ -3046,10 +3046,10 @@ +@@ -3030,10 +3030,10 @@ }], ], }], diff --git a/www/chromium/patches/patch-chrome_chrome_exe_gypi b/www/chromium/patches/patch-chrome_chrome_exe_gypi index a735307c348..651c51ab720 100644 --- a/www/chromium/patches/patch-chrome_chrome_exe_gypi +++ b/www/chromium/patches/patch-chrome_chrome_exe_gypi @@ -1,12 +1,12 @@ -$OpenBSD: patch-chrome_chrome_exe_gypi,v 1.6 2015/03/18 19:26:29 robert Exp $ ---- chrome/chrome_exe.gypi.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/chrome_exe.gypi Wed Mar 11 07:22:50 2015 -@@ -433,7 +433,7 @@ +$OpenBSD: patch-chrome_chrome_exe_gypi,v 1.7 2015/04/27 16:38:25 robert Exp $ +--- chrome/chrome_exe.gypi.orig.port Wed Apr 15 09:29:36 2015 ++++ chrome/chrome_exe.gypi Wed Apr 15 09:29:54 2015 +@@ -190,7 +190,7 @@ + '../build/linux/system.gyp:xext', ], - }], # OS=="linux" and chromeos==0 and linux_dump_symbols==1 - # Android doesn't use pdfium. -- ['OS!="android"', { -+ ['OS!="android" and (OS!="openbsd" or target_arch=="x64")', { + }], +- ['OS=="linux" and enable_plugins==1', { ++ ['(OS=="openbsd" or OS=="linux") and enable_plugins==1', { 'dependencies': [ - # On Mac, this is done in chrome_dll.gypi. '../pdf/pdf.gyp:pdf', + ], diff --git a/www/chromium/patches/patch-chrome_common_chrome_paths_cc b/www/chromium/patches/patch-chrome_common_chrome_paths_cc index edbd7ba2a51..2b2904db704 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.24 2014/10/13 06:49:19 robert Exp $ ---- chrome/common/chrome_paths.cc.orig.port Thu Oct 2 19:39:46 2014 -+++ chrome/common/chrome_paths.cc Fri Oct 10 16:10:30 2014 -@@ -461,7 +461,7 @@ bool PathProvider(int key, base::FilePath* result) { +$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.25 2015/04/27 16:38:25 robert Exp $ +--- chrome/common/chrome_paths.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/common/chrome_paths.cc Wed Apr 15 08:32:50 2015 +@@ -460,7 +460,7 @@ bool PathProvider(int key, base::FilePath* result) { if (!base::PathExists(cur)) // We don't want to create this return false; break; diff --git a/www/chromium/patches/patch-chrome_common_chrome_paths_h b/www/chromium/patches/patch-chrome_common_chrome_paths_h index ed93d5efd4e..bb22dd5e404 100644 --- a/www/chromium/patches/patch-chrome_common_chrome_paths_h +++ b/www/chromium/patches/patch-chrome_common_chrome_paths_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.5 2014/10/13 06:49:19 robert Exp $ ---- chrome/common/chrome_paths.h.orig.port Thu Oct 2 19:18:54 2014 -+++ chrome/common/chrome_paths.h Fri Oct 10 16:10:30 2014 -@@ -112,7 +112,7 @@ enum { +$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- chrome/common/chrome_paths.h.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/common/chrome_paths.h Wed Apr 15 08:32:50 2015 +@@ -113,7 +113,7 @@ enum { DIR_SUPERVISED_USERS_DEFAULT_APPS, // Directory where installer places .crx // files to be installed when managed user // session starts. diff --git a/www/chromium/patches/patch-chrome_common_chrome_switches_cc b/www/chromium/patches/patch-chrome_common_chrome_switches_cc index 8d8b56e75ab..065785e1231 100644 --- a/www/chromium/patches/patch-chrome_common_chrome_switches_cc +++ b/www/chromium/patches/patch-chrome_common_chrome_switches_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.10 2015/01/22 11:16:41 robert Exp $ ---- chrome/common/chrome_switches.cc.orig.port Wed Dec 3 03:32:11 2014 -+++ chrome/common/chrome_switches.cc Sat Dec 6 11:34:26 2014 -@@ -1283,7 +1283,7 @@ const char kOpenAsh[] = "open-as +$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.11 2015/04/27 16:38:25 robert Exp $ +--- chrome/common/chrome_switches.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/common/chrome_switches.cc Wed Apr 15 08:32:50 2015 +@@ -1254,7 +1254,7 @@ const char kOpenAsh[] = "open-as const char kPasswordStore[] = "password-store"; #endif diff --git a/www/chromium/patches/patch-chrome_common_chrome_switches_h b/www/chromium/patches/patch-chrome_common_chrome_switches_h index cdf5421e927..219b8fa2383 100644 --- a/www/chromium/patches/patch-chrome_common_chrome_switches_h +++ b/www/chromium/patches/patch-chrome_common_chrome_switches_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.16 2015/03/18 19:26:29 robert Exp $ ---- chrome/common/chrome_switches.h.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/common/chrome_switches.h Wed Mar 11 07:22:50 2015 -@@ -359,7 +359,7 @@ extern const char kOpenAsh[]; +$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.17 2015/04/27 16:38:25 robert Exp $ +--- chrome/common/chrome_switches.h.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/common/chrome_switches.h Wed Apr 15 08:32:50 2015 +@@ -357,7 +357,7 @@ extern const char kOpenAsh[]; extern const char kPasswordStore[]; #endif diff --git a/www/chromium/patches/patch-chrome_common_extensions_api_schemas_gypi b/www/chromium/patches/patch-chrome_common_extensions_api_schemas_gypi index 7bb6929ad75..14355d833bb 100644 --- a/www/chromium/patches/patch-chrome_common_extensions_api_schemas_gypi +++ b/www/chromium/patches/patch-chrome_common_extensions_api_schemas_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_extensions_api_schemas_gypi,v 1.3 2015/03/18 19:26:29 robert Exp $ ---- chrome/common/extensions/api/schemas.gypi.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/common/extensions/api/schemas.gypi Wed Mar 11 07:22:50 2015 -@@ -168,6 +168,11 @@ +$OpenBSD: patch-chrome_common_extensions_api_schemas_gypi,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- chrome/common/extensions/api/schemas.gypi.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/common/extensions/api/schemas.gypi Wed Apr 15 08:32:50 2015 +@@ -152,6 +152,11 @@ '<@(webrtc_schema_files)', ], }], diff --git a/www/chromium/patches/patch-chrome_common_pref_names_cc b/www/chromium/patches/patch-chrome_common_pref_names_cc index 12d222b8daa..3073f1b30d8 100644 --- a/www/chromium/patches/patch-chrome_common_pref_names_cc +++ b/www/chromium/patches/patch-chrome_common_pref_names_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_pref_names_cc,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- chrome/common/pref_names.cc.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/common/pref_names.cc Wed Mar 11 07:22:50 2015 -@@ -896,7 +896,7 @@ const char kForceYouTubeSafetyMode[] = "settings.force +$OpenBSD: patch-chrome_common_pref_names_cc,v 1.13 2015/04/27 16:38:25 robert Exp $ +--- chrome/common/pref_names.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/common/pref_names.cc Wed Apr 15 08:32:50 2015 +@@ -901,7 +901,7 @@ const char kForceYouTubeSafetyMode[] = "settings.force // supervised users. const char kRecordHistory[] = "settings.history_recorded"; @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_pref_names_cc,v 1.12 2015/03/18 19:26:29 robert Ex // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1428,7 +1428,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1440,7 +1440,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; diff --git a/www/chromium/patches/patch-chrome_common_pref_names_h b/www/chromium/patches/patch-chrome_common_pref_names_h index 7edc2502a58..96449a9ab89 100644 --- a/www/chromium/patches/patch-chrome_common_pref_names_h +++ b/www/chromium/patches/patch-chrome_common_pref_names_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_pref_names_h,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- chrome/common/pref_names.h.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/common/pref_names.h Wed Mar 11 07:22:50 2015 -@@ -296,7 +296,7 @@ extern const char kForceYouTubeSafetyMode[]; +$OpenBSD: patch-chrome_common_pref_names_h,v 1.13 2015/04/27 16:38:25 robert Exp $ +--- chrome/common/pref_names.h.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/common/pref_names.h Wed Apr 15 08:32:50 2015 +@@ -297,7 +297,7 @@ extern const char kForceYouTubeSafetyMode[]; extern const char kRecordHistory[]; extern const char kDeleteTimePeriod[]; extern const char kLastClearBrowsingDataTime[]; @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_pref_names_h,v 1.12 2015/03/18 19:26:29 robert Exp extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -493,7 +493,7 @@ extern const char kAppWindowPlacement[]; +@@ -498,7 +498,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; 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 d2a20dff722..ebb00a869d6 100644 --- a/www/chromium/patches/patch-chrome_test_perf_perf_test_cc +++ b/www/chromium/patches/patch-chrome_test_perf_perf_test_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_test_perf_perf_test_cc,v 1.5 2013/12/12 10:43:18 robert Exp $ ---- chrome/test/perf/perf_test.cc.orig.port Wed Dec 4 21:55:17 2013 -+++ chrome/test/perf/perf_test.cc Thu Dec 5 15:32:45 2013 -@@ -352,7 +352,7 @@ std::string MemoryUsageInfoToString(const std::string& +$OpenBSD: patch-chrome_test_perf_perf_test_cc,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- chrome/test/perf/perf_test.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ chrome/test/perf/perf_test.cc Wed Apr 15 08:32:50 2015 +@@ -349,7 +349,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 */); diff --git a/www/chromium/patches/patch-components_audio_modem_modem_impl_cc b/www/chromium/patches/patch-components_audio_modem_modem_impl_cc new file mode 100644 index 00000000000..49b10be74b9 --- /dev/null +++ b/www/chromium/patches/patch-components_audio_modem_modem_impl_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-components_audio_modem_modem_impl_cc,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- components/audio_modem/modem_impl.cc.orig.port Wed Apr 15 15:37:11 2015 ++++ components/audio_modem/modem_impl.cc Wed Apr 15 15:41:00 2015 +@@ -8,6 +8,8 @@ + #include + #include + ++#include ++ + #include "base/bind.h" + #include "base/bind_helpers.h" + #include "base/command_line.h" diff --git a/www/chromium/patches/patch-components_policy_resources_policy_templates_json b/www/chromium/patches/patch-components_policy_resources_policy_templates_json index 9dbfa2af786..bfafed07ef7 100644 --- a/www/chromium/patches/patch-components_policy_resources_policy_templates_json +++ b/www/chromium/patches/patch-components_policy_resources_policy_templates_json @@ -1,7 +1,7 @@ -$OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.9 2015/03/18 19:26:29 robert Exp $ ---- components/policy/resources/policy_templates.json.orig.port Tue Mar 10 23:41:41 2015 -+++ components/policy/resources/policy_templates.json Wed Mar 11 07:22:50 2015 -@@ -1611,7 +1611,7 @@ +$OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.10 2015/04/27 16:38:25 robert Exp $ +--- components/policy/resources/policy_templates.json.orig.port Wed Apr 15 00:31:22 2015 ++++ components/policy/resources/policy_templates.json Wed Apr 15 08:32:50 2015 +@@ -1700,7 +1700,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -10,7 +10,7 @@ $OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.9 2015/03/ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3955,7 +3955,7 @@ +@@ -4044,7 +4044,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -19,7 +19,7 @@ $OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.9 2015/03/ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4634,7 +4634,7 @@ +@@ -4776,7 +4776,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/patches/patch-chrome_renderer_printing_print_web_view_helper_h b/www/chromium/patches/patch-components_printing_renderer_print_web_view_helper_h similarity index 52% rename from www/chromium/patches/patch-chrome_renderer_printing_print_web_view_helper_h rename to www/chromium/patches/patch-components_printing_renderer_print_web_view_helper_h index 9f963248e28..bf52e6a4272 100644 --- a/www/chromium/patches/patch-chrome_renderer_printing_print_web_view_helper_h +++ b/www/chromium/patches/patch-components_printing_renderer_print_web_view_helper_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_renderer_printing_print_web_view_helper_h,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- chrome/renderer/printing/print_web_view_helper.h.orig.port Tue Mar 10 23:41:40 2015 -+++ chrome/renderer/printing/print_web_view_helper.h Wed Mar 11 07:22:50 2015 -@@ -232,7 +232,7 @@ class PrintWebViewHelper +$OpenBSD: patch-components_printing_renderer_print_web_view_helper_h,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- components/printing/renderer/print_web_view_helper.h.orig.port Wed Apr 15 09:31:19 2015 ++++ components/printing/renderer/print_web_view_helper.h Wed Apr 15 09:31:31 2015 +@@ -246,7 +246,7 @@ class PrintWebViewHelper void FinishFramePrinting(); // Prints the page listed in |params|. 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 295b7b9b829..cea6736d4af 100644 --- a/www/chromium/patches/patch-content_app_content_main_runner_cc +++ b/www/chromium/patches/patch-content_app_content_main_runner_cc @@ -1,12 +1,13 @@ -$OpenBSD: patch-content_app_content_main_runner_cc,v 1.20 2015/01/22 11:16:41 robert Exp $ ---- content/app/content_main_runner.cc.orig.port Wed Dec 3 03:13:24 2014 -+++ content/app/content_main_runner.cc Sat Dec 6 11:34:26 2014 -@@ -98,10 +98,10 @@ +$OpenBSD: patch-content_app_content_main_runner_cc,v 1.21 2015/04/27 16:38:25 robert Exp $ +--- content/app/content_main_runner.cc.orig.port Wed Apr 15 09:31:58 2015 ++++ content/app/content_main_runner.cc Wed Apr 15 09:32:36 2015 +@@ -93,11 +93,11 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) + #include "content/public/common/content_descriptors.h" #include "content/public/common/zygote_fork_delegate_linux.h" #endif -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) @@ -14,7 +15,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.20 2015/01/22 11:16:41 ro #include "content/zygote/zygote_main.h" #endif -@@ -294,7 +294,7 @@ struct MainFunction { +@@ -258,7 +258,7 @@ struct MainFunction { int (*function)(const MainFunctionParams&); }; @@ -23,7 +24,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.20 2015/01/22 11:16:41 ro // 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(). -@@ -424,7 +424,7 @@ int RunNamedProcessTypeMain( +@@ -383,7 +383,7 @@ int RunNamedProcessTypeMain( } } 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 b55debb8053..830b239cd53 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.25 2015/03/18 19:26:29 robert Exp $ ---- content/browser/browser_main_loop.cc.orig.port Tue Mar 10 23:41:41 2015 -+++ content/browser/browser_main_loop.cc Wed Mar 11 07:22:50 2015 -@@ -142,7 +142,7 @@ +$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.26 2015/04/27 16:38:25 robert Exp $ +--- content/browser/browser_main_loop.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ content/browser/browser_main_loop.cc Wed Apr 15 08:32:50 2015 +@@ -143,7 +143,7 @@ namespace content { namespace { @@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.25 2015/03/18 19:26:29 void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); base::FilePath sandbox_binary; -@@ -387,7 +387,7 @@ void BrowserMainLoop::Init() { +@@ -388,7 +388,7 @@ void BrowserMainLoop::Init() { void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); @@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.25 2015/03/18 19:26:29 // No thread should be created before this call, as SetupSandbox() // will end-up using fork(). SetupSandbox(parsed_command_line_); -@@ -851,7 +851,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { +@@ -872,7 +872,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { } #endif 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 b78e4fe8bb1..45410216163 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.19 2015/03/18 19:26:29 robert Exp $ ---- content/browser/child_process_launcher.cc.orig.port Wed Mar 11 07:35:16 2015 -+++ content/browser/child_process_launcher.cc Wed Mar 11 21:28:07 2015 -@@ -121,7 +121,7 @@ class ChildProcessLauncher::Context +$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.20 2015/04/27 16:38:25 robert Exp $ +--- content/browser/child_process_launcher.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ content/browser/child_process_launcher.cc Wed Apr 15 08:32:50 2015 +@@ -120,7 +120,7 @@ class ChildProcessLauncher::Context // Notifies the client about the result of the operation. // Runs on the UI thread. void Notify( @@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 bool zygote, #endif base::Process process); -@@ -132,7 +132,7 @@ class ChildProcessLauncher::Context +@@ -131,7 +131,7 @@ class ChildProcessLauncher::Context bool background); static void TerminateInternal( @@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 bool zygote, #endif base::Process process); -@@ -145,7 +145,7 @@ class ChildProcessLauncher::Context +@@ -144,7 +144,7 @@ class ChildProcessLauncher::Context #if defined(OS_ANDROID) // The fd to close after creating the process. base::ScopedFD ipcfd_; @@ -28,7 +28,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 bool zygote_; #endif bool starting_; -@@ -159,7 +159,7 @@ ChildProcessLauncher::Context::Context() +@@ -158,7 +158,7 @@ ChildProcessLauncher::Context::Context() client_thread_id_(BrowserThread::UI), termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), exit_code_(RESULT_CODE_NORMAL_EXIT), @@ -37,7 +37,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 zygote_(false), #endif starting_(true), -@@ -239,7 +239,7 @@ void ChildProcessLauncher::Context::ResetClient() { +@@ -238,7 +238,7 @@ void ChildProcessLauncher::Context::ResetClient() { } void ChildProcessLauncher::Context::UpdateTerminationStatus(bool known_dead) { @@ -46,7 +46,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 if (zygote_) { termination_status_ = ZygoteHostImpl::GetInstance()-> GetTerminationStatus(process_.Handle(), known_dead, &exit_code_); -@@ -247,7 +247,7 @@ void ChildProcessLauncher::Context::UpdateTerminationS +@@ -246,7 +246,7 @@ void ChildProcessLauncher::Context::UpdateTerminationS termination_status_ = base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_); } else { @@ -55,7 +55,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 if (known_dead) { termination_status_ = base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_); -@@ -317,7 +317,9 @@ void ChildProcessLauncher::Context::LaunchInternal( +@@ -316,7 +316,9 @@ void ChildProcessLauncher::Context::LaunchInternal( base::EnvironmentMap env = delegate->GetEnvironment(); base::ScopedFD ipcfd = delegate->TakeIpcFd(); #elif defined(OS_POSIX) @@ -65,7 +65,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 base::EnvironmentMap env = delegate->GetEnvironment(); base::ScopedFD ipcfd = delegate->TakeIpcFd(); #endif -@@ -375,7 +377,7 @@ void ChildProcessLauncher::Context::LaunchInternal( +@@ -366,7 +368,7 @@ void ChildProcessLauncher::Context::LaunchInternal( // We need to close the client end of the IPC channel to reliably detect // child termination. @@ -74,7 +74,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess( *cmd_line, child_process_id, files_to_register.get()); if (use_zygote) { -@@ -390,7 +392,7 @@ void ChildProcessLauncher::Context::LaunchInternal( +@@ -382,7 +384,7 @@ void ChildProcessLauncher::Context::LaunchInternal( files_to_register->GetMappingWithIDAdjustment( base::GlobalDescriptors::kBaseDescriptor); @@ -83,7 +83,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 if (process_type == switches::kRendererProcess) { const int sandbox_fd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -457,7 +459,7 @@ void ChildProcessLauncher::Context::LaunchInternal( +@@ -446,7 +448,7 @@ void ChildProcessLauncher::Context::LaunchInternal( client_thread_id, FROM_HERE, base::Bind(&Context::Notify, this_object.get(), @@ -92,7 +92,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 use_zygote, #endif base::Passed(&process))); -@@ -465,7 +467,7 @@ void ChildProcessLauncher::Context::LaunchInternal( +@@ -454,7 +456,7 @@ void ChildProcessLauncher::Context::LaunchInternal( } void ChildProcessLauncher::Context::Notify( @@ -101,7 +101,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 bool zygote, #endif base::Process process) { -@@ -478,7 +480,7 @@ void ChildProcessLauncher::Context::Notify( +@@ -467,7 +469,7 @@ void ChildProcessLauncher::Context::Notify( if (!process_.IsValid()) LOG(ERROR) << "Failed to launch child process"; @@ -110,7 +110,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 zygote_ = zygote; #endif if (client_) { -@@ -504,7 +506,7 @@ void ChildProcessLauncher::Context::Terminate() { +@@ -493,7 +495,7 @@ void ChildProcessLauncher::Context::Terminate() { BrowserThread::PostTask( BrowserThread::PROCESS_LAUNCHER, FROM_HERE, base::Bind(&Context::TerminateInternal, @@ -119,7 +119,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 zygote_, #endif base::Passed(&process_))); -@@ -522,7 +524,7 @@ void ChildProcessLauncher::Context::SetProcessBackgrou +@@ -511,7 +513,7 @@ void ChildProcessLauncher::Context::SetProcessBackgrou // static void ChildProcessLauncher::Context::TerminateInternal( @@ -128,7 +128,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2 bool zygote, #endif base::Process process) { -@@ -536,7 +538,7 @@ void ChildProcessLauncher::Context::TerminateInternal( +@@ -525,7 +527,7 @@ void ChildProcessLauncher::Context::TerminateInternal( process.Terminate(RESULT_CODE_NORMAL_EXIT); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) diff --git a/www/chromium/patches/patch-content_browser_geolocation_location_arbitrator_impl_cc b/www/chromium/patches/patch-content_browser_geolocation_location_arbitrator_impl_cc index 51021d991a5..42d1745b7f3 100644 --- a/www/chromium/patches/patch-content_browser_geolocation_location_arbitrator_impl_cc +++ b/www/chromium/patches/patch-content_browser_geolocation_location_arbitrator_impl_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_browser_geolocation_location_arbitrator_impl_cc,v 1.2 2014/10/13 06:49:19 robert Exp $ ---- content/browser/geolocation/location_arbitrator_impl.cc.orig.port Thu Oct 2 19:18:57 2014 -+++ content/browser/geolocation/location_arbitrator_impl.cc Fri Oct 10 16:10:30 2014 -@@ -159,7 +159,7 @@ LocationProvider* LocationArbitratorImpl::NewNetworkLo +$OpenBSD: patch-content_browser_geolocation_location_arbitrator_impl_cc,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- content/browser/geolocation/location_arbitrator_impl.cc.orig.port Wed Apr 15 00:18:53 2015 ++++ content/browser/geolocation/location_arbitrator_impl.cc Wed Apr 15 08:32:50 2015 +@@ -170,7 +170,7 @@ LocationProvider* LocationArbitratorImpl::NewNetworkLo } LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() { diff --git a/www/chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc b/www/chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc index af3507c7512..28a68c2938a 100644 --- a/www/chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc +++ b/www/chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v 1.7 2015/03/18 19:26:29 robert Exp $ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig.port Tue Mar 10 23:41:41 2015 -+++ content/browser/renderer_host/render_widget_host_view_aura.cc Wed Mar 11 07:22:50 2015 +$OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v 1.8 2015/04/27 16:38:25 robert Exp $ +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ content/browser/renderer_host/render_widget_host_view_aura.cc Wed Apr 15 08:32:50 2015 @@ -90,7 +90,7 @@ #include "ui/gfx/win/dpi.h" #endif @@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v #include "content/common/input_messages.h" #include "ui/events/linux/text_edit_command_auralinux.h" #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -2339,7 +2339,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2372,7 +2372,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v return NeedsInputGrab(); #endif return false; -@@ -2555,7 +2555,7 @@ void RenderWidgetHostViewAura::DetachFromInputMethod() +@@ -2588,7 +2588,7 @@ void RenderWidgetHostViewAura::DetachFromInputMethod() void RenderWidgetHostViewAura::ForwardKeyboardEvent( const NativeWebKeyboardEvent& event) { diff --git a/www/chromium/patches/patch-content_browser_tracing_tracing_ui_cc b/www/chromium/patches/patch-content_browser_tracing_tracing_ui_cc deleted file mode 100644 index 45ac2ed2146..00000000000 --- a/www/chromium/patches/patch-content_browser_tracing_tracing_ui_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-content_browser_tracing_tracing_ui_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ ---- content/browser/tracing/tracing_ui.cc.orig.port Tue Mar 10 23:41:41 2015 -+++ content/browser/tracing/tracing_ui.cc Wed Mar 11 07:22:50 2015 -@@ -350,6 +350,8 @@ void TracingUI::DoUpload(const base::ListValue* args) - const char product[] = "Chrome_Android"; - #elif defined(OS_CHROMEOS) - const char product[] = "Chrome_ChromeOS"; -+#elif defined(OS_OPENBSD) -+ const char product[] = "Chrome_OpenBSD"; - #else - #error Platform not supported. - #endif diff --git a/www/chromium/patches/patch-content_content_browser_gypi b/www/chromium/patches/patch-content_content_browser_gypi index 694c966c709..ea922d3a694 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.30 2015/03/18 19:26:29 robert Exp $ ---- content/content_browser.gypi.orig.port Tue Mar 10 23:41:41 2015 -+++ content/content_browser.gypi Wed Mar 11 07:22:50 2015 -@@ -1888,9 +1888,26 @@ +$OpenBSD: patch-content_content_browser_gypi,v 1.31 2015/04/27 16:38:25 robert Exp $ +--- content/content_browser.gypi.orig.port Wed Apr 15 00:31:22 2015 ++++ content/content_browser.gypi Thu Apr 23 09:39:53 2015 +@@ -1903,9 +1903,26 @@ ], }], ['os_bsd==1', { @@ -30,12 +30,15 @@ $OpenBSD: patch-content_content_browser_gypi,v 1.30 2015/03/18 19:26:29 robert E }], ['use_aura==1', { 'dependencies': [ -@@ -1936,7 +1953,7 @@ +@@ -1952,10 +1969,7 @@ 'browser/geolocation/empty_wifi_data_provider.cc', ], }], - ['OS == "linux" and use_dbus==1', { +- 'sources!': [ +- 'browser/geolocation/empty_wifi_data_provider.cc', +- ], + ['(OS == "linux" or os_bsd==1) and use_dbus==1', { - 'sources!': [ - 'browser/geolocation/empty_wifi_data_provider.cc', - ], + 'dependencies': [ + '../build/linux/system.gyp:dbus', + '../dbus/dbus.gyp:dbus', diff --git a/www/chromium/patches/patch-content_content_common_gypi b/www/chromium/patches/patch-content_content_common_gypi index 585df85eac1..2dca85b2d46 100644 --- a/www/chromium/patches/patch-content_content_common_gypi +++ b/www/chromium/patches/patch-content_content_common_gypi @@ -1,25 +1,36 @@ -$OpenBSD: patch-content_content_common_gypi,v 1.19 2015/03/18 19:26:29 robert Exp $ ---- content/content_common.gypi.orig.port Tue Mar 10 23:41:41 2015 -+++ content/content_common.gypi Wed Mar 11 07:22:50 2015 -@@ -695,6 +695,23 @@ +$OpenBSD: patch-content_content_common_gypi,v 1.20 2015/04/27 16:38:25 robert Exp $ +--- content/content_common.gypi.orig.port Wed Apr 15 00:31:22 2015 ++++ content/content_common.gypi Thu Apr 23 08:21:24 2015 +@@ -701,6 +701,34 @@ 'content.gyp:common_aidl', ], }], + ['os_bsd==1', { + 'sources!': [ ++ 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc', ++ 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.h', ++ 'common/sandbox_linux/bpf_gpu_policy_linux.cc', ++ 'common/sandbox_linux/bpf_gpu_policy_linux.h', ++ 'common/sandbox_linux/bpf_ppapi_policy_linux.cc', ++ 'common/sandbox_linux/bpf_ppapi_policy_linux.h', ++ 'common/sandbox_linux/bpf_renderer_policy_linux.cc', ++ 'common/sandbox_linux/bpf_renderer_policy_linux.h', ++ 'common/sandbox_linux/bpf_utility_policy_linux.cc', ++ 'common/sandbox_linux/bpf_utility_policy_linux.h', ++ 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', ++ 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', ++ 'common/sandbox_linux/sandbox_debug_handling_linux.cc', ++ 'common/sandbox_linux/sandbox_debug_handling_linux.h', ++ 'common/sandbox_linux/sandbox_init_linux.cc', ++ 'common/sandbox_linux/sandbox_linux.cc', ++ 'common/sandbox_linux/sandbox_linux.h', ++ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc', ++ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.h', + 'common/sandbox_linux.cc', + 'common/sandbox_linux.h', + 'common/sandbox_init_linux.cc', + 'common/sandbox_seccomp_bpf_linux.cc', + 'common/sandbox_seccomp_bpf_linux.h', -+ 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc', -+ 'common/sandbox_linux/bpf_gpu_policy_linux.cc', -+ 'common/sandbox_linux/bpf_ppapi_policy_linux.cc', -+ 'common/sandbox_linux/bpf_renderer_policy_linux.cc', -+ 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', -+ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc', -+ 'common/sandbox_linux/sandbox_linux.cc', -+ 'common/sandbox_linux/sandbox_linux.h', + ], + }], ['use_pango == 1', { diff --git a/www/chromium/patches/patch-content_content_renderer_gypi b/www/chromium/patches/patch-content_content_renderer_gypi index 37f9500e735..45dba597e30 100644 --- a/www/chromium/patches/patch-content_content_renderer_gypi +++ b/www/chromium/patches/patch-content_content_renderer_gypi @@ -1,10 +1,10 @@ -$OpenBSD: patch-content_content_renderer_gypi,v 1.5 2015/01/22 11:16:41 robert Exp $ ---- content/content_renderer.gypi.orig.port Wed Dec 3 03:32:12 2014 -+++ content/content_renderer.gypi Sat Dec 6 11:34:27 2014 +$OpenBSD: patch-content_content_renderer_gypi,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- content/content_renderer.gypi.orig.port Wed Apr 15 09:33:15 2015 ++++ content/content_renderer.gypi Wed Apr 15 09:33:35 2015 @@ -26,6 +26,7 @@ - '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libjingle/libjingle.gyp:libjingle', + '../third_party/mojo/mojo_edk.gyp:mojo_js_lib', + '../third_party/libyuv/libyuv.gyp:libyuv', '../third_party/npapi/npapi.gyp:npapi', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', diff --git a/www/chromium/patches/patch-content_gpu_gpu_main_cc b/www/chromium/patches/patch-content_gpu_gpu_main_cc index 71ed7074b7b..76f4ceab70c 100644 --- a/www/chromium/patches/patch-content_gpu_gpu_main_cc +++ b/www/chromium/patches/patch-content_gpu_gpu_main_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ ---- content/gpu/gpu_main.cc.orig.port Wed Mar 11 07:42:53 2015 -+++ content/gpu/gpu_main.cc Wed Mar 11 19:24:41 2015 -@@ -76,7 +76,7 @@ bool WarmUpSandbox(const base::CommandLine& command_li +$OpenBSD: patch-content_gpu_gpu_main_cc,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- content/gpu/gpu_main.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ content/gpu/gpu_main.cc Wed Apr 15 08:32:50 2015 +@@ -77,7 +77,7 @@ bool WarmUpSandbox(const base::CommandLine& command_li bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); #endif @@ -10,7 +10,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ #if !defined(OS_CHROMEOS) bool CanAccessNvidiaDeviceFile(); #endif -@@ -161,13 +161,13 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -162,13 +162,13 @@ int GpuMain(const MainFunctionParams& parameters) { message_loop_type = base::MessageLoop::TYPE_UI; } base::MessageLoop main_message_loop(message_loop_type); @@ -26,7 +26,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT); #elif defined(OS_MACOSX) // This is necessary for CoreAnimation layers hosted in the GPU process to be -@@ -234,6 +234,10 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -235,6 +235,10 @@ int GpuMain(const MainFunctionParams& parameters) { initialized_sandbox = true; } #endif // defined(OS_LINUX) @@ -37,7 +37,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -281,7 +285,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -282,7 +286,7 @@ int GpuMain(const MainFunctionParams& parameters) { } #endif @@ -46,7 +46,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ initialized_gl_context = true; #if !defined(OS_CHROMEOS) if (gpu_info.gpu.vendor_id == 0x10de && // NVIDIA -@@ -316,14 +320,16 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -317,14 +321,16 @@ int GpuMain(const MainFunctionParams& parameters) { watchdog_thread = NULL; } @@ -64,7 +64,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ #elif defined(OS_WIN) gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info); #elif defined(OS_MACOSX) -@@ -424,7 +430,7 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { +@@ -425,7 +431,7 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { } #endif diff --git a/www/chromium/patches/patch-content_public_common_content_switches_cc b/www/chromium/patches/patch-content_public_common_content_switches_cc index 4ef1c73d711..f2f69228eb9 100644 --- a/www/chromium/patches/patch-content_public_common_content_switches_cc +++ b/www/chromium/patches/patch-content_public_common_content_switches_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_public_common_content_switches_cc,v 1.4 2015/03/18 19:26:29 robert Exp $ ---- content/public/common/content_switches.cc.orig.port Tue Mar 10 23:41:41 2015 -+++ content/public/common/content_switches.cc Wed Mar 11 07:22:50 2015 -@@ -917,7 +917,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] = +$OpenBSD: patch-content_public_common_content_switches_cc,v 1.5 2015/04/27 16:38:25 robert Exp $ +--- content/public/common/content_switches.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ content/public/common/content_switches.cc Wed Apr 15 08:32:50 2015 +@@ -940,7 +940,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] = "disable-vaapi-accelerated-video-encode"; #endif diff --git a/www/chromium/patches/patch-content_public_common_content_switches_h b/www/chromium/patches/patch-content_public_common_content_switches_h index d8a5404d805..87bcfaf3ef4 100644 --- a/www/chromium/patches/patch-content_public_common_content_switches_h +++ b/www/chromium/patches/patch-content_public_common_content_switches_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_public_common_content_switches_h,v 1.4 2015/03/18 19:26:29 robert Exp $ ---- content/public/common/content_switches.h.orig.port Tue Mar 10 23:41:41 2015 -+++ content/public/common/content_switches.h Wed Mar 11 07:22:50 2015 -@@ -269,7 +269,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[ +$OpenBSD: patch-content_public_common_content_switches_h,v 1.5 2015/04/27 16:38:25 robert Exp $ +--- content/public/common/content_switches.h.orig.port Wed Apr 15 00:31:22 2015 ++++ content/public/common/content_switches.h Wed Apr 15 08:32:50 2015 +@@ -271,7 +271,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[ CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; #endif diff --git a/www/chromium/patches/patch-content_renderer_render_thread_impl_cc b/www/chromium/patches/patch-content_renderer_render_thread_impl_cc index be7973b6e9b..2a1cd612c9b 100644 --- a/www/chromium/patches/patch-content_renderer_render_thread_impl_cc +++ b/www/chromium/patches/patch-content_renderer_render_thread_impl_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-content_renderer_render_thread_impl_cc,v 1.1 2015/03/18 19:26:29 robert Exp $ ---- content/renderer/render_thread_impl.cc.orig.port Wed Mar 11 07:29:03 2015 -+++ content/renderer/render_thread_impl.cc Wed Mar 18 20:00:59 2015 -@@ -638,7 +638,7 @@ void RenderThreadImpl::Init() { - DCHECK_GT(num_raster_threads, 0); +$OpenBSD: patch-content_renderer_render_thread_impl_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- content/renderer/render_thread_impl.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ content/renderer/render_thread_impl.cc Wed Apr 15 08:32:50 2015 +@@ -671,7 +671,7 @@ void RenderThreadImpl::Init() { + num_raster_threads = 1; cc::TileTaskWorkerPool::SetNumWorkerThreads(num_raster_threads); -#if defined(OS_ANDROID) || defined(OS_LINUX) diff --git a/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc b/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc index f646b9325b5..3cb52eb3ec6 100644 --- a/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc +++ b/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.2 2015/03/18 19:26:29 robert Exp $ ---- content/renderer/renderer_blink_platform_impl.cc.orig.port Tue Mar 10 23:41:41 2015 -+++ content/renderer/renderer_blink_platform_impl.cc Wed Mar 11 07:22:50 2015 +$OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- content/renderer/renderer_blink_platform_impl.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ content/renderer/renderer_blink_platform_impl.cc Wed Apr 15 08:32:50 2015 @@ -96,7 +96,7 @@ #if defined(OS_POSIX) @@ -10,7 +10,7 @@ $OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.2 2015/03/1 #include #include -@@ -190,7 +190,7 @@ class RendererBlinkPlatformImpl::FileUtilities : publi +@@ -187,7 +187,7 @@ class RendererBlinkPlatformImpl::FileUtilities : publi scoped_refptr thread_safe_sender_; }; @@ -19,7 +19,7 @@ $OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.2 2015/03/1 // WebKit doesn't use WebSandboxSupport on android so we don't need to // implement anything here. class RendererBlinkPlatformImpl::SandboxSupport {}; -@@ -287,7 +287,7 @@ blink::WebFileUtilities* RendererBlinkPlatformImpl::fi +@@ -284,7 +284,7 @@ blink::WebFileUtilities* RendererBlinkPlatformImpl::fi } blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() { @@ -28,7 +28,7 @@ $OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.2 2015/03/1 // WebKit doesn't use WebSandboxSupport on android. return NULL; #else -@@ -578,7 +578,7 @@ bool RendererBlinkPlatformImpl::SandboxSupport::loadFo +@@ -563,7 +563,7 @@ bool RendererBlinkPlatformImpl::SandboxSupport::loadFo return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } diff --git a/www/chromium/patches/patch-dbus_property_cc b/www/chromium/patches/patch-dbus_property_cc new file mode 100644 index 00000000000..3529df1b78c --- /dev/null +++ b/www/chromium/patches/patch-dbus_property_cc @@ -0,0 +1,29 @@ +$OpenBSD: patch-dbus_property_cc,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- dbus/property.cc.orig.port Wed Apr 15 15:43:18 2015 ++++ dbus/property.cc Thu Apr 23 08:39:00 2015 +@@ -478,6 +478,7 @@ void Property >::AppendSetValueToWr + writer->CloseContainer(&variant_writer); + } + ++#if !defined(OS_BSD) + // + // Property> specialization. + // +@@ -574,6 +575,7 @@ void PropertyCloseContainer(&variant_writer); + } ++#endif + + template class Property; + template class Property; +@@ -589,7 +591,9 @@ template class Property; + template class Property >; + template class Property >; + template class Property >; ++#if !defined(OS_BSD) + template class Property>; + template class Property, uint16_t>>>; ++#endif + + } // namespace dbus diff --git a/www/chromium/patches/patch-device_hid_hid_gyp b/www/chromium/patches/patch-device_hid_hid_gyp index 1f4b0513e5b..f876d2bd995 100644 --- a/www/chromium/patches/patch-device_hid_hid_gyp +++ b/www/chromium/patches/patch-device_hid_hid_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-device_hid_hid_gyp,v 1.5 2015/03/18 19:26:29 robert Exp $ ---- device/hid/hid.gyp.orig.port Tue Mar 10 23:41:41 2015 -+++ device/hid/hid.gyp Wed Mar 11 07:22:50 2015 -@@ -66,6 +66,18 @@ +$OpenBSD: patch-device_hid_hid_gyp,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- device/hid/hid.gyp.orig.port Wed Apr 15 00:31:22 2015 ++++ device/hid/hid.gyp Wed Apr 15 08:32:50 2015 +@@ -68,6 +68,18 @@ 'input_service_linux.h', ], }], diff --git a/www/chromium/patches/patch-device_serial_serial_service_impl_cc b/www/chromium/patches/patch-device_serial_serial_service_impl_cc index fa42320ff61..0c4517190d7 100644 --- a/www/chromium/patches/patch-device_serial_serial_service_impl_cc +++ b/www/chromium/patches/patch-device_serial_serial_service_impl_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-device_serial_serial_service_impl_cc,v 1.1 2015/01/22 11:16:41 robert Exp $ ---- device/serial/serial_service_impl.cc.orig.port Sat Dec 6 18:28:30 2014 -+++ device/serial/serial_service_impl.cc Sun Dec 7 14:48:40 2014 -@@ -72,9 +72,14 @@ void SerialServiceImpl::Connect( +$OpenBSD: patch-device_serial_serial_service_impl_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- device/serial/serial_service_impl.cc.orig.port Wed Apr 15 00:18:54 2015 ++++ device/serial/serial_service_impl.cc Wed Apr 15 08:32:50 2015 +@@ -71,9 +71,14 @@ void SerialServiceImpl::Connect( } SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() { diff --git a/www/chromium/patches/patch-device_usb_usb_service_impl_cc b/www/chromium/patches/patch-device_usb_usb_service_impl_cc index ea00ac2a7f5..14ba41d6808 100644 --- a/www/chromium/patches/patch-device_usb_usb_service_impl_cc +++ b/www/chromium/patches/patch-device_usb_usb_service_impl_cc @@ -1,41 +1,15 @@ -$OpenBSD: patch-device_usb_usb_service_impl_cc,v 1.1 2015/03/21 14:11:19 robert Exp $ ---- device/usb/usb_service_impl.cc.orig.port Fri Mar 20 04:21:23 2015 -+++ device/usb/usb_service_impl.cc Sat Mar 21 12:29:48 2015 -@@ -60,11 +60,13 @@ class UsbServiceImpl : public UsbService, - // Adds a new UsbDevice to the devices_ map based on the given libusb device. - scoped_refptr AddDevice(PlatformUsbDevice platform_device); - -+#if !defined(OS_BSD) - // Handle hotplug events from libusb. - static int LIBUSB_CALL HotplugCallback(libusb_context* context, - PlatformUsbDevice device, - libusb_hotplug_event event, - void* user_data); -+#endif - // These functions release a reference to the provided platform device. - void OnDeviceAdded(PlatformUsbDevice platform_device); - void OnDeviceRemoved(PlatformUsbDevice platform_device); -@@ -85,7 +87,9 @@ class UsbServiceImpl : public UsbService, - // connected instead of only when a full enumeration is requested. - // TODO(reillyg): Support this on all platforms. crbug.com/411715 - bool hotplug_enabled_; -+#if !defined(OS_BSD) - libusb_hotplug_callback_handle hotplug_handle_; -+#endif - - // The map from unique IDs to UsbDevices. - typedef std::map > DeviceMap; -@@ -177,6 +181,9 @@ UsbServiceImpl::UsbServiceImpl( +$OpenBSD: patch-device_usb_usb_service_impl_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- device/usb/usb_service_impl.cc.orig.port Wed Apr 15 09:33:55 2015 ++++ device/usb/usb_service_impl.cc Wed Apr 22 21:25:53 2015 +@@ -112,6 +112,7 @@ UsbServiceImpl::UsbServiceImpl( next_unique_id_(0), hotplug_enabled_(false), weak_factory_(this) { -+#if defined(OS_BSD) -+ hotplug_enabled_ = false; -+#else - base::MessageLoop::current()->AddDestructionObserver(this); ++#if !defined(OS_BSD) task_runner_ = base::ThreadTaskRunnerHandle::Get(); int rv = libusb_hotplug_register_callback( -@@ -196,9 +203,11 @@ UsbServiceImpl::UsbServiceImpl( + context_->context(), +@@ -130,9 +131,11 @@ UsbServiceImpl::UsbServiceImpl( base::Unretained(ui_thread_helper_))); #endif // OS_WIN } @@ -44,10 +18,10 @@ $OpenBSD: patch-device_usb_usb_service_impl_cc,v 1.1 2015/03/21 14:11:19 robert UsbServiceImpl::~UsbServiceImpl() { +#if !defined(OS_BSD) - base::MessageLoop::current()->RemoveDestructionObserver(this); if (hotplug_enabled_) { libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); -@@ -211,6 +220,7 @@ UsbServiceImpl::~UsbServiceImpl() { + } +@@ -144,6 +147,7 @@ UsbServiceImpl::~UsbServiceImpl() { for (const auto& map_entry : devices_) { map_entry.second->OnDisconnect(); } @@ -55,7 +29,7 @@ $OpenBSD: patch-device_usb_usb_service_impl_cc,v 1.1 2015/03/21 14:11:19 robert } void UsbServiceImpl::RefreshDevices() { -@@ -286,6 +296,7 @@ scoped_refptr UsbServiceImpl::AddDevice +@@ -219,6 +223,7 @@ scoped_refptr UsbServiceImpl::AddDevice } } @@ -63,7 +37,7 @@ $OpenBSD: patch-device_usb_usb_service_impl_cc,v 1.1 2015/03/21 14:11:19 robert // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -323,6 +334,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb +@@ -256,6 +261,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb return 0; } diff --git a/www/chromium/patches/patch-device_usb_usb_service_impl_h b/www/chromium/patches/patch-device_usb_usb_service_impl_h new file mode 100644 index 00000000000..c632832e70e --- /dev/null +++ b/www/chromium/patches/patch-device_usb_usb_service_impl_h @@ -0,0 +1,27 @@ +$OpenBSD: patch-device_usb_usb_service_impl_h,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- device/usb/usb_service_impl.h.orig.port Wed Apr 15 15:35:01 2015 ++++ device/usb/usb_service_impl.h Wed Apr 15 15:44:34 2015 +@@ -38,11 +38,13 @@ class UsbServiceImpl : public UsbService { + // Adds a new UsbDevice to the devices_ map based on the given libusb device. + scoped_refptr AddDevice(PlatformUsbDevice platform_device); + ++#if !defined(OS_BSD) + // Handle hotplug events from libusb. + static int LIBUSB_CALL HotplugCallback(libusb_context* context, + PlatformUsbDevice device, + libusb_hotplug_event event, + void* user_data); ++#endif + // These functions release a reference to the provided platform device. + void OnDeviceAdded(PlatformUsbDevice platform_device); + void OnDeviceRemoved(PlatformUsbDevice platform_device); +@@ -63,7 +65,9 @@ class UsbServiceImpl : public UsbService { + // connected instead of only when a full enumeration is requested. + // TODO(reillyg): Support this on all platforms. crbug.com/411715 + bool hotplug_enabled_; ++#if !defined(OS_BSD) + libusb_hotplug_callback_handle hotplug_handle_; ++#endif + + // The map from unique IDs to UsbDevices. + typedef std::map> DeviceMap; diff --git a/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc b/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc index e03af5ba26a..80c9b5ef074 100644 --- a/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc +++ b/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc,v 1.1 2015/01/22 11:16:41 robert Exp $ ---- gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc.orig.port Fri Dec 26 19:54:36 2014 -+++ gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc Fri Dec 26 19:54:53 2014 +$OpenBSD: patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc Wed Apr 15 08:32:50 2015 @@ -89,7 +89,7 @@ class TransferThread : public base::Thread { public: TransferThread() : base::Thread(kAsyncTransferThreadName) { @@ -10,7 +10,7 @@ $OpenBSD: patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc,v SetPriority(base::kThreadPriority_Background); #endif } -@@ -467,14 +467,14 @@ bool AsyncPixelTransferDelegateEGL::TransferIsInProgre +@@ -465,14 +465,14 @@ bool AsyncPixelTransferDelegateEGL::TransferIsInProgre void AsyncPixelTransferDelegateEGL::WaitForTransferCompletion() { if (state_->TransferIsInProgress()) { diff --git a/www/chromium/patches/patch-gpu_config_gpu_info_collector_x11_cc b/www/chromium/patches/patch-gpu_config_gpu_info_collector_x11_cc index 7049f1af662..487119e5109 100644 --- a/www/chromium/patches/patch-gpu_config_gpu_info_collector_x11_cc +++ b/www/chromium/patches/patch-gpu_config_gpu_info_collector_x11_cc @@ -1,12 +1,7 @@ -$OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.1 2015/02/22 11:33:57 robert Exp $ ---- gpu/config/gpu_info_collector_x11.cc.orig.port Fri Feb 20 05:24:00 2015 -+++ gpu/config/gpu_info_collector_x11.cc Sun Feb 22 12:13:30 2015 -@@ -4,12 +4,22 @@ - - #include - -+#include "base/debug/trace_event.h" - #include "base/logging.h" +$OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- gpu/config/gpu_info_collector_x11.cc.orig.port Wed Apr 15 00:18:55 2015 ++++ gpu/config/gpu_info_collector_x11.cc Wed Apr 15 15:34:00 2015 +@@ -8,8 +8,17 @@ #include "gpu/config/gpu_info_collector_linux.h" #include "third_party/libXNVCtrl/NVCtrl.h" #include "third_party/libXNVCtrl/NVCtrlLib.h" @@ -24,7 +19,7 @@ $OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.1 2015/02/22 11:33:57 r namespace gpu { // Use NVCtrl extention to query NV driver version. -@@ -39,5 +49,42 @@ std::string CollectDriverVersionNVidia() { +@@ -39,5 +48,42 @@ std::string CollectDriverVersionNVidia() { } return std::string(); } diff --git a/www/chromium/patches/patch-media_audio_audio_input_controller_cc b/www/chromium/patches/patch-media_audio_audio_input_controller_cc index 833fa119e6c..22ca6ec75da 100644 --- a/www/chromium/patches/patch-media_audio_audio_input_controller_cc +++ b/www/chromium/patches/patch-media_audio_audio_input_controller_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-media_audio_audio_input_controller_cc,v 1.1 2015/01/22 11:16:41 robert Exp $ ---- media/audio/audio_input_controller.cc.orig.port Sat Dec 6 14:44:50 2014 -+++ media/audio/audio_input_controller.cc Sat Dec 6 14:44:57 2014 +$OpenBSD: patch-media_audio_audio_input_controller_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- media/audio/audio_input_controller.cc.orig.port Wed Apr 15 00:18:55 2015 ++++ media/audio/audio_input_controller.cc Wed Apr 15 08:32:50 2015 @@ -13,6 +13,8 @@ - #include "media/base/scoped_histogram_timer.h" + #include "media/audio/audio_parameters.h" #include "media/base/user_input_monitor.h" +#include diff --git a/www/chromium/patches/patch-media_media_gyp b/www/chromium/patches/patch-media_media_gyp index 0567892ca20..06fc928896e 100644 --- a/www/chromium/patches/patch-media_media_gyp +++ b/www/chromium/patches/patch-media_media_gyp @@ -1,6 +1,6 @@ -$OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $ ---- media/media.gyp.orig.port Tue Mar 10 23:41:41 2015 -+++ media/media.gyp Wed Mar 11 07:22:50 2015 +$OpenBSD: patch-media_media_gyp,v 1.35 2015/04/27 16:38:25 robert Exp $ +--- media/media.gyp.orig.port Wed Apr 15 00:31:22 2015 ++++ media/media.gyp Wed Apr 15 08:32:50 2015 @@ -21,7 +21,7 @@ 'media_use_libvpx%': 1, }], @@ -30,7 +30,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $ 'audio/pulse/pulse_util.cc', 'audio/pulse/pulse_util.h', 'audio/sample_rates.cc', -@@ -725,6 +731,24 @@ +@@ -735,6 +741,24 @@ 'filters/h264_bitstream_buffer.h', ], }], @@ -55,7 +55,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $ ['use_alsa==1', { 'link_settings': { 'libraries': [ -@@ -746,7 +770,7 @@ +@@ -756,7 +780,7 @@ 'audio/openbsd/audio_manager_openbsd.h', ], }], @@ -64,7 +64,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $ 'conditions': [ ['use_x11==1', { 'dependencies': [ -@@ -836,7 +860,7 @@ +@@ -847,7 +871,7 @@ 'ozone/media_ozone_platform.h', ] }], @@ -73,7 +73,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $ 'sources!': [ 'audio/cras/audio_manager_cras.cc', 'audio/cras/audio_manager_cras.h', -@@ -1056,7 +1080,7 @@ +@@ -1067,7 +1091,7 @@ 'base/simd/convert_yuv_to_rgb_x86.cc', ], }], @@ -82,7 +82,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $ 'sources!': [ 'base/keyboard_event_counter.cc', 'base/keyboard_event_counter.h', -@@ -1299,7 +1323,7 @@ +@@ -1314,7 +1338,7 @@ 'USE_PULSEAUDIO', ], }], @@ -91,7 +91,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $ 'conditions': [ ['use_allocator!="none"', { 'dependencies': [ -@@ -1823,7 +1847,7 @@ +@@ -1841,7 +1865,7 @@ 'test/pipeline_integration_test_base.cc', ], 'conditions': [ diff --git a/www/chromium/patches/patch-media_video_capture_linux_video_capture_device_factory_linux_cc b/www/chromium/patches/patch-media_video_capture_linux_video_capture_device_factory_linux_cc index 5d93eb57ac5..8eb710974c2 100644 --- a/www/chromium/patches/patch-media_video_capture_linux_video_capture_device_factory_linux_cc +++ b/www/chromium/patches/patch-media_video_capture_linux_video_capture_device_factory_linux_cc @@ -1,35 +1,216 @@ -$OpenBSD: patch-media_video_capture_linux_video_capture_device_factory_linux_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ ---- media/video/capture/linux/video_capture_device_factory_linux.cc.orig.port Wed Mar 11 07:45:18 2015 -+++ media/video/capture/linux/video_capture_device_factory_linux.cc Wed Mar 11 07:45:58 2015 -@@ -131,10 +131,7 @@ void VideoCaptureDeviceFactoryLinux::GetDeviceSupporte - for (; HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FRAMESIZES, - &frame_size)) == 0; - ++frame_size.index) { -- if (frame_size.type == V4L2_FRMSIZE_TYPE_DISCRETE) { -- supported_format.frame_size.SetSize( -- frame_size.discrete.width, frame_size.discrete.height); -- } else if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE || -+ if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE || - frame_size.type == V4L2_FRMSIZE_TYPE_CONTINUOUS) { - // TODO(mcasas): see http://crbug.com/249953, support these devices. - NOTIMPLEMENTED(); -@@ -142,18 +139,11 @@ void VideoCaptureDeviceFactoryLinux::GetDeviceSupporte +$OpenBSD: patch-media_video_capture_linux_video_capture_device_factory_linux_cc,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- media/video/capture/linux/video_capture_device_factory_linux.cc.orig.port Wed Apr 15 09:35:25 2015 ++++ media/video/capture/linux/video_capture_device_factory_linux.cc Thu Apr 23 08:48:13 2015 +@@ -24,105 +24,21 @@ + + namespace media { + +-static bool HasUsableFormats(int fd, uint32 capabilities) { ++static bool HasUsableFormats(int fd) { + const std::list& usable_fourccs = + VideoCaptureDeviceLinux::GetListOfUsableFourCCs(false); + +- static const struct { +- int capability; +- v4l2_buf_type buf_type; +- } kCapabilityAndBufferTypes[] = { +- {V4L2_CAP_VIDEO_CAPTURE, V4L2_BUF_TYPE_VIDEO_CAPTURE}, +- {V4L2_CAP_VIDEO_CAPTURE_MPLANE, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE} +- }; +- +- for (const auto& capability_and_buffer_type : kCapabilityAndBufferTypes) { +- v4l2_fmtdesc fmtdesc = {}; +- if (capabilities & capability_and_buffer_type.capability) { +- fmtdesc.type = capability_and_buffer_type.buf_type; +- for (; HANDLE_EINTR(ioctl(fd, VIDIOC_ENUM_FMT, &fmtdesc)) == 0; +- ++fmtdesc.index) { +- if (std::find(usable_fourccs.begin(), usable_fourccs.end(), +- fmtdesc.pixelformat) != usable_fourccs.end()) +- return true; +- } +- } ++ v4l2_fmtdesc fmtdesc = {}; ++ fmtdesc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; ++ for (; HANDLE_EINTR(ioctl(fd, VIDIOC_ENUM_FMT, &fmtdesc)) == 0; ++ ++fmtdesc.index) { ++ if (std::find(usable_fourccs.begin(), usable_fourccs.end(), ++ fmtdesc.pixelformat) != usable_fourccs.end()) ++ return true; + } + return false; + } + +-static std::list GetFrameRateList(int fd, +- uint32 fourcc, +- uint32 width, +- uint32 height) { +- std::list frame_rates; +- +- v4l2_frmivalenum frame_interval = {}; +- frame_interval.pixel_format = fourcc; +- frame_interval.width = width; +- frame_interval.height = height; +- for (; HANDLE_EINTR(ioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, +- &frame_interval)) == 0; ++frame_interval.index) { +- if (frame_interval.type == V4L2_FRMIVAL_TYPE_DISCRETE) { +- if (frame_interval.discrete.numerator != 0) { +- frame_rates.push_back(frame_interval.discrete.denominator / +- static_cast(frame_interval.discrete.numerator)); +- } +- } else if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS || +- frame_interval.type == V4L2_FRMIVAL_TYPE_STEPWISE) { +- // TODO(mcasas): see http://crbug.com/249953, support these devices. +- NOTIMPLEMENTED(); +- break; +- } +- } +- // Some devices, e.g. Kinect, do not enumerate any frame rates, see +- // http://crbug.com/412284. Set their frame_rate to zero. +- if (frame_rates.empty()) +- frame_rates.push_back(0); +- return frame_rates; +-} +- +-static void GetSupportedFormatsForV4L2BufferType( +- int fd, +- v4l2_buf_type buf_type, +- media::VideoCaptureFormats* supported_formats) { +- v4l2_fmtdesc v4l2_format = {}; +- v4l2_format.type = buf_type; +- for (; HANDLE_EINTR(ioctl(fd, VIDIOC_ENUM_FMT, &v4l2_format)) == 0; +- ++v4l2_format.index) { +- VideoCaptureFormat supported_format; +- supported_format.pixel_format = +- VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( +- v4l2_format.pixelformat); +- +- if (supported_format.pixel_format == PIXEL_FORMAT_UNKNOWN) +- continue; +- +- v4l2_frmsizeenum frame_size = {}; +- frame_size.pixel_format = v4l2_format.pixelformat; +- for (; HANDLE_EINTR(ioctl(fd, VIDIOC_ENUM_FRAMESIZES, &frame_size)) == 0; +- ++frame_size.index) { +- if (frame_size.type == V4L2_FRMSIZE_TYPE_DISCRETE) { +- supported_format.frame_size.SetSize(frame_size.discrete.width, +- frame_size.discrete.height); +- } else if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE || +- frame_size.type == V4L2_FRMSIZE_TYPE_CONTINUOUS) { +- // TODO(mcasas): see http://crbug.com/249953, support these devices. +- NOTIMPLEMENTED(); +- } +- +- const std::list frame_rates = GetFrameRateList( +- fd, v4l2_format.pixelformat, frame_size.discrete.width, +- frame_size.discrete.height); +- for (const auto& frame_rate : frame_rates) { +- supported_format.frame_rate = frame_rate; +- supported_formats->push_back(supported_format); +- DVLOG(1) << supported_format.ToString(); +- } +- } +- } +-} +- + VideoCaptureDeviceFactoryLinux::VideoCaptureDeviceFactoryLinux( + scoped_refptr ui_task_runner) + : ui_task_runner_(ui_task_runner) { +@@ -147,7 +63,7 @@ scoped_ptr VideoCaptureDeviceFacto + // allocates the camera. + base::ScopedFD fd(HANDLE_EINTR(open(device_name.id().c_str(), O_RDONLY))); + if (!fd.is_valid()) { +- DLOG(ERROR) << "Cannot open device"; ++ DVLOG(1) << "Cannot open device"; + delete self; + return scoped_ptr(); + } +@@ -177,14 +93,11 @@ void VideoCaptureDeviceFactoryLinux::GetDeviceNames( + // http://crbug.com/139356. + v4l2_capability cap; + if ((HANDLE_EINTR(ioctl(fd.get(), VIDIOC_QUERYCAP, &cap)) == 0) && +- ((cap.capabilities & V4L2_CAP_VIDEO_CAPTURE || +- cap.capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE) && +- !(cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) && +- !(cap.capabilities & V4L2_CAP_VIDEO_OUTPUT_MPLANE)) && +- HasUsableFormats(fd.get(), cap.capabilities)) { +- VideoCaptureDevice::Name device_name(base::StringPrintf("%s", cap.card), +- unique_id); +- device_names->push_back(device_name); ++ (cap.capabilities & V4L2_CAP_VIDEO_CAPTURE && ++ !(cap.capabilities & V4L2_CAP_VIDEO_OUTPUT)) && ++ HasUsableFormats(fd.get())) { ++ device_names->push_front(VideoCaptureDevice::Name( ++ base::StringPrintf("%s", cap.card), unique_id)); + } + } + } +@@ -200,10 +113,65 @@ void VideoCaptureDeviceFactoryLinux::GetDeviceSupporte + return; + supported_formats->clear(); + +- const v4l2_buf_type kCaptureTypes[] = {V4L2_BUF_TYPE_VIDEO_CAPTURE, +- V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE}; +- for (const auto& buf_type : kCaptureTypes) +- GetSupportedFormatsForV4L2BufferType(fd.get(), buf_type, supported_formats); ++ // Retrieve the caps one by one, first get pixel format, then sizes, then ++ // frame rates. ++ v4l2_fmtdesc pixel_format = {}; ++ pixel_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; ++ for (; HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FMT, &pixel_format)) == 0; ++ ++pixel_format.index) { ++ VideoCaptureFormat supported_format; ++ supported_format.pixel_format = ++ VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( ++ pixel_format.pixelformat); ++ if (supported_format.pixel_format == PIXEL_FORMAT_UNKNOWN) ++ continue; ++ ++ v4l2_frmsizeenum frame_size = {}; ++ frame_size.pixel_format = pixel_format.pixelformat; ++ for (; HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FRAMESIZES, ++ &frame_size)) == 0; ++ ++frame_size.index) { ++ if (frame_size.type == V4L2_FRMSIZE_TYPE_DISCRETE) { ++ supported_format.frame_size.SetSize( ++ frame_size.discrete.width, frame_size.discrete.height); ++ } else if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE || ++ frame_size.type == V4L2_FRMSIZE_TYPE_CONTINUOUS) { ++ // TODO(mcasas): see http://crbug.com/249953, support these devices. ++ NOTIMPLEMENTED(); ++ } ++ ++ v4l2_frmivalenum frame_interval = {}; ++ frame_interval.pixel_format = pixel_format.pixelformat; ++ frame_interval.width = frame_size.discrete.width; ++ frame_interval.height = frame_size.discrete.height; ++ std::list frame_rates; ++ for (; HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FRAMEINTERVALS, ++ &frame_interval)) == 0; ++ ++frame_interval.index) { ++ if (frame_interval.type == V4L2_FRMIVAL_TYPE_DISCRETE) { ++ if (frame_interval.discrete.numerator != 0) { ++ frame_rates.push_back(frame_interval.discrete.denominator / ++ static_cast(frame_interval.discrete.numerator)); ++ } ++ } else if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS || ++ frame_interval.type == V4L2_FRMIVAL_TYPE_STEPWISE) { ++ // TODO(mcasas): see http://crbug.com/249953, support these devices. ++ NOTIMPLEMENTED(); ++ break; ++ } ++ } ++ // Some devices, e.g. Kinect, do not enumerate any frame rates, see ++ // http://crbug.com/412284. Set their frame_rate to zero. ++ if (frame_rates.empty()) ++ frame_rates.push_back(0.0f); ++ ++ for (const auto& it : frame_rates) { ++ supported_format.frame_rate = it; ++ supported_formats->push_back(supported_format); ++ DVLOG(1) << device.name() << " " << supported_format.ToString(); ++ } ++ } ++ } + return; + } - v4l2_frmivalenum frame_interval = {}; - frame_interval.pixel_format = pixel_format.pixelformat; -- frame_interval.width = frame_size.discrete.width; -- frame_interval.height = frame_size.discrete.height; - std::list frame_rates; - for (; HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FRAMEINTERVALS, - &frame_interval)) == 0; - ++frame_interval.index) { -- if (frame_interval.type == V4L2_FRMIVAL_TYPE_DISCRETE) { -- if (frame_interval.discrete.numerator != 0) { -- frame_rates.push_back(frame_interval.discrete.denominator / -- static_cast(frame_interval.discrete.numerator)); -- } -- } else if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS || -+ if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS || - frame_interval.type == V4L2_FRMIVAL_TYPE_STEPWISE) { - // TODO(mcasas): see http://crbug.com/249953, support these devices. - NOTIMPLEMENTED(); diff --git a/www/chromium/patches/patch-net_base_net_util_linux_cc b/www/chromium/patches/patch-net_base_net_util_linux_cc index 783b3be23f5..2d9c1bdaa59 100644 --- a/www/chromium/patches/patch-net_base_net_util_linux_cc +++ b/www/chromium/patches/patch-net_base_net_util_linux_cc @@ -1,7 +1,23 @@ -$OpenBSD: patch-net_base_net_util_linux_cc,v 1.1 2015/03/21 14:11:19 robert Exp $ ---- net/base/net_util_linux.cc.orig.port Fri Mar 20 04:21:23 2015 -+++ net/base/net_util_linux.cc Sat Mar 21 12:14:10 2015 -@@ -33,6 +33,7 @@ namespace { +$OpenBSD: patch-net_base_net_util_linux_cc,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- net/base/net_util_linux.cc.orig.port Wed Apr 15 09:36:13 2015 ++++ net/base/net_util_linux.cc Wed Apr 15 15:52:35 2015 +@@ -4,12 +4,14 @@ + + #include "net/base/net_util_linux.h" + +-#if !defined(OS_ANDROID) ++#if !defined(OS_ANDROID) && !defined(OS_BSD) + #include + #endif // !defined(OS_ANDROID) ++#if !defined(OS_BSD) + #include + #include + #include ++#endif + #include + #include + #include +@@ -39,6 +41,7 @@ namespace { // application layer. bool TryConvertNativeToNetIPAttributes(int native_attributes, int* net_attributes) { @@ -9,7 +25,7 @@ $OpenBSD: patch-net_base_net_util_linux_cc,v 1.1 2015/03/21 14:11:19 robert Exp // For Linux/ChromeOS/Android, we disallow addresses with attributes // IFA_F_OPTIMISTIC, IFA_F_DADFAILED, and IFA_F_TENTATIVE as these // are still progressing through duplicated address detection (DAD) -@@ -55,6 +56,9 @@ bool TryConvertNativeToNetIPAttributes(int native_attr +@@ -61,6 +64,9 @@ bool TryConvertNativeToNetIPAttributes(int native_attr } return true; @@ -19,23 +35,49 @@ $OpenBSD: patch-net_base_net_util_linux_cc,v 1.1 2015/03/21 14:11:19 robert Exp } } // namespace -@@ -69,6 +73,7 @@ inline const unsigned char* GetIPAddressData(const IPA - #endif +@@ -79,6 +85,7 @@ inline const unsigned char* GetIPAddressData(const IPA + // or ethtool extensions. + NetworkChangeNotifier::ConnectionType GetInterfaceConnectionType( + const std::string& ifname) { ++#if !defined(OS_BSD) + base::ScopedFD s(socket(AF_INET, SOCK_STREAM, 0)); + if (!s.is_valid()) + return NetworkChangeNotifier::CONNECTION_UNKNOWN; +@@ -99,11 +106,13 @@ NetworkChangeNotifier::ConnectionType GetInterfaceConn + if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1) + return NetworkChangeNotifier::CONNECTION_ETHERNET; + #endif // !defined(OS_ANDROID) ++#endif + + return NetworkChangeNotifier::CONNECTION_UNKNOWN; + } + + std::string GetInterfaceSSID(const std::string& ifname) { ++#if !defined(OS_BSD) + base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0)); + if (!ioctl_socket.is_valid()) + return ""; +@@ -115,9 +124,11 @@ std::string GetInterfaceSSID(const std::string& ifname + wreq.u.essid.length = IW_ESSID_MAX_SIZE; + if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1) + return ssid; ++#endif + return ""; } +#if !defined(OS_BSD) bool GetNetworkListImpl( NetworkInterfaceList* networks, int policy, -@@ -136,6 +141,7 @@ bool GetNetworkListImpl( +@@ -186,6 +197,7 @@ bool GetNetworkListImpl( return true; } +#endif - } // namespace internal - -@@ -143,12 +149,16 @@ bool GetNetworkList(NetworkInterfaceList* networks, in + std::string GetWifiSSIDFromInterfaceListInternal( + const NetworkInterfaceList& interfaces, +@@ -210,12 +222,16 @@ bool GetNetworkList(NetworkInterfaceList* networks, in if (networks == NULL) return false; @@ -43,12 +85,12 @@ $OpenBSD: patch-net_base_net_util_linux_cc,v 1.1 2015/03/21 14:11:19 robert Exp internal::AddressTrackerLinux tracker; tracker.Init(); - return internal::GetNetworkListImpl(networks, policy, - tracker.GetOnlineLinks(), - tracker.GetAddressMap(), &if_indextoname); + return internal::GetNetworkListImpl( + networks, policy, tracker.GetOnlineLinks(), tracker.GetAddressMap(), + &internal::AddressTrackerLinux::GetInterfaceName); +#else + return false; +#endif } - } // namespace net + std::string GetWifiSSID() { diff --git a/www/chromium/patches/patch-net_disk_cache_blockfile_disk_format_h b/www/chromium/patches/patch-net_disk_cache_blockfile_disk_format_h index 2363a812d1c..52a398bb123 100644 --- a/www/chromium/patches/patch-net_disk_cache_blockfile_disk_format_h +++ b/www/chromium/patches/patch-net_disk_cache_blockfile_disk_format_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-net_disk_cache_blockfile_disk_format_h,v 1.1 2014/05/24 15:27:34 robert Exp $ ---- net/disk_cache/blockfile/disk_format.h.orig.port Thu May 22 21:53:41 2014 -+++ net/disk_cache/blockfile/disk_format.h Thu May 22 21:53:54 2014 +$OpenBSD: patch-net_disk_cache_blockfile_disk_format_h,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- net/disk_cache/blockfile/disk_format.h.orig.port Wed Apr 15 09:37:17 2015 ++++ net/disk_cache/blockfile/disk_format.h Wed Apr 15 09:37:35 2015 @@ -146,7 +146,9 @@ struct RankingsNode { }; #pragma pack(pop) +#if !defined(OS_BSD) - COMPILE_ASSERT(sizeof(RankingsNode) == 36, bad_RankingsNode); + static_assert(sizeof(RankingsNode) == 36, "bad RankingsNode"); +#endif } // namespace disk_cache diff --git a/www/chromium/patches/patch-net_http_http_network_session_cc b/www/chromium/patches/patch-net_http_http_network_session_cc index f887e3421b1..453109bf5a7 100644 --- a/www/chromium/patches/patch-net_http_http_network_session_cc +++ b/www/chromium/patches/patch-net_http_http_network_session_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_http_http_network_session_cc,v 1.4 2013/09/29 19:04:04 robert Exp $ ---- net/http/http_network_session.cc.orig.port Wed Sep 18 10:14:07 2013 -+++ net/http/http_network_session.cc Sun Sep 22 16:09:42 2013 -@@ -12,7 +12,9 @@ +$OpenBSD: patch-net_http_http_network_session_cc,v 1.5 2015/04/27 16:38:25 robert Exp $ +--- net/http/http_network_session.cc.orig.port Wed Apr 15 00:31:22 2015 ++++ net/http/http_network_session.cc Wed Apr 15 08:32:50 2015 +@@ -13,7 +13,9 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/values.h" diff --git a/www/chromium/patches/patch-net_net_gypi b/www/chromium/patches/patch-net_net_gypi index a36b10b465d..c248689e9c2 100644 --- a/www/chromium/patches/patch-net_net_gypi +++ b/www/chromium/patches/patch-net_net_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_net_gypi,v 1.6 2015/03/18 19:26:29 robert Exp $ ---- net/net.gypi.orig.port Tue Mar 10 23:41:41 2015 -+++ net/net.gypi Wed Mar 11 07:22:50 2015 -@@ -188,8 +188,6 @@ +$OpenBSD: patch-net_net_gypi,v 1.7 2015/04/27 16:38:25 robert Exp $ +--- net/net.gypi.orig.port Wed Apr 15 00:31:22 2015 ++++ net/net.gypi Wed Apr 15 08:32:50 2015 +@@ -187,8 +187,6 @@ 'android/network_change_notifier_factory_android.h', 'android/network_library.cc', 'android/network_library.h', diff --git a/www/chromium/patches/patch-net_udp_udp_socket_libevent_cc b/www/chromium/patches/patch-net_udp_udp_socket_libevent_cc index c80f8f59eb5..021f32ccbaf 100644 --- a/www/chromium/patches/patch-net_udp_udp_socket_libevent_cc +++ b/www/chromium/patches/patch-net_udp_udp_socket_libevent_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_udp_udp_socket_libevent_cc,v 1.4 2015/03/18 19:26:29 robert Exp $ ---- net/udp/udp_socket_libevent.cc.orig.port Tue Mar 10 23:41:42 2015 -+++ net/udp/udp_socket_libevent.cc Wed Mar 11 07:22:50 2015 -@@ -37,7 +37,7 @@ const int kBindRetries = 10; +$OpenBSD: patch-net_udp_udp_socket_libevent_cc,v 1.5 2015/04/27 16:38:25 robert Exp $ +--- net/udp/udp_socket_libevent.cc.orig.port Wed Apr 15 00:31:23 2015 ++++ net/udp/udp_socket_libevent.cc Wed Apr 15 08:32:50 2015 +@@ -36,7 +36,7 @@ const int kBindRetries = 10; const int kPortStart = 1024; const int kPortEnd = 65535; @@ -10,7 +10,7 @@ $OpenBSD: patch-net_udp_udp_socket_libevent_cc,v 1.4 2015/03/18 19:26:29 robert // Returns IPv4 address in network order. int GetIPv4AddressFromIndex(int socket, uint32 index, uint32* address){ -@@ -553,7 +553,7 @@ int UDPSocketLibevent::SetMulticastOptions() { +@@ -547,7 +547,7 @@ int UDPSocketLibevent::SetMulticastOptions() { if (multicast_interface_ != 0) { switch (addr_family_) { case AF_INET: { @@ -19,7 +19,7 @@ $OpenBSD: patch-net_udp_udp_socket_libevent_cc,v 1.4 2015/03/18 19:26:29 robert ip_mreqn mreq; mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = htonl(INADDR_ANY); -@@ -628,7 +628,7 @@ int UDPSocketLibevent::JoinGroup(const IPAddressNumber +@@ -622,7 +622,7 @@ int UDPSocketLibevent::JoinGroup(const IPAddressNumber if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; diff --git a/www/chromium/patches/patch-pdf_pdf_gyp b/www/chromium/patches/patch-pdf_pdf_gyp deleted file mode 100644 index 1f1aec19cb5..00000000000 --- a/www/chromium/patches/patch-pdf_pdf_gyp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-pdf_pdf_gyp,v 1.2 2014/10/13 06:49:19 robert Exp $ ---- pdf/pdf.gyp.orig.port Thu Oct 2 19:19:00 2014 -+++ pdf/pdf.gyp Fri Oct 10 16:10:31 2014 -@@ -109,7 +109,7 @@ - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="openbsd"', { - 'configurations': { - 'Release_Base': { - #'cflags': [ '-fno-weak',], # get rid of symbols that strip doesn't remove. -@@ -124,7 +124,7 @@ - ], - 'conditions': [ - # CrOS has a separate step to do this. -- ['OS=="linux" and chromeos==0', -+ ['(OS=="linux" or OS=="openbsd") and chromeos==0', - { 'targets': [ - { - 'target_name': 'pdf_linux_symbols', diff --git a/www/chromium/patches/patch-pdf_pdfium_pdfium_engine_cc b/www/chromium/patches/patch-pdf_pdfium_pdfium_engine_cc new file mode 100644 index 00000000000..7b752882ccc --- /dev/null +++ b/www/chromium/patches/patch-pdf_pdfium_pdfium_engine_cc @@ -0,0 +1,48 @@ +$OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- pdf/pdfium/pdfium_engine.cc.orig.port Thu Apr 23 11:26:23 2015 ++++ pdf/pdfium/pdfium_engine.cc Thu Apr 23 11:26:42 2015 +@@ -126,7 +126,7 @@ std::vector GetPageNumbersFromPrintPageNumbe + return page_numbers; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + + PP_Instance g_last_instance_id; + +@@ -559,7 +559,7 @@ pp::VarDictionary TraverseBookmarks(FPDF_DOCUMENT doc, + bool InitializeSDK() { + FPDF_InitLibrary(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Font loading doesn't work in the renderer sandbox in Linux. + FPDF_SetSystemFontInfo(&g_font_info); + #endif +@@ -1461,7 +1461,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPDF( + FPDF_ClosePage(pdf_page); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + #endif + +@@ -2823,7 +2823,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index + DCHECK_LT(static_cast(progressive_index), progressive_paints_.size()); + DCHECK(image_data); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + #endif + +@@ -3279,7 +3279,7 @@ void PDFiumEngine::SetCurrentPage(int index) { + FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE); + } + most_visible_page_ = index; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + #endif + if (most_visible_page_ != -1 && called_do_document_action_) { diff --git a/www/chromium/patches/patch-remoting_remoting_host_gypi b/www/chromium/patches/patch-remoting_remoting_host_gypi index 67d5f49fa0c..ff929f74564 100644 --- a/www/chromium/patches/patch-remoting_remoting_host_gypi +++ b/www/chromium/patches/patch-remoting_remoting_host_gypi @@ -1,16 +1,16 @@ -$OpenBSD: patch-remoting_remoting_host_gypi,v 1.8 2015/03/18 19:26:29 robert Exp $ ---- remoting/remoting_host.gypi.orig.port Wed Mar 11 07:47:46 2015 -+++ remoting/remoting_host.gypi Wed Mar 11 07:53:47 2015 -@@ -12,7 +12,7 @@ - 'variables': { - 'conditions': [ - # Remoting host is supported only on Windows, OSX and Linux (with X11). -- ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', { -+ ['OS=="win" or OS=="mac" or ((OS=="linux" or os_bsd==1) and use_x11==1)', { - 'enable_me2me_host': 1, - 'enable_it2me_host': 1, - 'enable_remoting_host': 1, -@@ -60,7 +60,7 @@ +$OpenBSD: patch-remoting_remoting_host_gypi,v 1.9 2015/04/27 16:38:25 robert Exp $ +--- remoting/remoting_host.gypi.orig.port Wed Apr 15 09:38:09 2015 ++++ remoting/remoting_host.gypi Wed Apr 15 09:38:43 2015 +@@ -18,7 +18,7 @@ + 'remoting_host_win.gypi', + ], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'includes': [ + 'remoting_host_linux.gypi', + ], +@@ -56,7 +56,7 @@ '<@(remoting_host_sources)', ], 'conditions': [ @@ -19,24 +19,12 @@ $OpenBSD: patch-remoting_remoting_host_gypi,v 1.8 2015/03/18 19:26:29 robert Exp 'conditions': [ ['use_x11==1', { 'dependencies': [ -@@ -79,11 +79,6 @@ - ], - }] +@@ -657,7 +657,7 @@ + 'host/it2me/it2me_native_messaging_host_main.h', ], -- 'link_settings': { -- 'libraries': [ -- '-lpam', -- ], -- }, - }], - ['chromeos==1', { - 'dependencies' : [ -@@ -668,7 +663,7 @@ - 'host/it2me/it2me_native_messaging_host_main.h', - ], - 'conditions': [ -- ['OS=="linux" and chromeos==0 and use_ozone==0', { -+ ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_ozone==0', { - 'dependencies': [ - # Always use GTK on Linux, even for Aura builds. - '../build/linux/system.gyp:gtk', + 'conditions': [ +- ['OS=="linux" and chromeos==0 and use_ozone==0', { ++ ['(os_bsd==1 or OS=="linux") and chromeos==0 and use_ozone==0', { + 'dependencies': [ + # Always use GTK on Linux, even for Aura builds. + '../build/linux/system.gyp:gtk', diff --git a/www/chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp b/www/chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp new file mode 100644 index 00000000000..eda0a65c271 --- /dev/null +++ b/www/chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp @@ -0,0 +1,12 @@ +$OpenBSD: patch-skia_ext_SkMemory_new_handler_cpp,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- skia/ext/SkMemory_new_handler.cpp.orig.port Thu Apr 23 09:49:23 2015 ++++ skia/ext/SkMemory_new_handler.cpp Thu Apr 23 09:49:31 2015 +@@ -53,7 +53,7 @@ void* sk_malloc_throw(size_t size) { + static void* sk_malloc_nothrow(size_t size) { + // TODO(b.kelemen): we should always use UncheckedMalloc but currently it + // doesn't work as intended everywhere. +-#if defined(OS_IOS) ++#if defined(OS_IOS) || defined(OS_BSD) + return malloc(size); + #else + void* result; diff --git a/www/chromium/patches/patch-skia_skia_chrome_gypi b/www/chromium/patches/patch-skia_skia_chrome_gypi index db35a13f5ca..6710acf2930 100644 --- a/www/chromium/patches/patch-skia_skia_chrome_gypi +++ b/www/chromium/patches/patch-skia_skia_chrome_gypi @@ -1,8 +1,8 @@ -$OpenBSD: patch-skia_skia_chrome_gypi,v 1.9 2015/03/18 19:26:29 robert Exp $ ---- skia/skia_chrome.gypi.orig.port Tue Mar 10 23:41:42 2015 -+++ skia/skia_chrome.gypi Wed Mar 11 07:22:50 2015 -@@ -82,6 +82,11 @@ - 'ext/vector_platform_device_emf_win.h', +$OpenBSD: patch-skia_skia_chrome_gypi,v 1.10 2015/04/27 16:38:25 robert Exp $ +--- skia/skia_chrome.gypi.orig.port Wed Apr 15 00:18:57 2015 ++++ skia/skia_chrome.gypi Wed Apr 15 08:32:50 2015 +@@ -79,6 +79,11 @@ + 'ext/skia_utils_win.h', ], 'conditions': [ + [ 'use_cairo == 1', { diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp index 4e28ea100af..dbc79bb6cf6 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp,v 1.1 2015/03/21 14:11:19 robert Exp $ ---- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig.port Fri Mar 20 04:34:27 2015 -+++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp Sat Mar 21 13:30:34 2015 -@@ -41,7 +41,7 @@ +$OpenBSD: patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig.port Wed Apr 15 00:44:36 2015 ++++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp Wed Apr 15 08:32:50 2015 +@@ -43,7 +43,7 @@ #if defined(WTF_OS_WIN) #include diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_core_core_gyp b/www/chromium/patches/patch-third_party_WebKit_Source_core_core_gyp index c9fd9961d47..3f71c070d04 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_core_core_gyp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_core_core_gyp @@ -1,21 +1,35 @@ -$OpenBSD: patch-third_party_WebKit_Source_core_core_gyp,v 1.13 2015/03/18 19:26:29 robert Exp $ ---- third_party/WebKit/Source/core/core.gyp.orig.port Tue Mar 10 23:55:05 2015 -+++ third_party/WebKit/Source/core/core.gyp Wed Mar 11 07:22:50 2015 -@@ -589,7 +589,7 @@ +$OpenBSD: patch-third_party_WebKit_Source_core_core_gyp,v 1.14 2015/04/27 16:38:25 robert Exp $ +--- third_party/WebKit/Source/core/core.gyp.orig.port Wed Apr 15 09:38:56 2015 ++++ third_party/WebKit/Source/core/core.gyp Wed Apr 15 09:39:42 2015 +@@ -505,13 +505,13 @@ # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable. 'cflags': ['-Wno-uninitialized'], }], - ['OS != "linux"', { + ['OS != "linux" and OS != "openbsd"', { - 'sources/': [ - ['exclude', 'Linux\\.cpp$'], + 'sources!': [ + 'layout/LayoutThemeLinux.cpp', + 'layout/LayoutThemeLinux.h', ], -@@ -627,7 +627,7 @@ - ['OS=="win" and (buildtype=="Official" or (fastbuild==0 and win_z7==1))', { - 'msvs_shard': 19, }], -- ['OS != "linux"', { -+ ['OS != "linux" and OS != "openbsd"', { - 'sources/': [ - ['exclude', 'Linux\\.cpp$'], +- ['OS != "linux" and OS != "android"', { ++ ['OS != "linux" and OS != "android" and OS != "openbsd"', { + 'sources!': [ + 'layout/LayoutThemeFontProviderLinux.cpp', ], +@@ -812,13 +812,13 @@ + # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable. + 'cflags': ['-Wno-uninitialized'], + }], +- ['OS != "linux"', { ++ ['OS != "linux" and OS != "openbsd"', { + 'sources!': [ + 'layout/LayoutThemeChromiumLinux.cpp', + 'layout/LayoutThemeChromiumLinux.h', + ], + }], +- ['OS != "linux" and OS != "android"', { ++ ['OS != "linux" and OS != "android" and OS != "openbsd"', { + 'sources!': [ + 'layout/LayoutThemeChromiumFontProviderLinux.cpp', + ], diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp b/www/chromium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp index 6d854bd5550..1dcbc154800 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.8 2015/01/22 11:16:41 robert Exp $ ---- third_party/WebKit/Source/platform/blink_platform.gyp.orig.port Sat Dec 6 11:49:33 2014 -+++ third_party/WebKit/Source/platform/blink_platform.gyp Sat Dec 6 11:50:13 2014 -@@ -248,7 +248,7 @@ +$OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.9 2015/04/27 16:38:25 robert Exp $ +--- third_party/WebKit/Source/platform/blink_platform.gyp.orig.port Wed Apr 15 00:44:37 2015 ++++ third_party/WebKit/Source/platform/blink_platform.gyp Wed Apr 15 08:32:50 2015 +@@ -246,7 +246,7 @@ # compiler optimizations, see crbug.com/237063 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], 'conditions': [ @@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.8 2015 'sources/': [ # Cherry-pick files excluded by the broader regular expressions above. ['include', 'fonts/opentype/OpenTypeTypes\\.h$'], -@@ -259,7 +259,7 @@ +@@ -257,7 +257,7 @@ ], }, ], @@ -19,7 +19,7 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.8 2015 'sources/': [ ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'], ] -@@ -350,7 +350,7 @@ +@@ -345,7 +345,7 @@ ['exclude', 'scroll/ScrollbarThemeMac'], ], }], @@ -28,7 +28,7 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.8 2015 'sources/': [ ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], ], -@@ -395,7 +395,7 @@ +@@ -390,7 +390,7 @@ ['exclude', 'Android\\.cpp$'], ], }], diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp index c7742747f28..ed5723afbcb 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp,v 1.2 2015/02/22 11:33:57 robert Exp $ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig.port Fri Feb 20 05:50:09 2015 -+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp Sun Feb 22 12:21:03 2015 +$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig.port Wed Apr 15 09:39:48 2015 ++++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp Wed Apr 15 09:40:36 2015 @@ -30,7 +30,7 @@ #include "config.h" @@ -16,27 +16,18 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp, -#if !OS(WIN) && !OS(ANDROID) +#if !OS(WIN) && !OS(ANDROID) && !OS(OPENBSD) - static SkStream* streamForFontconfigInterfaceId(int fontconfigInterfaceId) + static SkStreamAsset* streamForFontconfigInterfaceId(int fontconfigInterfaceId) { SkAutoTUnref fci(SkFontConfigInterface::RefGlobal()); -@@ -131,7 +131,7 @@ PassRefPtr FontCache::fallbackFontForC - return fontDataFromFontPlatformData(&platformData, DoNotRetain); - } - --#endif // !OS(WIN) && !OS(ANDROID) -+#endif // !OS(WIN) && !OS(ANDROID) && !OS(OPENBSD) - - PassRefPtr FontCache::getLastResortFallbackFont(const FontDescription& description, ShouldRetain shouldRetain) - { -@@ -189,9 +189,11 @@ PassRefPtr FontCache::createTypeface(const - // TODO(dro): crbug.com/381620 Use creationParams.ttcIndex() after - // https://code.google.com/p/skia/issues/detail?id=1186 gets fixed. +@@ -187,9 +187,11 @@ PassRefPtr FontCache::createTypeface(const + #if !OS(WIN) && !OS(ANDROID) + if (creationParams.creationType() == CreateFontByFciIdAndTtcIndex) { SkTypeface* typeface = nullptr; +#if !OS(OPENBSD) if (Platform::current()->sandboxSupport()) - typeface = SkTypeface::CreateFromStream(streamForFontconfigInterfaceId(creationParams.fontconfigInterfaceId())); + typeface = SkTypeface::CreateFromStream(streamForFontconfigInterfaceId(creationParams.fontconfigInterfaceId()), creationParams.ttcIndex()); else +#endif - typeface = SkTypeface::CreateFromFile(creationParams.filename().data()); + typeface = SkTypeface::CreateFromFile(creationParams.filename().data(), creationParams.ttcIndex()); if (typeface) diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp new file mode 100644 index 00000000000..f9e58907996 --- /dev/null +++ b/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp @@ -0,0 +1,43 @@ +$OpenBSD: patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig.port Wed Apr 15 09:41:19 2015 ++++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp Wed Apr 22 22:49:42 2015 +@@ -14,6 +14,10 @@ + #elif defined(__GLIBC__) + extern "C" void* __libc_stack_end; // NOLINT + #endif ++#if OS(OPENBSD) ++#include ++#include ++#endif + + namespace blink { + +@@ -39,7 +43,7 @@ void StackFrameDepth::configureLimit() + + size_t StackFrameDepth::getUnderestimatedStackSize() + { +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) || OS(OPENBSD) + // We cannot get the stack size in these platforms because + // pthread_getattr_np() can fail for the main thread. + // This is OK because ThreadState::current() doesn't use the stack size +@@ -63,12 +67,18 @@ size_t StackFrameDepth::getUnderestimatedStackSize() + + void* StackFrameDepth::getStackStart() + { +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) || OS(OPENBSD) + pthread_attr_t attr; + int error; + #if OS(FREEBSD) + pthread_attr_init(&attr); + error = pthread_attr_get_np(pthread_self(), &attr); ++#elif OS(OPENBSD) ++ stack_t ss; ++ void *base; ++ error = pthread_stackseg_np(pthread_self(), &ss); ++ base = (void*)((size_t) ss.ss_sp - ss.ss_size); ++ return reinterpret_cast
(base) + ss.ss_size; + #else + error = pthread_getattr_np(pthread_self(), &attr); + #endif diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp index 6e263852fa8..e0cf3355ff9 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp @@ -1,8 +1,8 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp,v 1.5 2015/01/22 11:16:41 robert Exp $ ---- third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig.port Thu Dec 18 10:59:05 2014 -+++ third_party/WebKit/Source/platform/heap/ThreadState.cpp Fri Dec 26 18:06:47 2014 -@@ -56,7 +56,7 @@ extern "C" void* __libc_stack_end; // NOLINT - #include +$OpenBSD: patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig.port Wed Apr 15 09:40:42 2015 ++++ third_party/WebKit/Source/platform/heap/ThreadState.cpp Wed Apr 15 09:41:05 2015 +@@ -62,7 +62,7 @@ extern "C" void* __libc_stack_end; // NOLINT + #include #endif -#if OS(FREEBSD) @@ -10,23 +10,3 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp,v 1.5 20 #include #endif -@@ -64,12 +64,18 @@ namespace blink { - - static void* getStackStart() - { --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) || OS(OPENBSD) - pthread_attr_t attr; - int error; - #if OS(FREEBSD) - pthread_attr_init(&attr); - error = pthread_attr_get_np(pthread_self(), &attr); -+#elif OS(OPENBSD) -+ stack_t ss; -+ void *base; -+ error = pthread_stackseg_np(pthread_self(), &ss); -+ base = (void*)((size_t) ss.ss_sp - ss.ss_size); -+ return reinterpret_cast
(base) + ss.ss_size; - #else - error = pthread_getattr_np(pthread_self(), &attr); - #endif diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h b/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h index b3821d680be..3515b37aa95 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h +++ b/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_heap_ThreadState_h,v 1.2 2015/03/18 19:26:29 robert Exp $ ---- third_party/WebKit/Source/platform/heap/ThreadState.h.orig.port Tue Mar 10 23:55:07 2015 -+++ third_party/WebKit/Source/platform/heap/ThreadState.h Wed Mar 11 07:22:50 2015 -@@ -280,7 +280,7 @@ class PLATFORM_EXPORT ThreadState { (public) +$OpenBSD: patch-third_party_WebKit_Source_platform_heap_ThreadState_h,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- third_party/WebKit/Source/platform/heap/ThreadState.h.orig.port Wed Apr 15 00:44:37 2015 ++++ third_party/WebKit/Source/platform/heap/ThreadState.h Wed Apr 15 08:32:50 2015 +@@ -297,7 +297,7 @@ class PLATFORM_EXPORT ThreadState { (public) static ThreadState* current() { diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_web_PopupListBox_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_web_PopupListBox_cpp index 4ac22548083..3090a259cc8 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_web_PopupListBox_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_web_PopupListBox_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_web_PopupListBox_cpp,v 1.1 2015/01/22 11:16:41 robert Exp $ ---- third_party/WebKit/Source/web/PopupListBox.cpp.orig.port Fri Dec 26 18:03:24 2014 -+++ third_party/WebKit/Source/web/PopupListBox.cpp Fri Dec 26 18:03:29 2014 -@@ -434,7 +434,7 @@ void PopupListBox::paintRow(GraphicsContext* gc, const +$OpenBSD: patch-third_party_WebKit_Source_web_PopupListBox_cpp,v 1.2 2015/04/27 16:38:25 robert Exp $ +--- third_party/WebKit/Source/web/PopupListBox.cpp.orig.port Wed Apr 15 00:44:37 2015 ++++ third_party/WebKit/Source/web/PopupListBox.cpp Wed Apr 15 08:32:50 2015 +@@ -417,7 +417,7 @@ void PopupListBox::paintRow(GraphicsContext* gc, const } else { backColor = style.backgroundColor(); textColor = style.foregroundColor(); diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_web_web_gyp b/www/chromium/patches/patch-third_party_WebKit_Source_web_web_gyp index 5c23177ded0..f9911888b0d 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_web_web_gyp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_web_web_gyp @@ -1,9 +1,9 @@ -$OpenBSD: patch-third_party_WebKit_Source_web_web_gyp,v 1.7 2014/10/13 06:49:19 robert Exp $ ---- third_party/WebKit/Source/web/web.gyp.orig.port Thu Oct 2 20:00:38 2014 -+++ third_party/WebKit/Source/web/web.gyp Fri Oct 10 16:10:31 2014 -@@ -145,7 +145,7 @@ - }, - }, +$OpenBSD: patch-third_party_WebKit_Source_web_web_gyp,v 1.8 2015/04/27 16:38:25 robert Exp $ +--- third_party/WebKit/Source/web/web.gyp.orig.port Wed Apr 15 00:44:38 2015 ++++ third_party/WebKit/Source/web/web.gyp Wed Apr 15 08:32:50 2015 +@@ -163,7 +163,7 @@ + '../core/core.gyp:webcore', + ], }], - ['OS == "linux"', { + ['OS == "linux" or os_bsd == 1', { diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm index f7597ccb59c..7a48148fa0e 100644 --- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm +++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig.port Wed Mar 11 07:22:50 2015 -+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm Wed Mar 18 20:23:57 2015 -@@ -0,0 +1,1809 @@ +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm,v 1.13 2015/04/27 16:38:25 robert Exp $ +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig.port Thu Apr 23 11:58:35 2015 ++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm Sun Apr 26 12:14:42 2015 +@@ -0,0 +1,1825 @@ +%define ARCH_AARCH64 0 +%define ARCH_ALPHA 0 +%define ARCH_ARM 0 @@ -162,7 +162,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define HAVE_ASM_TYPES_H 0 +%define HAVE_CDIO_PARANOIA_H 0 +%define HAVE_CDIO_PARANOIA_PARANOIA_H 0 -+%define HAVE_CL_CL_H 0 +%define HAVE_DEV_BKTR_IOCTL_BT848_H 0 +%define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 +%define HAVE_DEV_IC_BT8XX_H 1 @@ -254,7 +253,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define HAVE_LZO1X_999_COMPRESS 0 +%define HAVE_MACH_ABSOLUTE_TIME 0 +%define HAVE_MAPVIEWOFFILE 0 -+%define HAVE_MOVEFILEEXA 0 +%define HAVE_MEMALIGN 0 +%define HAVE_MKSTEMP 1 +%define HAVE_MMAP 1 @@ -298,6 +296,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define HAVE_XFORM_ASM 0 +%define HAVE_XMM_CLOBBERS 1 +%define HAVE_CONDITION_VARIABLE_PTR 0 ++%define HAVE_DXVA_PICPARAMS_HEVC 0 +%define HAVE_SOCKLEN_T 0 +%define HAVE_STRUCT_ADDRINFO 0 +%define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -323,6 +322,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define HAVE_PERL 1 +%define HAVE_POD2MAN 1 +%define HAVE_SDL 1 ++%define HAVE_SECTION_DATA_REL_RO 0 +%define HAVE_TEXI2HTML 0 +%define HAVE_THREADS 1 +%define HAVE_VDPAU_X11 0 @@ -389,6 +389,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_LIBOPENCORE_AMRNB 0 +%define CONFIG_LIBOPENCORE_AMRWB 0 +%define CONFIG_LIBOPENCV 0 ++%define CONFIG_LIBOPENH264 0 +%define CONFIG_LIBOPENJPEG 0 +%define CONFIG_LIBOPUS 0 +%define CONFIG_LIBPULSE 0 @@ -423,6 +424,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_LIBZMQ 0 +%define CONFIG_LIBZVBI 0 +%define CONFIG_LZMA 0 ++%define CONFIG_NVENC 0 +%define CONFIG_OPENAL 0 +%define CONFIG_OPENCL 0 +%define CONFIG_OPENGL 0 @@ -911,6 +913,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_VIMA_DECODER 0 +%define CONFIG_SSA_DECODER 0 +%define CONFIG_ASS_DECODER 0 ++%define CONFIG_CCAPTION_DECODER 0 +%define CONFIG_DVBSUB_DECODER 0 +%define CONFIG_DVDSUB_DECODER 0 +%define CONFIG_JACOSUB_DECODER 0 @@ -998,6 +1001,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_DTS_DEMUXER 0 +%define CONFIG_DTSHD_DEMUXER 0 +%define CONFIG_DV_DEMUXER 0 ++%define CONFIG_DVBSUB_DEMUXER 0 +%define CONFIG_DXA_DEMUXER 0 +%define CONFIG_EA_DEMUXER 0 +%define CONFIG_EA_CDATA_DEMUXER 0 @@ -1223,6 +1227,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_MSMPEG4V2_ENCODER 0 +%define CONFIG_MSMPEG4V3_ENCODER 0 +%define CONFIG_MSVIDEO1_ENCODER 0 ++%define CONFIG_NVENC_ENCODER 0 +%define CONFIG_PAM_ENCODER 0 +%define CONFIG_PBM_ENCODER 0 +%define CONFIG_PCX_ENCODER 0 @@ -1352,6 +1357,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_LIBXAVS_ENCODER 0 +%define CONFIG_LIBXVID_ENCODER 0 +%define CONFIG_LIBAACPLUS_ENCODER 0 ++%define CONFIG_LIBOPENH264_ENCODER 0 +%define CONFIG_ADELAY_FILTER 0 +%define CONFIG_AECHO_FILTER 0 +%define CONFIG_AEVAL_FILTER 0 @@ -1420,6 +1426,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_CODECVIEW_FILTER 0 +%define CONFIG_COLORBALANCE_FILTER 0 +%define CONFIG_COLORCHANNELMIXER_FILTER 0 ++%define CONFIG_COLORLEVELS_FILTER 0 +%define CONFIG_COLORMATRIX_FILTER 0 +%define CONFIG_COPY_FILTER 0 +%define CONFIG_CROP_FILTER 0 @@ -1435,6 +1442,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_DRAWTEXT_FILTER 0 +%define CONFIG_EDGEDETECT_FILTER 0 +%define CONFIG_ELBG_FILTER 0 ++%define CONFIG_EQ_FILTER 0 +%define CONFIG_EXTRACTPLANES_FILTER 0 +%define CONFIG_FADE_FILTER 0 +%define CONFIG_FIELD_FILTER 0 @@ -1445,6 +1453,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_FRAMEPACK_FILTER 0 +%define CONFIG_FRAMESTEP_FILTER 0 +%define CONFIG_FREI0R_FILTER 0 ++%define CONFIG_FSPP_FILTER 0 +%define CONFIG_GEQ_FILTER 0 +%define CONFIG_GRADFUN_FILTER 0 +%define CONFIG_HALDCLUT_FILTER 0 @@ -1481,8 +1490,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_PHASE_FILTER 0 +%define CONFIG_PIXDESCTEST_FILTER 0 +%define CONFIG_PP_FILTER 0 ++%define CONFIG_PP7_FILTER 0 +%define CONFIG_PSNR_FILTER 0 +%define CONFIG_PULLUP_FILTER 0 ++%define CONFIG_QP_FILTER 0 +%define CONFIG_REMOVELOGO_FILTER 0 +%define CONFIG_ROTATE_FILTER 0 +%define CONFIG_SAB_FILTER 0 @@ -1496,6 +1507,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_SETSAR_FILTER 0 +%define CONFIG_SETTB_FILTER 0 +%define CONFIG_SHOWINFO_FILTER 0 ++%define CONFIG_SHOWPALETTE_FILTER 0 +%define CONFIG_SHUFFLEPLANES_FILTER 0 +%define CONFIG_SIGNALSTATS_FILTER 0 +%define CONFIG_SMARTBLUR_FILTER 0 @@ -1505,6 +1517,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_SUBTITLES_FILTER 0 +%define CONFIG_SUPER2XSAI_FILTER 0 +%define CONFIG_SWAPUV_FILTER 0 ++%define CONFIG_TBLEND_FILTER 0 +%define CONFIG_TELECINE_FILTER 0 +%define CONFIG_THUMBNAIL_FILTER 0 +%define CONFIG_TILE_FILTER 0 @@ -1512,6 +1525,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_TRANSPOSE_FILTER 0 +%define CONFIG_TRIM_FILTER 0 +%define CONFIG_UNSHARP_FILTER 0 ++%define CONFIG_USPP_FILTER 0 +%define CONFIG_VFLIP_FILTER 0 +%define CONFIG_VIDSTABDETECT_FILTER 0 +%define CONFIG_VIDSTABTRANSFORM_FILTER 0 @@ -1548,6 +1562,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_H264_VDA_HWACCEL 0 +%define CONFIG_H264_VDA_OLD_HWACCEL 0 +%define CONFIG_H264_VDPAU_HWACCEL 0 ++%define CONFIG_HEVC_DXVA2_HWACCEL 0 +%define CONFIG_MPEG1_XVMC_HWACCEL 0 +%define CONFIG_MPEG1_VDPAU_HWACCEL 0 +%define CONFIG_MPEG2_XVMC_HWACCEL 0 @@ -1693,6 +1708,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as +%define CONFIG_ROQ_MUXER 0 +%define CONFIG_RSO_MUXER 0 +%define CONFIG_RTP_MUXER 0 ++%define CONFIG_RTP_MPEGTS_MUXER 0 +%define CONFIG_RTSP_MUXER 0 +%define CONFIG_SAP_MUXER 0 +%define CONFIG_SEGMENT_MUXER 0 diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h index e5b0552b5bf..e073b901c1d 100644 --- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h +++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h @@ -1,13 +1,13 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig.port Wed Mar 11 07:22:50 2015 -+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h Wed Mar 18 20:23:51 2015 -@@ -0,0 +1,1826 @@ +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,v 1.13 2015/04/27 16:38:25 robert Exp $ +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig.port Thu Apr 23 11:58:35 2015 ++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h Sun Apr 26 12:14:42 2015 +@@ -0,0 +1,1842 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags=-O2 --arch=i686 --enable-yasm --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --cc=clang --cxx=clang++" +#define FFMPEG_LICENSE "LGPL version 2.1 or later" -+#define CONFIG_THIS_YEAR 2014 ++#define CONFIG_THIS_YEAR 2015 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" +#define CC_IDENT "clang version 3.5 (trunk)" @@ -178,7 +178,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define HAVE_ASM_TYPES_H 0 +#define HAVE_CDIO_PARANOIA_H 0 +#define HAVE_CDIO_PARANOIA_PARANOIA_H 0 -+#define HAVE_CL_CL_H 0 +#define HAVE_DEV_BKTR_IOCTL_BT848_H 0 +#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 +#define HAVE_DEV_IC_BT8XX_H 1 @@ -270,7 +269,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define HAVE_LZO1X_999_COMPRESS 0 +#define HAVE_MACH_ABSOLUTE_TIME 0 +#define HAVE_MAPVIEWOFFILE 0 -+#define HAVE_MOVEFILEEXA 0 +#define HAVE_MEMALIGN 0 +#define HAVE_MKSTEMP 1 +#define HAVE_MMAP 1 @@ -314,6 +312,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define HAVE_XFORM_ASM 0 +#define HAVE_XMM_CLOBBERS 1 +#define HAVE_CONDITION_VARIABLE_PTR 0 ++#define HAVE_DXVA_PICPARAMS_HEVC 0 +#define HAVE_SOCKLEN_T 0 +#define HAVE_STRUCT_ADDRINFO 0 +#define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -339,6 +338,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define HAVE_PERL 1 +#define HAVE_POD2MAN 1 +#define HAVE_SDL 1 ++#define HAVE_SECTION_DATA_REL_RO 0 +#define HAVE_TEXI2HTML 0 +#define HAVE_THREADS 1 +#define HAVE_VDPAU_X11 0 @@ -405,6 +405,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_LIBOPENCORE_AMRNB 0 +#define CONFIG_LIBOPENCORE_AMRWB 0 +#define CONFIG_LIBOPENCV 0 ++#define CONFIG_LIBOPENH264 0 +#define CONFIG_LIBOPENJPEG 0 +#define CONFIG_LIBOPUS 0 +#define CONFIG_LIBPULSE 0 @@ -439,6 +440,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_LIBZMQ 0 +#define CONFIG_LIBZVBI 0 +#define CONFIG_LZMA 0 ++#define CONFIG_NVENC 0 +#define CONFIG_OPENAL 0 +#define CONFIG_OPENCL 0 +#define CONFIG_OPENGL 0 @@ -927,6 +929,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_VIMA_DECODER 0 +#define CONFIG_SSA_DECODER 0 +#define CONFIG_ASS_DECODER 0 ++#define CONFIG_CCAPTION_DECODER 0 +#define CONFIG_DVBSUB_DECODER 0 +#define CONFIG_DVDSUB_DECODER 0 +#define CONFIG_JACOSUB_DECODER 0 @@ -1014,6 +1017,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_DTS_DEMUXER 0 +#define CONFIG_DTSHD_DEMUXER 0 +#define CONFIG_DV_DEMUXER 0 ++#define CONFIG_DVBSUB_DEMUXER 0 +#define CONFIG_DXA_DEMUXER 0 +#define CONFIG_EA_DEMUXER 0 +#define CONFIG_EA_CDATA_DEMUXER 0 @@ -1239,6 +1243,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_MSMPEG4V2_ENCODER 0 +#define CONFIG_MSMPEG4V3_ENCODER 0 +#define CONFIG_MSVIDEO1_ENCODER 0 ++#define CONFIG_NVENC_ENCODER 0 +#define CONFIG_PAM_ENCODER 0 +#define CONFIG_PBM_ENCODER 0 +#define CONFIG_PCX_ENCODER 0 @@ -1368,6 +1373,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_LIBXAVS_ENCODER 0 +#define CONFIG_LIBXVID_ENCODER 0 +#define CONFIG_LIBAACPLUS_ENCODER 0 ++#define CONFIG_LIBOPENH264_ENCODER 0 +#define CONFIG_ADELAY_FILTER 0 +#define CONFIG_AECHO_FILTER 0 +#define CONFIG_AEVAL_FILTER 0 @@ -1436,6 +1442,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_CODECVIEW_FILTER 0 +#define CONFIG_COLORBALANCE_FILTER 0 +#define CONFIG_COLORCHANNELMIXER_FILTER 0 ++#define CONFIG_COLORLEVELS_FILTER 0 +#define CONFIG_COLORMATRIX_FILTER 0 +#define CONFIG_COPY_FILTER 0 +#define CONFIG_CROP_FILTER 0 @@ -1451,6 +1458,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_DRAWTEXT_FILTER 0 +#define CONFIG_EDGEDETECT_FILTER 0 +#define CONFIG_ELBG_FILTER 0 ++#define CONFIG_EQ_FILTER 0 +#define CONFIG_EXTRACTPLANES_FILTER 0 +#define CONFIG_FADE_FILTER 0 +#define CONFIG_FIELD_FILTER 0 @@ -1461,6 +1469,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_FRAMEPACK_FILTER 0 +#define CONFIG_FRAMESTEP_FILTER 0 +#define CONFIG_FREI0R_FILTER 0 ++#define CONFIG_FSPP_FILTER 0 +#define CONFIG_GEQ_FILTER 0 +#define CONFIG_GRADFUN_FILTER 0 +#define CONFIG_HALDCLUT_FILTER 0 @@ -1497,8 +1506,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_PHASE_FILTER 0 +#define CONFIG_PIXDESCTEST_FILTER 0 +#define CONFIG_PP_FILTER 0 ++#define CONFIG_PP7_FILTER 0 +#define CONFIG_PSNR_FILTER 0 +#define CONFIG_PULLUP_FILTER 0 ++#define CONFIG_QP_FILTER 0 +#define CONFIG_REMOVELOGO_FILTER 0 +#define CONFIG_ROTATE_FILTER 0 +#define CONFIG_SAB_FILTER 0 @@ -1512,6 +1523,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_SETSAR_FILTER 0 +#define CONFIG_SETTB_FILTER 0 +#define CONFIG_SHOWINFO_FILTER 0 ++#define CONFIG_SHOWPALETTE_FILTER 0 +#define CONFIG_SHUFFLEPLANES_FILTER 0 +#define CONFIG_SIGNALSTATS_FILTER 0 +#define CONFIG_SMARTBLUR_FILTER 0 @@ -1521,6 +1533,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_SUBTITLES_FILTER 0 +#define CONFIG_SUPER2XSAI_FILTER 0 +#define CONFIG_SWAPUV_FILTER 0 ++#define CONFIG_TBLEND_FILTER 0 +#define CONFIG_TELECINE_FILTER 0 +#define CONFIG_THUMBNAIL_FILTER 0 +#define CONFIG_TILE_FILTER 0 @@ -1528,6 +1541,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_TRANSPOSE_FILTER 0 +#define CONFIG_TRIM_FILTER 0 +#define CONFIG_UNSHARP_FILTER 0 ++#define CONFIG_USPP_FILTER 0 +#define CONFIG_VFLIP_FILTER 0 +#define CONFIG_VIDSTABDETECT_FILTER 0 +#define CONFIG_VIDSTABTRANSFORM_FILTER 0 @@ -1564,6 +1578,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_H264_VDA_HWACCEL 0 +#define CONFIG_H264_VDA_OLD_HWACCEL 0 +#define CONFIG_H264_VDPAU_HWACCEL 0 ++#define CONFIG_HEVC_DXVA2_HWACCEL 0 +#define CONFIG_MPEG1_XVMC_HWACCEL 0 +#define CONFIG_MPEG1_VDPAU_HWACCEL 0 +#define CONFIG_MPEG2_XVMC_HWACCEL 0 @@ -1709,6 +1724,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h, +#define CONFIG_ROQ_MUXER 0 +#define CONFIG_RSO_MUXER 0 +#define CONFIG_RTP_MUXER 0 ++#define CONFIG_RTP_MPEGTS_MUXER 0 +#define CONFIG_RTSP_MUXER 0 +#define CONFIG_SAP_MUXER 0 +#define CONFIG_SEGMENT_MUXER 0 diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm index c4bafd2c80f..0a07840b309 100644 --- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig.port Wed Mar 11 07:22:50 2015 -+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm Wed Mar 11 18:40:43 2015 -@@ -0,0 +1,1809 @@ +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm,v 1.13 2015/04/27 16:38:25 robert Exp $ +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig.port Wed Apr 15 08:37:33 2015 ++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm Wed Apr 15 15:40:04 2015 +@@ -0,0 +1,1825 @@ +%define ARCH_AARCH64 0 +%define ARCH_ALPHA 0 +%define ARCH_ARM 0 @@ -162,7 +162,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define HAVE_ASM_TYPES_H 0 +%define HAVE_CDIO_PARANOIA_H 0 +%define HAVE_CDIO_PARANOIA_PARANOIA_H 0 -+%define HAVE_CL_CL_H 0 +%define HAVE_DEV_BKTR_IOCTL_BT848_H 0 +%define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 +%define HAVE_DEV_IC_BT8XX_H 1 @@ -254,7 +253,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define HAVE_LZO1X_999_COMPRESS 0 +%define HAVE_MACH_ABSOLUTE_TIME 0 +%define HAVE_MAPVIEWOFFILE 0 -+%define HAVE_MOVEFILEEXA 0 +%define HAVE_MEMALIGN 0 +%define HAVE_MKSTEMP 1 +%define HAVE_MMAP 1 @@ -298,6 +296,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define HAVE_XFORM_ASM 0 +%define HAVE_XMM_CLOBBERS 1 +%define HAVE_CONDITION_VARIABLE_PTR 0 ++%define HAVE_DXVA_PICPARAMS_HEVC 0 +%define HAVE_SOCKLEN_T 0 +%define HAVE_STRUCT_ADDRINFO 0 +%define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -323,6 +322,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define HAVE_PERL 1 +%define HAVE_POD2MAN 1 +%define HAVE_SDL 1 ++%define HAVE_SECTION_DATA_REL_RO 0 +%define HAVE_TEXI2HTML 0 +%define HAVE_THREADS 1 +%define HAVE_VDPAU_X11 0 @@ -389,6 +389,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_LIBOPENCORE_AMRNB 0 +%define CONFIG_LIBOPENCORE_AMRWB 0 +%define CONFIG_LIBOPENCV 0 ++%define CONFIG_LIBOPENH264 0 +%define CONFIG_LIBOPENJPEG 0 +%define CONFIG_LIBOPUS 0 +%define CONFIG_LIBPULSE 0 @@ -423,6 +424,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_LIBZMQ 0 +%define CONFIG_LIBZVBI 0 +%define CONFIG_LZMA 0 ++%define CONFIG_NVENC 0 +%define CONFIG_OPENAL 0 +%define CONFIG_OPENCL 0 +%define CONFIG_OPENGL 0 @@ -911,6 +913,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_VIMA_DECODER 0 +%define CONFIG_SSA_DECODER 0 +%define CONFIG_ASS_DECODER 0 ++%define CONFIG_CCAPTION_DECODER 0 +%define CONFIG_DVBSUB_DECODER 0 +%define CONFIG_DVDSUB_DECODER 0 +%define CONFIG_JACOSUB_DECODER 0 @@ -998,6 +1001,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_DTS_DEMUXER 0 +%define CONFIG_DTSHD_DEMUXER 0 +%define CONFIG_DV_DEMUXER 0 ++%define CONFIG_DVBSUB_DEMUXER 0 +%define CONFIG_DXA_DEMUXER 0 +%define CONFIG_EA_DEMUXER 0 +%define CONFIG_EA_CDATA_DEMUXER 0 @@ -1223,6 +1227,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_MSMPEG4V2_ENCODER 0 +%define CONFIG_MSMPEG4V3_ENCODER 0 +%define CONFIG_MSVIDEO1_ENCODER 0 ++%define CONFIG_NVENC_ENCODER 0 +%define CONFIG_PAM_ENCODER 0 +%define CONFIG_PBM_ENCODER 0 +%define CONFIG_PCX_ENCODER 0 @@ -1352,6 +1357,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_LIBXAVS_ENCODER 0 +%define CONFIG_LIBXVID_ENCODER 0 +%define CONFIG_LIBAACPLUS_ENCODER 0 ++%define CONFIG_LIBOPENH264_ENCODER 0 +%define CONFIG_ADELAY_FILTER 0 +%define CONFIG_AECHO_FILTER 0 +%define CONFIG_AEVAL_FILTER 0 @@ -1420,6 +1426,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_CODECVIEW_FILTER 0 +%define CONFIG_COLORBALANCE_FILTER 0 +%define CONFIG_COLORCHANNELMIXER_FILTER 0 ++%define CONFIG_COLORLEVELS_FILTER 0 +%define CONFIG_COLORMATRIX_FILTER 0 +%define CONFIG_COPY_FILTER 0 +%define CONFIG_CROP_FILTER 0 @@ -1435,6 +1442,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_DRAWTEXT_FILTER 0 +%define CONFIG_EDGEDETECT_FILTER 0 +%define CONFIG_ELBG_FILTER 0 ++%define CONFIG_EQ_FILTER 0 +%define CONFIG_EXTRACTPLANES_FILTER 0 +%define CONFIG_FADE_FILTER 0 +%define CONFIG_FIELD_FILTER 0 @@ -1445,6 +1453,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_FRAMEPACK_FILTER 0 +%define CONFIG_FRAMESTEP_FILTER 0 +%define CONFIG_FREI0R_FILTER 0 ++%define CONFIG_FSPP_FILTER 0 +%define CONFIG_GEQ_FILTER 0 +%define CONFIG_GRADFUN_FILTER 0 +%define CONFIG_HALDCLUT_FILTER 0 @@ -1481,8 +1490,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_PHASE_FILTER 0 +%define CONFIG_PIXDESCTEST_FILTER 0 +%define CONFIG_PP_FILTER 0 ++%define CONFIG_PP7_FILTER 0 +%define CONFIG_PSNR_FILTER 0 +%define CONFIG_PULLUP_FILTER 0 ++%define CONFIG_QP_FILTER 0 +%define CONFIG_REMOVELOGO_FILTER 0 +%define CONFIG_ROTATE_FILTER 0 +%define CONFIG_SAB_FILTER 0 @@ -1496,6 +1507,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_SETSAR_FILTER 0 +%define CONFIG_SETTB_FILTER 0 +%define CONFIG_SHOWINFO_FILTER 0 ++%define CONFIG_SHOWPALETTE_FILTER 0 +%define CONFIG_SHUFFLEPLANES_FILTER 0 +%define CONFIG_SIGNALSTATS_FILTER 0 +%define CONFIG_SMARTBLUR_FILTER 0 @@ -1505,6 +1517,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_SUBTITLES_FILTER 0 +%define CONFIG_SUPER2XSAI_FILTER 0 +%define CONFIG_SWAPUV_FILTER 0 ++%define CONFIG_TBLEND_FILTER 0 +%define CONFIG_TELECINE_FILTER 0 +%define CONFIG_THUMBNAIL_FILTER 0 +%define CONFIG_TILE_FILTER 0 @@ -1512,6 +1525,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_TRANSPOSE_FILTER 0 +%define CONFIG_TRIM_FILTER 0 +%define CONFIG_UNSHARP_FILTER 0 ++%define CONFIG_USPP_FILTER 0 +%define CONFIG_VFLIP_FILTER 0 +%define CONFIG_VIDSTABDETECT_FILTER 0 +%define CONFIG_VIDSTABTRANSFORM_FILTER 0 @@ -1548,6 +1562,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_H264_VDA_HWACCEL 0 +%define CONFIG_H264_VDA_OLD_HWACCEL 0 +%define CONFIG_H264_VDPAU_HWACCEL 0 ++%define CONFIG_HEVC_DXVA2_HWACCEL 0 +%define CONFIG_MPEG1_XVMC_HWACCEL 0 +%define CONFIG_MPEG1_VDPAU_HWACCEL 0 +%define CONFIG_MPEG2_XVMC_HWACCEL 0 @@ -1693,6 +1708,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +%define CONFIG_ROQ_MUXER 0 +%define CONFIG_RSO_MUXER 0 +%define CONFIG_RTP_MUXER 0 ++%define CONFIG_RTP_MPEGTS_MUXER 0 +%define CONFIG_RTSP_MUXER 0 +%define CONFIG_SAP_MUXER 0 +%define CONFIG_SEGMENT_MUXER 0 diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h index f54c7ec3611..57f05857ebb 100644 --- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h +++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h @@ -1,13 +1,13 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig.port Wed Mar 11 07:22:50 2015 -+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h Wed Mar 11 18:40:42 2015 -@@ -0,0 +1,1826 @@ +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v 1.13 2015/04/27 16:38:25 robert Exp $ +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig.port Wed Apr 15 08:37:33 2015 ++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h Wed Apr 15 15:40:04 2015 +@@ -0,0 +1,1842 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\0\0-O2\0\0' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --cc=clang --cxx=clang++" +#define FFMPEG_LICENSE "LGPL version 2.1 or later" -+#define CONFIG_THIS_YEAR 2014 ++#define CONFIG_THIS_YEAR 2015 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" +#define CC_IDENT "clang version 3.5 (trunk)" @@ -178,7 +178,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define HAVE_ASM_TYPES_H 0 +#define HAVE_CDIO_PARANOIA_H 0 +#define HAVE_CDIO_PARANOIA_PARANOIA_H 0 -+#define HAVE_CL_CL_H 0 +#define HAVE_DEV_BKTR_IOCTL_BT848_H 0 +#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 +#define HAVE_DEV_IC_BT8XX_H 1 @@ -270,7 +269,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define HAVE_LZO1X_999_COMPRESS 0 +#define HAVE_MACH_ABSOLUTE_TIME 0 +#define HAVE_MAPVIEWOFFILE 0 -+#define HAVE_MOVEFILEEXA 0 +#define HAVE_MEMALIGN 0 +#define HAVE_MKSTEMP 1 +#define HAVE_MMAP 1 @@ -314,6 +312,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define HAVE_XFORM_ASM 0 +#define HAVE_XMM_CLOBBERS 1 +#define HAVE_CONDITION_VARIABLE_PTR 0 ++#define HAVE_DXVA_PICPARAMS_HEVC 0 +#define HAVE_SOCKLEN_T 0 +#define HAVE_STRUCT_ADDRINFO 0 +#define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -339,6 +338,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define HAVE_PERL 1 +#define HAVE_POD2MAN 1 +#define HAVE_SDL 1 ++#define HAVE_SECTION_DATA_REL_RO 0 +#define HAVE_TEXI2HTML 0 +#define HAVE_THREADS 1 +#define HAVE_VDPAU_X11 0 @@ -405,6 +405,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_LIBOPENCORE_AMRNB 0 +#define CONFIG_LIBOPENCORE_AMRWB 0 +#define CONFIG_LIBOPENCV 0 ++#define CONFIG_LIBOPENH264 0 +#define CONFIG_LIBOPENJPEG 0 +#define CONFIG_LIBOPUS 0 +#define CONFIG_LIBPULSE 0 @@ -439,6 +440,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_LIBZMQ 0 +#define CONFIG_LIBZVBI 0 +#define CONFIG_LZMA 0 ++#define CONFIG_NVENC 0 +#define CONFIG_OPENAL 0 +#define CONFIG_OPENCL 0 +#define CONFIG_OPENGL 0 @@ -927,6 +929,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_VIMA_DECODER 0 +#define CONFIG_SSA_DECODER 0 +#define CONFIG_ASS_DECODER 0 ++#define CONFIG_CCAPTION_DECODER 0 +#define CONFIG_DVBSUB_DECODER 0 +#define CONFIG_DVDSUB_DECODER 0 +#define CONFIG_JACOSUB_DECODER 0 @@ -1014,6 +1017,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_DTS_DEMUXER 0 +#define CONFIG_DTSHD_DEMUXER 0 +#define CONFIG_DV_DEMUXER 0 ++#define CONFIG_DVBSUB_DEMUXER 0 +#define CONFIG_DXA_DEMUXER 0 +#define CONFIG_EA_DEMUXER 0 +#define CONFIG_EA_CDATA_DEMUXER 0 @@ -1239,6 +1243,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_MSMPEG4V2_ENCODER 0 +#define CONFIG_MSMPEG4V3_ENCODER 0 +#define CONFIG_MSVIDEO1_ENCODER 0 ++#define CONFIG_NVENC_ENCODER 0 +#define CONFIG_PAM_ENCODER 0 +#define CONFIG_PBM_ENCODER 0 +#define CONFIG_PCX_ENCODER 0 @@ -1368,6 +1373,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_LIBXAVS_ENCODER 0 +#define CONFIG_LIBXVID_ENCODER 0 +#define CONFIG_LIBAACPLUS_ENCODER 0 ++#define CONFIG_LIBOPENH264_ENCODER 0 +#define CONFIG_ADELAY_FILTER 0 +#define CONFIG_AECHO_FILTER 0 +#define CONFIG_AEVAL_FILTER 0 @@ -1436,6 +1442,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_CODECVIEW_FILTER 0 +#define CONFIG_COLORBALANCE_FILTER 0 +#define CONFIG_COLORCHANNELMIXER_FILTER 0 ++#define CONFIG_COLORLEVELS_FILTER 0 +#define CONFIG_COLORMATRIX_FILTER 0 +#define CONFIG_COPY_FILTER 0 +#define CONFIG_CROP_FILTER 0 @@ -1451,6 +1458,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_DRAWTEXT_FILTER 0 +#define CONFIG_EDGEDETECT_FILTER 0 +#define CONFIG_ELBG_FILTER 0 ++#define CONFIG_EQ_FILTER 0 +#define CONFIG_EXTRACTPLANES_FILTER 0 +#define CONFIG_FADE_FILTER 0 +#define CONFIG_FIELD_FILTER 0 @@ -1461,6 +1469,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_FRAMEPACK_FILTER 0 +#define CONFIG_FRAMESTEP_FILTER 0 +#define CONFIG_FREI0R_FILTER 0 ++#define CONFIG_FSPP_FILTER 0 +#define CONFIG_GEQ_FILTER 0 +#define CONFIG_GRADFUN_FILTER 0 +#define CONFIG_HALDCLUT_FILTER 0 @@ -1497,8 +1506,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_PHASE_FILTER 0 +#define CONFIG_PIXDESCTEST_FILTER 0 +#define CONFIG_PP_FILTER 0 ++#define CONFIG_PP7_FILTER 0 +#define CONFIG_PSNR_FILTER 0 +#define CONFIG_PULLUP_FILTER 0 ++#define CONFIG_QP_FILTER 0 +#define CONFIG_REMOVELOGO_FILTER 0 +#define CONFIG_ROTATE_FILTER 0 +#define CONFIG_SAB_FILTER 0 @@ -1512,6 +1523,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_SETSAR_FILTER 0 +#define CONFIG_SETTB_FILTER 0 +#define CONFIG_SHOWINFO_FILTER 0 ++#define CONFIG_SHOWPALETTE_FILTER 0 +#define CONFIG_SHUFFLEPLANES_FILTER 0 +#define CONFIG_SIGNALSTATS_FILTER 0 +#define CONFIG_SMARTBLUR_FILTER 0 @@ -1521,6 +1533,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_SUBTITLES_FILTER 0 +#define CONFIG_SUPER2XSAI_FILTER 0 +#define CONFIG_SWAPUV_FILTER 0 ++#define CONFIG_TBLEND_FILTER 0 +#define CONFIG_TELECINE_FILTER 0 +#define CONFIG_THUMBNAIL_FILTER 0 +#define CONFIG_TILE_FILTER 0 @@ -1528,6 +1541,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_TRANSPOSE_FILTER 0 +#define CONFIG_TRIM_FILTER 0 +#define CONFIG_UNSHARP_FILTER 0 ++#define CONFIG_USPP_FILTER 0 +#define CONFIG_VFLIP_FILTER 0 +#define CONFIG_VIDSTABDETECT_FILTER 0 +#define CONFIG_VIDSTABTRANSFORM_FILTER 0 @@ -1564,6 +1578,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_H264_VDA_HWACCEL 0 +#define CONFIG_H264_VDA_OLD_HWACCEL 0 +#define CONFIG_H264_VDPAU_HWACCEL 0 ++#define CONFIG_HEVC_DXVA2_HWACCEL 0 +#define CONFIG_MPEG1_XVMC_HWACCEL 0 +#define CONFIG_MPEG1_VDPAU_HWACCEL 0 +#define CONFIG_MPEG2_XVMC_HWACCEL 0 @@ -1709,6 +1724,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_ROQ_MUXER 0 +#define CONFIG_RSO_MUXER 0 +#define CONFIG_RTP_MUXER 0 ++#define CONFIG_RTP_MPEGTS_MUXER 0 +#define CONFIG_RTSP_MUXER 0 +#define CONFIG_SAP_MUXER 0 +#define CONFIG_SEGMENT_MUXER 0 diff --git a/www/chromium/patches/patch-third_party_libjingle_libjingle_gyp b/www/chromium/patches/patch-third_party_libjingle_libjingle_gyp index f62c4c3dfed..2084eda6bec 100644 --- a/www/chromium/patches/patch-third_party_libjingle_libjingle_gyp +++ b/www/chromium/patches/patch-third_party_libjingle_libjingle_gyp @@ -1,9 +1,9 @@ -$OpenBSD: patch-third_party_libjingle_libjingle_gyp,v 1.18 2015/03/18 19:26:29 robert Exp $ ---- third_party/libjingle/libjingle.gyp.orig.port Tue Mar 10 23:41:42 2015 -+++ third_party/libjingle/libjingle.gyp Wed Mar 11 07:22:50 2015 -@@ -490,7 +490,7 @@ - ], - }], +$OpenBSD: patch-third_party_libjingle_libjingle_gyp,v 1.19 2015/04/27 16:38:25 robert Exp $ +--- third_party/libjingle/libjingle.gyp.orig.port Wed Apr 15 00:31:23 2015 ++++ third_party/libjingle/libjingle.gyp Wed Apr 15 08:32:50 2015 +@@ -482,7 +482,7 @@ + ], + 'conditions': [ # TODO(mallinath) - Enable SCTP for iOS. - ['OS!="ios"', { + ['OS!="ios" and os_bsd!=1', { diff --git a/www/chromium/patches/patch-third_party_pdfium_core_src_fxcodec_fx_libopenjpeg_libopenjpeg20_opj_malloc_h b/www/chromium/patches/patch-third_party_pdfium_core_src_fxcodec_fx_libopenjpeg_libopenjpeg20_opj_malloc_h new file mode 100644 index 00000000000..2a6a7bb13f5 --- /dev/null +++ b/www/chromium/patches/patch-third_party_pdfium_core_src_fxcodec_fx_libopenjpeg_libopenjpeg20_opj_malloc_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_pdfium_core_src_fxcodec_fx_libopenjpeg_libopenjpeg20_opj_malloc_h,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- third_party/pdfium/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h.orig.port Sun Apr 26 12:00:47 2015 ++++ third_party/pdfium/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h Sun Apr 26 12:00:59 2015 +@@ -98,7 +98,7 @@ Allocate memory aligned to a 16 byte boundry + #else /* Not _WIN32 */ + #if defined(__sun) + #define HAVE_MEMALIGN +- #elif defined(__FreeBSD__) ++ #elif defined(__FreeBSD__) || defined(__OpenBSD__) + #define HAVE_POSIX_MEMALIGN + /* Linux x86_64 and OSX always align allocations to 16 bytes */ + #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) diff --git a/www/chromium/patches/patch-third_party_pdfium_pdfium_gyp b/www/chromium/patches/patch-third_party_pdfium_pdfium_gyp new file mode 100644 index 00000000000..510501b2c88 --- /dev/null +++ b/www/chromium/patches/patch-third_party_pdfium_pdfium_gyp @@ -0,0 +1,21 @@ +$OpenBSD: patch-third_party_pdfium_pdfium_gyp,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- third_party/pdfium/pdfium.gyp.orig.port Sun Apr 26 11:00:43 2015 ++++ third_party/pdfium/pdfium.gyp Sun Apr 26 11:00:54 2015 +@@ -2,7 +2,7 @@ + 'variables': { + 'pdf_use_skia%': 0, + 'conditions': [ +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'bundle_freetype%': 0, + }, { # On Android there's no system FreeType. On Windows and Mac, only a + # few methods are used from it. +@@ -23,7 +23,7 @@ + ['pdf_use_skia==1', { + 'defines': ['_SKIA_SUPPORT_'], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'conditions': [ + ['target_arch=="x64"', { + 'defines' : [ '_FX_CPU_=_FX_X64_', ], diff --git a/www/chromium/patches/patch-third_party_skia_gyp_ports_gyp b/www/chromium/patches/patch-third_party_skia_gyp_ports_gyp index 70f5c31c827..d2178d82516 100644 --- a/www/chromium/patches/patch-third_party_skia_gyp_ports_gyp +++ b/www/chromium/patches/patch-third_party_skia_gyp_ports_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_skia_gyp_ports_gyp,v 1.3 2015/03/18 19:26:29 robert Exp $ ---- third_party/skia/gyp/ports.gyp.orig.port Tue Mar 10 23:43:02 2015 -+++ third_party/skia/gyp/ports.gyp Wed Mar 11 07:22:50 2015 -@@ -73,11 +73,6 @@ +$OpenBSD: patch-third_party_skia_gyp_ports_gyp,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- third_party/skia/gyp/ports.gyp.orig.port Wed Apr 15 00:32:29 2015 ++++ third_party/skia/gyp/ports.gyp Wed Apr 15 08:32:50 2015 +@@ -67,11 +67,6 @@ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 'conditions': [ [ 'skia_no_fontconfig', { @@ -13,7 +13,7 @@ $OpenBSD: patch-third_party_skia_gyp_ports_gyp,v 1.3 2015/03/18 19:26:29 robert 'sources': [ '../src/ports/SkFontHost_linux.cpp', ], -@@ -85,7 +80,6 @@ +@@ -79,7 +74,6 @@ 'link_settings': { 'libraries': [ '-lfontconfig', diff --git a/www/chromium/patches/patch-third_party_webrtc_base_base_gyp b/www/chromium/patches/patch-third_party_webrtc_base_base_gyp index 108d33543a6..287cef58c4d 100644 --- a/www/chromium/patches/patch-third_party_webrtc_base_base_gyp +++ b/www/chromium/patches/patch-third_party_webrtc_base_base_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_webrtc_base_base_gyp,v 1.3 2015/03/18 19:26:29 robert Exp $ ---- third_party/webrtc/base/base.gyp.orig.port Tue Mar 10 23:42:52 2015 -+++ third_party/webrtc/base/base.gyp Wed Mar 11 07:22:50 2015 -@@ -592,8 +592,6 @@ +$OpenBSD: patch-third_party_webrtc_base_base_gyp,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- third_party/webrtc/base/base.gyp.orig.port Wed Apr 15 00:32:17 2015 ++++ third_party/webrtc/base/base.gyp Wed Apr 15 08:32:50 2015 +@@ -583,8 +583,6 @@ ['use_x11 == 1', { 'link_settings': { 'libraries': [ diff --git a/www/chromium/patches/patch-third_party_webrtc_base_httpcommon_cc b/www/chromium/patches/patch-third_party_webrtc_base_httpcommon_cc index a39c82d2d6f..ec0f0f88d7d 100644 --- a/www/chromium/patches/patch-third_party_webrtc_base_httpcommon_cc +++ b/www/chromium/patches/patch-third_party_webrtc_base_httpcommon_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_webrtc_base_httpcommon_cc,v 1.2 2014/11/19 21:27:32 robert Exp $ ---- third_party/webrtc/base/httpcommon.cc.orig.port Wed Nov 19 08:52:27 2014 -+++ third_party/webrtc/base/httpcommon.cc Wed Nov 19 08:52:42 2014 -@@ -382,7 +382,7 @@ bool HttpDateToSeconds(const std::string& date, time_t +$OpenBSD: patch-third_party_webrtc_base_httpcommon_cc,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- third_party/webrtc/base/httpcommon.cc.orig.port Wed Apr 15 00:32:17 2015 ++++ third_party/webrtc/base/httpcommon.cc Wed Apr 15 08:32:50 2015 +@@ -383,7 +383,7 @@ bool HttpDateToSeconds(const std::string& date, time_t gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; } // TODO: Android should support timezone, see b/2441195 diff --git a/www/chromium/patches/patch-third_party_webrtc_base_network_cc b/www/chromium/patches/patch-third_party_webrtc_base_network_cc index 33bcaaa94af..d1a8bfae679 100644 --- a/www/chromium/patches/patch-third_party_webrtc_base_network_cc +++ b/www/chromium/patches/patch-third_party_webrtc_base_network_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-third_party_webrtc_base_network_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ ---- third_party/webrtc/base/network.cc.orig.port Tue Mar 10 23:42:52 2015 -+++ third_party/webrtc/base/network.cc Wed Mar 11 07:22:50 2015 +$OpenBSD: patch-third_party_webrtc_base_network_cc,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- third_party/webrtc/base/network.cc.orig.port Wed Apr 15 00:32:17 2015 ++++ third_party/webrtc/base/network.cc Wed Apr 15 08:32:50 2015 @@ -18,7 +18,7 @@ // linux/if.h can't be included at the same time as the posix sys/if.h, and // it's transitively required by linux/route.h, so include that version on @@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_webrtc_base_network_cc,v 1.3 2015/03/18 19:26:29 rob #include #include #elif !defined(__native_client__) -@@ -472,7 +472,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ +@@ -535,7 +535,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ } #endif // WEBRTC_WIN @@ -19,7 +19,7 @@ $OpenBSD: patch-third_party_webrtc_base_network_cc,v 1.3 2015/03/18 19:26:29 rob bool IsDefaultRoute(const std::string& network_name) { FileStream fs; if (!fs.Open("/proc/net/route", "r", NULL)) { -@@ -514,7 +514,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo +@@ -581,7 +581,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo strncmp(network.name().c_str(), "vboxnet", 7) == 0) { return true; } diff --git a/www/chromium/patches/patch-third_party_webrtc_base_thread_checker_impl_cc b/www/chromium/patches/patch-third_party_webrtc_base_thread_checker_impl_cc new file mode 100644 index 00000000000..1897564f7e7 --- /dev/null +++ b/www/chromium/patches/patch-third_party_webrtc_base_thread_checker_impl_cc @@ -0,0 +1,17 @@ +$OpenBSD: patch-third_party_webrtc_base_thread_checker_impl_cc,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- third_party/webrtc/base/thread_checker_impl.cc.orig.port Wed Apr 15 15:47:10 2015 ++++ third_party/webrtc/base/thread_checker_impl.cc Wed Apr 15 15:49:20 2015 +@@ -27,10 +27,12 @@ PlatformThreadId CurrentThreadId() { + #elif defined(WEBRTC_POSIX) + #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) + ret = pthread_mach_thread_np(pthread_self()); +-#elif defined(WEBRTC_LINUX) ++#elif defined(WEBRTC_LINUX) && !defined(__OpenBSD__) + ret = syscall(__NR_gettid); + #elif defined(WEBRTC_ANDROID) + ret = gettid(); ++#elif defined(__OpenBSD__) ++ ret = reinterpret_cast(pthread_self()); + #else + // Default implementation for nacl and solaris. + ret = reinterpret_cast(pthread_self()); diff --git a/www/chromium/patches/patch-third_party_webrtc_build_common_gypi b/www/chromium/patches/patch-third_party_webrtc_build_common_gypi index 94d0c255fec..6a219ebd88e 100644 --- a/www/chromium/patches/patch-third_party_webrtc_build_common_gypi +++ b/www/chromium/patches/patch-third_party_webrtc_build_common_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_webrtc_build_common_gypi,v 1.17 2015/03/18 19:26:29 robert Exp $ ---- third_party/webrtc/build/common.gypi.orig.port Tue Mar 10 23:42:52 2015 -+++ third_party/webrtc/build/common.gypi Wed Mar 11 07:22:50 2015 -@@ -350,6 +350,13 @@ +$OpenBSD: patch-third_party_webrtc_build_common_gypi,v 1.18 2015/04/27 16:38:25 robert Exp $ +--- third_party/webrtc/build/common.gypi.orig.port Wed Apr 15 00:32:17 2015 ++++ third_party/webrtc/build/common.gypi Wed Apr 15 08:32:50 2015 +@@ -366,6 +366,13 @@ 'WEBRTC_LINUX', ], }], diff --git a/www/chromium/patches/patch-third_party_webrtc_system_wrappers_source_thread_posix_cc b/www/chromium/patches/patch-third_party_webrtc_system_wrappers_source_thread_posix_cc index 4b1e2eb8761..d427d87b43e 100644 --- a/www/chromium/patches/patch-third_party_webrtc_system_wrappers_source_thread_posix_cc +++ b/www/chromium/patches/patch-third_party_webrtc_system_wrappers_source_thread_posix_cc @@ -1,62 +1,26 @@ -$OpenBSD: patch-third_party_webrtc_system_wrappers_source_thread_posix_cc,v 1.4 2015/01/22 11:16:41 robert Exp $ ---- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig.port Wed Dec 3 03:32:47 2014 -+++ third_party/webrtc/system_wrappers/source/thread_posix.cc Sat Dec 6 11:34:27 2014 -@@ -51,12 +51,16 @@ - #include // strncpy +$OpenBSD: patch-third_party_webrtc_system_wrappers_source_thread_posix_cc,v 1.5 2015/04/27 16:38:25 robert Exp $ +--- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig.port Wed Apr 15 09:42:16 2015 ++++ third_party/webrtc/system_wrappers/source/thread_posix.cc Wed Apr 15 15:41:43 2015 +@@ -15,9 +15,13 @@ + #include #include #ifdef WEBRTC_LINUX -+#if defined(__OpenBSD__) -+#include -+#else ++#if !defined(__OpenBSD__) #include ++#endif #include ++#if !defined(__OpenBSD__) #include ++#endif #include #include #endif -+#endif - - #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" - #include "webrtc/system_wrappers/interface/event_wrapper.h" -@@ -136,12 +140,12 @@ ThreadPosix::ThreadPosix(ThreadRunFunction func, Threa - } - - uint32_t ThreadWrapper::GetThreadId() { --#if defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX) -+#if (defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX)) && !defined(__OpenBSD__) - return static_cast(syscall(__NR_gettid)); +@@ -138,7 +142,7 @@ void ThreadPosix::Run(ThreadPosix::InitParams* params) + if (!name_.empty()) { + // Setting the thread name may fail (harmlessly) if running inside a + // sandbox. Ignore failures if they happen. +-#if defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) ++#if (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(__OpenBSD__) + prctl(PR_SET_NAME, reinterpret_cast(name_.c_str())); #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - return pthread_mach_thread_np(pthread_self()); - #else -- return reinterpret_cast(pthread_self()); -+ return reinterpret_cast(pthread_self()); - #endif - } - -@@ -171,7 +175,7 @@ ThreadPosix::~ThreadPosix() { - delete crit_state_; - } - --#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) -+#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) && !defined(__OpenBSD__) - - bool ThreadPosix::Start(unsigned int& thread_id) - { -@@ -210,7 +214,7 @@ bool ThreadPosix::Start(unsigned int& thread_id) - - // CPU_ZERO and CPU_SET are not available in NDK r7, so disable - // SetAffinity on Android for now. --#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID))) -+#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID) && !defined(__OpenBSD__))) - bool ThreadPosix::SetAffinity(const int* processor_numbers, - const unsigned int amount_of_processors) { - if (!processor_numbers || (amount_of_processors == 0)) { -@@ -292,7 +296,7 @@ void ThreadPosix::Run() { - event_->Set(); - - if (set_thread_name_) { --#ifdef WEBRTC_LINUX -+#if defined(WEBRTC_LINUX) && !defined(__OpenBSD__) - prctl(PR_SET_NAME, (unsigned long)name_, 0, 0, 0); - #endif - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, + pthread_setname_np(name_.substr(0, 63).c_str()); 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 3b7a5d4322d..10e2f4217c6 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,6 +1,6 @@ -$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.20 2014/10/13 06:49:19 robert Exp $ ---- tools/gyp/pylib/gyp/generator/make.py.orig.port Thu Oct 2 19:40:30 2014 -+++ tools/gyp/pylib/gyp/generator/make.py Fri Oct 10 16:10:31 2014 +$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.21 2015/04/27 16:38:25 robert Exp $ +--- tools/gyp/pylib/gyp/generator/make.py.orig.port Wed Apr 15 00:32:04 2015 ++++ tools/gyp/pylib/gyp/generator/make.py Wed Apr 15 08:32:50 2015 @@ -136,7 +136,7 @@ quiet_cmd_alink = AR($(TOOLSET)) $@ cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^) @@ -19,7 +19,7 @@ $OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.20 2014/10/13 06:49:19 # Due to circular dependencies between libraries :(, we wrap the # special "figure out circular dependencies" flags around the entire -@@ -294,11 +294,11 @@ LINK ?= %(flock)s $(builddir)/linker.lock $(CXX.target +@@ -286,11 +286,11 @@ LINK ?= $(CXX.target) # 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 ?= %(CC.host)s diff --git a/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_ninja_py b/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_ninja_py index e03bc31b96a..f3dfd4407a6 100644 --- a/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_ninja_py +++ b/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_ninja_py @@ -1,12 +1,12 @@ -$OpenBSD: patch-tools_gyp_pylib_gyp_generator_ninja_py,v 1.15 2015/03/18 19:26:29 robert Exp $ ---- tools/gyp/pylib/gyp/generator/ninja.py.orig.port Tue Mar 10 23:42:29 2015 -+++ tools/gyp/pylib/gyp/generator/ninja.py Wed Mar 11 07:22:50 2015 -@@ -2029,7 +2029,7 @@ def GenerateOutputForConfig(target_list, target_dicts, +$OpenBSD: patch-tools_gyp_pylib_gyp_generator_ninja_py,v 1.16 2015/04/27 16:38:25 robert Exp $ +--- tools/gyp/pylib/gyp/generator/ninja.py.orig.port Wed Apr 15 09:42:33 2015 ++++ tools/gyp/pylib/gyp/generator/ninja.py Wed Apr 15 09:42:44 2015 +@@ -2040,7 +2040,7 @@ def GenerateOutputForConfig(target_list, target_dicts, master_ninja.rule( 'alink_thin', description='AR $out', -- command='rm -f $out && $ar rcsT $out $in') -+ command='rm -f $out && $ar rcs $out $in') +- command='rm -f $out && $ar rcsT $arflags $out $in') ++ command='rm -f $out && $ar rcs $arflags $out $in') # This allows targets that only need to depend on $lib's API to declare an # order-only dependency on $lib.TOC and avoid relinking such downstream diff --git a/www/chromium/patches/patch-ui_app_list_app_list_constants_cc b/www/chromium/patches/patch-ui_app_list_app_list_constants_cc index 0dfcaeccf7e..93bde5162e0 100644 --- a/www/chromium/patches/patch-ui_app_list_app_list_constants_cc +++ b/www/chromium/patches/patch-ui_app_list_app_list_constants_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-ui_app_list_app_list_constants_cc,v 1.6 2015/03/18 19:26:29 robert Exp $ ---- ui/app_list/app_list_constants.cc.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/app_list/app_list_constants.cc Wed Mar 11 07:22:50 2015 -@@ -118,7 +118,7 @@ const size_t kMaxFolderNameChars = 40; - const ui::ResourceBundle::FontStyle kItemTextFontStyle = - ui::ResourceBundle::SmallBoldFont; +$OpenBSD: patch-ui_app_list_app_list_constants_cc,v 1.7 2015/04/27 16:38:25 robert Exp $ +--- ui/app_list/app_list_constants.cc.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/app_list/app_list_constants.cc Wed Apr 15 08:32:50 2015 +@@ -137,7 +137,7 @@ const char kPageOpenedHistogram[] = "Apps.AppListPageO + const char kSearchResultOpenDisplayTypeHistogram[] = + "Apps.AppListSearchResultOpenDisplayType"; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/patches/patch-ui_app_list_app_list_constants_h b/www/chromium/patches/patch-ui_app_list_app_list_constants_h index 2cc9a3792c6..ff6ddaf12f8 100644 --- a/www/chromium/patches/patch-ui_app_list_app_list_constants_h +++ b/www/chromium/patches/patch-ui_app_list_app_list_constants_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-ui_app_list_app_list_constants_h,v 1.5 2015/03/18 19:26:29 robert Exp $ ---- ui/app_list/app_list_constants.h.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/app_list/app_list_constants.h Wed Mar 11 07:22:50 2015 -@@ -79,7 +79,7 @@ APP_LIST_EXPORT extern const size_t kMaxFolderNameChar - - APP_LIST_EXPORT extern const ui::ResourceBundle::FontStyle kItemTextFontStyle; +$OpenBSD: patch-ui_app_list_app_list_constants_h,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- ui/app_list/app_list_constants.h.orig.port Wed Apr 15 00:18:59 2015 ++++ ui/app_list/app_list_constants.h Wed Apr 15 08:32:50 2015 +@@ -84,7 +84,7 @@ APP_LIST_EXPORT extern const ui::ResourceBundle::FontS + APP_LIST_EXPORT extern const char kPageOpenedHistogram[]; + APP_LIST_EXPORT extern const char kSearchResultOpenDisplayTypeHistogram[]; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/patches/patch-ui_app_list_views_app_list_item_view_cc b/www/chromium/patches/patch-ui_app_list_views_app_list_item_view_cc index 7b92fe1d0fb..85d6c7c0dbd 100644 --- a/www/chromium/patches/patch-ui_app_list_views_app_list_item_view_cc +++ b/www/chromium/patches/patch-ui_app_list_views_app_list_item_view_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_app_list_views_app_list_item_view_cc,v 1.5 2015/03/18 19:26:29 robert Exp $ ---- ui/app_list/views/app_list_item_view.cc.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/app_list/views/app_list_item_view.cc Wed Mar 11 07:22:50 2015 -@@ -67,7 +67,7 @@ gfx::FontList GetFontList() { +$OpenBSD: patch-ui_app_list_views_app_list_item_view_cc,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- ui/app_list/views/app_list_item_view.cc.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/app_list/views/app_list_item_view.cc Wed Apr 15 08:32:50 2015 +@@ -68,7 +68,7 @@ gfx::FontList GetFontList() { const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle); // The font is different on each platform. The font size is adjusted on some // platforms to keep a consistent look. diff --git a/www/chromium/patches/patch-ui_app_list_views_app_list_view_cc b/www/chromium/patches/patch-ui_app_list_views_app_list_view_cc index 0172bfdfb04..a231542fc01 100644 --- a/www/chromium/patches/patch-ui_app_list_views_app_list_view_cc +++ b/www/chromium/patches/patch-ui_app_list_views_app_list_view_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_app_list_views_app_list_view_cc,v 1.6 2015/03/18 19:26:29 robert Exp $ ---- ui/app_list/views/app_list_view.cc.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/app_list/views/app_list_view.cc Wed Mar 11 07:22:50 2015 -@@ -75,7 +75,7 @@ bool SupportsShadow() { +$OpenBSD: patch-ui_app_list_views_app_list_view_cc,v 1.7 2015/04/27 16:38:25 robert Exp $ +--- ui/app_list/views/app_list_view.cc.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/app_list/views/app_list_view.cc Wed Apr 15 08:32:50 2015 +@@ -76,7 +76,7 @@ bool SupportsShadow() { ::switches::kDisableDwmComposition)) { return false; } @@ -10,7 +10,7 @@ $OpenBSD: patch-ui_app_list_views_app_list_view_cc,v 1.6 2015/03/18 19:26:29 rob // Shadows are not supported on (non-ChromeOS) Linux. return false; #endif -@@ -549,7 +549,7 @@ void AppListView::OnBeforeBubbleWidgetInit( +@@ -618,7 +618,7 @@ void AppListView::OnBeforeBubbleWidgetInit( // the taskbar for these versions of Windows. if (base::win::GetVersion() >= base::win::VERSION_WIN7) params->force_show_in_taskbar = true; diff --git a/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc b/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc index 13406c3870e..522ba57fd67 100644 --- a/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc +++ b/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_base_resource_resource_bundle_cc,v 1.9 2015/03/18 19:26:29 robert Exp $ ---- ui/base/resource/resource_bundle.cc.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/base/resource/resource_bundle.cc Wed Mar 11 07:22:50 2015 -@@ -628,7 +628,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +$OpenBSD: patch-ui_base_resource_resource_bundle_cc,v 1.10 2015/04/27 16:38:25 robert Exp $ +--- ui/base/resource/resource_bundle.cc.orig.port Wed Apr 15 00:18:59 2015 ++++ ui/base/resource/resource_bundle.cc Wed Apr 15 08:32:50 2015 +@@ -611,7 +611,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele #elif defined(OS_CHROMEOS) // TODO(oshima): Include 200P only if the device support 200P supported_scale_factors.push_back(SCALE_FACTOR_200P); diff --git a/www/chromium/patches/patch-ui_base_ui_base_gyp b/www/chromium/patches/patch-ui_base_ui_base_gyp index cd4175e106b..7b74fc0a0e5 100644 --- a/www/chromium/patches/patch-ui_base_ui_base_gyp +++ b/www/chromium/patches/patch-ui_base_ui_base_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_base_ui_base_gyp,v 1.5 2015/03/18 19:26:29 robert Exp $ ---- ui/base/ui_base.gyp.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/base/ui_base.gyp Wed Mar 11 07:22:50 2015 -@@ -471,7 +471,7 @@ +$OpenBSD: patch-ui_base_ui_base_gyp,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- ui/base/ui_base.gyp.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/base/ui_base.gyp Wed Apr 15 08:32:50 2015 +@@ -393,7 +393,7 @@ 'x/selection_utils.h', ] }], diff --git a/www/chromium/patches/patch-ui_base_webui_web_ui_util_cc b/www/chromium/patches/patch-ui_base_webui_web_ui_util_cc index 4ae2ef1466e..f38b637ed01 100644 --- a/www/chromium/patches/patch-ui_base_webui_web_ui_util_cc +++ b/www/chromium/patches/patch-ui_base_webui_web_ui_util_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_base_webui_web_ui_util_cc,v 1.3 2015/03/18 19:26:29 robert Exp $ ---- ui/base/webui/web_ui_util.cc.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/base/webui/web_ui_util.cc Wed Mar 11 07:22:50 2015 -@@ -143,7 +143,7 @@ std::string GetFontFamily() { +$OpenBSD: patch-ui_base_webui_web_ui_util_cc,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- ui/base/webui/web_ui_util.cc.orig.port Wed Apr 15 00:18:59 2015 ++++ ui/base/webui/web_ui_util.cc Wed Apr 15 08:32:50 2015 +@@ -174,7 +174,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 diff --git a/www/chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc b/www/chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc index c3fda69bc5b..7ba9c874d5b 100644 --- a/www/chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc +++ b/www/chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_events_devices_x11_device_data_manager_x11_cc,v 1.2 2015/03/18 19:26:29 robert Exp $ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/events/devices/x11/device_data_manager_x11.cc Wed Mar 11 07:22:50 2015 -@@ -681,6 +681,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +$OpenBSD: patch-ui_events_devices_x11_device_data_manager_x11_cc,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- ui/events/devices/x11/device_data_manager_x11.cc.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/events/devices/x11/device_data_manager_x11.cc Wed Apr 15 08:32:50 2015 +@@ -685,6 +685,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(unsigned int deviceid) { @@ -10,7 +10,7 @@ $OpenBSD: patch-ui_events_devices_x11_device_data_manager_x11_cc,v 1.2 2015/03/1 blocked_devices_.set(deviceid, true); // TODO(rsadam@): Support blocking touchscreen devices. std::vector keyboards = keyboard_devices(); -@@ -694,6 +696,7 @@ void DeviceDataManagerX11::DisableDevice(unsigned int +@@ -698,6 +700,7 @@ void DeviceDataManagerX11::DisableDevice(unsigned int keyboards.erase(it); DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); } diff --git a/www/chromium/patches/patch-ui_gl_generate_bindings_py b/www/chromium/patches/patch-ui_gl_generate_bindings_py index 6393bbc2fd3..3e3a0a97321 100644 --- a/www/chromium/patches/patch-ui_gl_generate_bindings_py +++ b/www/chromium/patches/patch-ui_gl_generate_bindings_py @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_gl_generate_bindings_py,v 1.2 2015/03/18 19:26:29 robert Exp $ ---- ui/gl/generate_bindings.py.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/gl/generate_bindings.py Wed Mar 11 07:22:50 2015 -@@ -1595,6 +1595,9 @@ GLX_FUNCTIONS = [ +$OpenBSD: patch-ui_gl_generate_bindings_py,v 1.3 2015/04/27 16:38:25 robert Exp $ +--- ui/gl/generate_bindings.py.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/gl/generate_bindings.py Wed Apr 15 08:32:50 2015 +@@ -1524,6 +1524,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32* numerator, ' 'int32* denominator' }, diff --git a/www/chromium/patches/patch-ui_gl_gl_bindings_api_autogen_glx_h b/www/chromium/patches/patch-ui_gl_gl_bindings_api_autogen_glx_h new file mode 100644 index 00000000000..f42b92487cf --- /dev/null +++ b/www/chromium/patches/patch-ui_gl_gl_bindings_api_autogen_glx_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-ui_gl_gl_bindings_api_autogen_glx_h,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- ui/gl/gl_bindings_api_autogen_glx.h.orig.port Thu Apr 23 10:58:18 2015 ++++ ui/gl/gl_bindings_api_autogen_glx.h Thu Apr 23 10:58:25 2015 +@@ -84,6 +84,7 @@ bool glXGetMscRateOMLFn(Display* dpy, + GLXDrawable drawable, + int32* numerator, + int32* denominator) override; ++__GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) override; + void glXGetSelectedEventFn(Display* dpy, + GLXDrawable drawable, + unsigned long* mask) override; diff --git a/www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc b/www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc new file mode 100644 index 00000000000..7646d6258ad --- /dev/null +++ b/www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc @@ -0,0 +1,184 @@ +$OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- ui/gl/gl_bindings_autogen_glx.cc.orig.port Thu Apr 23 10:58:18 2015 ++++ ui/gl/gl_bindings_autogen_glx.cc Thu Apr 23 10:58:25 2015 +@@ -74,6 +74,7 @@ void DriverGLX::InitializeStaticBindings() { + fn.glXGetFBConfigsFn = reinterpret_cast( + GetGLProcAddress("glXGetFBConfigs")); + fn.glXGetMscRateOMLFn = 0; ++ fn.glXGetProcAddressARBFn = 0; + fn.glXGetSelectedEventFn = reinterpret_cast( + GetGLProcAddress("glXGetSelectedEvent")); + fn.glXGetSyncValuesOMLFn = 0; +@@ -118,6 +119,8 @@ void DriverGLX::InitializeStaticBindings() { + + ext.b_GLX_ARB_create_context = + extensions.find("GLX_ARB_create_context ") != std::string::npos; ++ ext.b_GLX_ARB_get_proc_address = ++ extensions.find("GLX_ARB_get_proc_address ") != std::string::npos; + ext.b_GLX_EXT_swap_control = + extensions.find("GLX_EXT_swap_control ") != std::string::npos; + ext.b_GLX_EXT_texture_from_pixmap = +@@ -170,6 +173,13 @@ void DriverGLX::InitializeStaticBindings() { + DCHECK(fn.glXGetMscRateOMLFn); + } + ++ debug_fn.glXGetProcAddressARBFn = 0; ++ if (ext.b_GLX_ARB_get_proc_address) { ++ fn.glXGetProcAddressARBFn = reinterpret_cast( ++ GetGLProcAddress("glXGetProcAddressARB")); ++ DCHECK(fn.glXGetProcAddressARBFn); ++ } ++ + debug_fn.glXGetSyncValuesOMLFn = 0; + if (ext.b_GLX_OML_sync_control) { + fn.glXGetSyncValuesOMLFn = reinterpret_cast( +@@ -268,8 +278,8 @@ static void GL_BINDING_CALL Debug_glXCopySubBufferMESA + << "(" << static_cast(dpy) << ", " << drawable + << ", " << x << ", " << y << ", " << width << ", " << height + << ")"); +- g_driver_glx.debug_fn.glXCopySubBufferMESAFn(dpy, drawable, x, y, width, +- height); ++ g_driver_glx.debug_fn.glXCopySubBufferMESAFn( ++ dpy, drawable, x, y, width, height); + } + + static GLXContext GL_BINDING_CALL Debug_glXCreateContext(Display* dpy, +@@ -474,8 +484,8 @@ static int GL_BINDING_CALL Debug_glXGetFBConfigAttrib( + << "(" << static_cast(dpy) << ", " << config + << ", " << attribute << ", " << static_cast(value) + << ")"); +- int result = g_driver_glx.debug_fn.glXGetFBConfigAttribFn(dpy, config, +- attribute, value); ++ int result = g_driver_glx.debug_fn.glXGetFBConfigAttribFn( ++ dpy, config, attribute, value); + GL_SERVICE_LOG("GL_RESULT: " << result); + return result; + } +@@ -516,6 +526,16 @@ static bool GL_BINDING_CALL Debug_glXGetMscRateOML(Dis + return result; + } + ++static __GLXextFuncPtr GL_BINDING_CALL ++Debug_glXGetProcAddressARB(const GLubyte* procName) { ++ GL_SERVICE_LOG("glXGetProcAddressARB" ++ << "(" << static_cast(procName) << ")"); ++ __GLXextFuncPtr result = ++ g_driver_glx.debug_fn.glXGetProcAddressARBFn(procName); ++ GL_SERVICE_LOG("GL_RESULT: " << result); ++ return result; ++} ++ + static void GL_BINDING_CALL Debug_glXGetSelectedEvent(Display* dpy, + GLXDrawable drawable, + unsigned long* mask) { +@@ -831,6 +851,10 @@ void DriverGLX::InitializeDebugBindings() { + debug_fn.glXGetMscRateOMLFn = fn.glXGetMscRateOMLFn; + fn.glXGetMscRateOMLFn = Debug_glXGetMscRateOML; + } ++ if (!debug_fn.glXGetProcAddressARBFn) { ++ debug_fn.glXGetProcAddressARBFn = fn.glXGetProcAddressARBFn; ++ fn.glXGetProcAddressARBFn = Debug_glXGetProcAddressARB; ++ } + if (!debug_fn.glXGetSelectedEventFn) { + debug_fn.glXGetSelectedEventFn = fn.glXGetSelectedEventFn; + fn.glXGetSelectedEventFn = Debug_glXGetSelectedEvent; +@@ -918,9 +942,7 @@ void DriverGLX::InitializeDebugBindings() { + g_debugBindingsInitialized = true; + } + +-void DriverGLX::ClearBindings() { +- memset(this, 0, sizeof(*this)); +-} ++void DriverGLX::ClearBindings() { memset(this, 0, sizeof(*this)); } + + void GLXApiBase::glXBindTexImageEXTFn(Display* dpy, + GLXDrawable drawable, +@@ -970,8 +992,8 @@ GLXContext GLXApiBase::glXCreateContextAttribsARBFn(Di + GLXContext share_context, + int direct, + const int* attrib_list) { +- return driver_->fn.glXCreateContextAttribsARBFn(dpy, config, share_context, +- direct, attrib_list); ++ return driver_->fn.glXCreateContextAttribsARBFn( ++ dpy, config, share_context, direct, attrib_list); + } + + GLXPixmap GLXApiBase::glXCreateGLXPixmapFn(Display* dpy, +@@ -985,8 +1007,8 @@ GLXContext GLXApiBase::glXCreateNewContextFn(Display* + int renderType, + GLXContext shareList, + int direct) { +- return driver_->fn.glXCreateNewContextFn(dpy, config, renderType, shareList, +- direct); ++ return driver_->fn.glXCreateNewContextFn( ++ dpy, config, renderType, shareList, direct); + } + + GLXPbuffer GLXApiBase::glXCreatePbufferFn(Display* dpy, +@@ -1082,6 +1104,10 @@ bool GLXApiBase::glXGetMscRateOMLFn(Display* dpy, + return driver_->fn.glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); + } + ++__GLXextFuncPtr GLXApiBase::glXGetProcAddressARBFn(const GLubyte* procName) { ++ return driver_->fn.glXGetProcAddressARBFn(procName); ++} ++ + void GLXApiBase::glXGetSelectedEventFn(Display* dpy, + GLXDrawable drawable, + unsigned long* mask) { +@@ -1180,9 +1206,7 @@ void GLXApiBase::glXUseXFontFn(Font font, int first, i + driver_->fn.glXUseXFontFn(font, first, count, list); + } + +-void GLXApiBase::glXWaitGLFn(void) { +- driver_->fn.glXWaitGLFn(); +-} ++void GLXApiBase::glXWaitGLFn(void) { driver_->fn.glXWaitGLFn(); } + + int GLXApiBase::glXWaitVideoSyncSGIFn(int divisor, + int remainder, +@@ -1190,9 +1214,7 @@ int GLXApiBase::glXWaitVideoSyncSGIFn(int divisor, + return driver_->fn.glXWaitVideoSyncSGIFn(divisor, remainder, count); + } + +-void GLXApiBase::glXWaitXFn(void) { +- driver_->fn.glXWaitXFn(); +-} ++void GLXApiBase::glXWaitXFn(void) { driver_->fn.glXWaitXFn(); } + + void TraceGLXApi::glXBindTexImageEXTFn(Display* dpy, + GLXDrawable drawable, +@@ -1249,8 +1271,8 @@ GLXContext TraceGLXApi::glXCreateContextAttribsARBFn(D + int direct, + const int* attrib_list) { + TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXCreateContextAttribsARB") +- return glx_api_->glXCreateContextAttribsARBFn(dpy, config, share_context, +- direct, attrib_list); ++ return glx_api_->glXCreateContextAttribsARBFn( ++ dpy, config, share_context, direct, attrib_list); + } + + GLXPixmap TraceGLXApi::glXCreateGLXPixmapFn(Display* dpy, +@@ -1266,8 +1288,8 @@ GLXContext TraceGLXApi::glXCreateNewContextFn(Display* + GLXContext shareList, + int direct) { + TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXCreateNewContext") +- return glx_api_->glXCreateNewContextFn(dpy, config, renderType, shareList, +- direct); ++ return glx_api_->glXCreateNewContextFn( ++ dpy, config, renderType, shareList, direct); + } + + GLXPbuffer TraceGLXApi::glXCreatePbufferFn(Display* dpy, +@@ -1380,6 +1402,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy, + int32* denominator) { + TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXGetMscRateOML") + return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); ++} ++ ++__GLXextFuncPtr TraceGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) { ++ TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXGetProcAddressARB") ++ return glx_api_->glXGetProcAddressARBFn(procName); + } + + void TraceGLXApi::glXGetSelectedEventFn(Display* dpy, diff --git a/www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_h b/www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_h new file mode 100644 index 00000000000..a6afbc4b5fa --- /dev/null +++ b/www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_h @@ -0,0 +1,45 @@ +$OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_h,v 1.1 2015/04/27 16:38:25 robert Exp $ +--- ui/gl/gl_bindings_autogen_glx.h.orig.port Thu Apr 23 10:58:18 2015 ++++ ui/gl/gl_bindings_autogen_glx.h Thu Apr 23 10:58:25 2015 +@@ -102,6 +102,8 @@ typedef bool(GL_BINDING_CALL* glXGetMscRateOMLProc)(Di + GLXDrawable drawable, + int32* numerator, + int32* denominator); ++typedef __GLXextFuncPtr(GL_BINDING_CALL* glXGetProcAddressARBProc)( ++ const GLubyte* procName); + typedef void(GL_BINDING_CALL* glXGetSelectedEventProc)(Display* dpy, + GLXDrawable drawable, + unsigned long* mask); +@@ -164,6 +166,7 @@ typedef void(GL_BINDING_CALL* glXWaitXProc)(void); + + struct ExtensionsGLX { + bool b_GLX_ARB_create_context; ++ bool b_GLX_ARB_get_proc_address; + bool b_GLX_EXT_swap_control; + bool b_GLX_EXT_texture_from_pixmap; + bool b_GLX_MESA_copy_sub_buffer; +@@ -201,6 +204,7 @@ struct ProcsGLX { + glXGetFBConfigFromVisualSGIXProc glXGetFBConfigFromVisualSGIXFn; + glXGetFBConfigsProc glXGetFBConfigsFn; + glXGetMscRateOMLProc glXGetMscRateOMLFn; ++ glXGetProcAddressARBProc glXGetProcAddressARBFn; + glXGetSelectedEventProc glXGetSelectedEventFn; + glXGetSyncValuesOMLProc glXGetSyncValuesOMLFn; + glXGetVisualFromFBConfigProc glXGetVisualFromFBConfigFn; +@@ -306,6 +310,7 @@ class GL_EXPORT GLXApi { + GLXDrawable drawable, + int32* numerator, + int32* denominator) = 0; ++ virtual __GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) = 0; + virtual void glXGetSelectedEventFn(Display* dpy, + GLXDrawable drawable, + unsigned long* mask) = 0; +@@ -394,6 +399,8 @@ class GL_EXPORT GLXApi { + ::gfx::g_current_glx_context->glXGetFBConfigFromVisualSGIXFn + #define glXGetFBConfigs ::gfx::g_current_glx_context->glXGetFBConfigsFn + #define glXGetMscRateOML ::gfx::g_current_glx_context->glXGetMscRateOMLFn ++#define glXGetProcAddressARB \ ++ ::gfx::g_current_glx_context->glXGetProcAddressARBFn + #define glXGetSelectedEvent ::gfx::g_current_glx_context->glXGetSelectedEventFn + #define glXGetSyncValuesOML ::gfx::g_current_glx_context->glXGetSyncValuesOMLFn + #define glXGetVisualFromFBConfig \ diff --git a/www/chromium/patches/patch-ui_gl_gl_gyp b/www/chromium/patches/patch-ui_gl_gl_gyp index a2c297a3d1a..b8985a3c5ef 100644 --- a/www/chromium/patches/patch-ui_gl_gl_gyp +++ b/www/chromium/patches/patch-ui_gl_gl_gyp @@ -1,8 +1,8 @@ -$OpenBSD: patch-ui_gl_gl_gyp,v 1.12 2015/03/18 19:26:29 robert Exp $ ---- ui/gl/gl.gyp.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/gl/gl.gyp Thu Mar 12 15:48:02 2015 -@@ -169,7 +169,7 @@ - }, +$OpenBSD: patch-ui_gl_gl_gyp,v 1.13 2015/04/27 16:38:25 robert Exp $ +--- ui/gl/gl.gyp.orig.port Wed Apr 15 09:42:48 2015 ++++ ui/gl/gl.gyp Wed Apr 15 09:43:08 2015 +@@ -121,7 +121,7 @@ + 'sync_control_vsync_provider.h', ], 'conditions': [ - ['OS in ("win", "android", "linux")', { @@ -10,19 +10,10 @@ $OpenBSD: patch-ui_gl_gl_gyp,v 1.12 2015/03/18 19:26:29 robert Exp $ 'sources': [ 'egl_util.cc', 'egl_util.h', -@@ -188,7 +188,7 @@ +@@ -142,13 +142,13 @@ '<(DEPTH)/third_party/khronos', ], }], -- ['OS in ("win", "linux")', { -+ ['OS in ("win", "linux", "openbsd")', { - 'sources': [ - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', -@@ -208,13 +208,13 @@ - 'gl_bindings_autogen_gl_android.h', - ], - }], - ['OS in ("android", "linux")', { + ['OS in ("android", "linux", "openbsd")', { 'sources': [ diff --git a/www/chromium/patches/patch-ui_resources_ui_resources_grd b/www/chromium/patches/patch-ui_resources_ui_resources_grd index 9277ba5b6ab..0e6ffeeda8f 100644 --- a/www/chromium/patches/patch-ui_resources_ui_resources_grd +++ b/www/chromium/patches/patch-ui_resources_ui_resources_grd @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_resources_ui_resources_grd,v 1.3 2015/03/18 19:26:29 robert Exp $ ---- ui/resources/ui_resources.grd.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/resources/ui_resources.grd Wed Mar 11 07:22:50 2015 -@@ -37,7 +37,7 @@ +$OpenBSD: patch-ui_resources_ui_resources_grd,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- ui/resources/ui_resources.grd.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/resources/ui_resources.grd Wed Apr 15 08:32:50 2015 +@@ -36,7 +36,7 @@ diff --git a/www/chromium/patches/patch-ui_views_bubble_bubble_delegate_cc b/www/chromium/patches/patch-ui_views_bubble_bubble_delegate_cc index 5602638abf9..fb78e0b17f7 100644 --- a/www/chromium/patches/patch-ui_views_bubble_bubble_delegate_cc +++ b/www/chromium/patches/patch-ui_views_bubble_bubble_delegate_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_views_bubble_bubble_delegate_cc,v 1.3 2014/10/13 06:49:19 robert Exp $ ---- ui/views/bubble/bubble_delegate.cc.orig.port Thu Oct 2 19:19:03 2014 -+++ ui/views/bubble/bubble_delegate.cc Fri Oct 10 16:10:31 2014 -@@ -101,7 +101,7 @@ Widget* BubbleDelegateView::CreateBubble(BubbleDelegat +$OpenBSD: patch-ui_views_bubble_bubble_delegate_cc,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- ui/views/bubble/bubble_delegate.cc.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/views/bubble/bubble_delegate.cc Wed Apr 15 08:32:50 2015 +@@ -104,7 +104,7 @@ Widget* BubbleDelegateView::CreateBubble(BubbleDelegat // the parent frame and let DWM handle compositing. If not, then we don't // want to allow the bubble to extend the frame because it will be clipped. bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled()); diff --git a/www/chromium/patches/patch-ui_views_controls_button_label_button_cc b/www/chromium/patches/patch-ui_views_controls_button_label_button_cc index 791e643e58f..bdb7091d583 100644 --- a/www/chromium/patches/patch-ui_views_controls_button_label_button_cc +++ b/www/chromium/patches/patch-ui_views_controls_button_label_button_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-ui_views_controls_button_label_button_cc,v 1.3 2014/10/13 06:49:19 robert Exp $ ---- ui/views/controls/button/label_button.cc.orig.port Thu Oct 2 19:19:03 2014 -+++ ui/views/controls/button/label_button.cc Fri Oct 10 16:10:31 2014 +$OpenBSD: patch-ui_views_controls_button_label_button_cc,v 1.4 2015/04/27 16:38:25 robert Exp $ +--- ui/views/controls/button/label_button.cc.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/views/controls/button/label_button.cc Wed Apr 15 08:32:50 2015 @@ -16,7 +16,7 @@ #include "ui/views/painter.h" #include "ui/views/window/dialog_delegate.h" @@ -19,7 +19,7 @@ $OpenBSD: patch-ui_views_controls_button_label_button_cc,v 1.3 2014/10/13 06:49: // Default text and shadow colors for STYLE_BUTTON. const SkColor kStyleButtonTextColor = SK_ColorBLACK; const SkColor kStyleButtonShadowColor = SK_ColorWHITE; -@@ -399,7 +399,7 @@ void LabelButton::ResetColorsFromNativeTheme() { +@@ -405,7 +405,7 @@ void LabelButton::ResetColorsFromNativeTheme() { // confusion. These details should either be pushed into ui::NativeThemeWin // or should be obsoleted by rendering buttons with paint calls instead of // with static assets. http://crbug.com/350498 @@ -28,7 +28,7 @@ $OpenBSD: patch-ui_views_controls_button_label_button_cc,v 1.3 2014/10/13 06:49: constant_text_color = true; colors[STATE_NORMAL] = kStyleButtonTextColor; label_->SetBackgroundColor(theme->GetSystemColor( -@@ -436,7 +436,7 @@ void LabelButton::UpdateThemedBorder() { +@@ -442,7 +442,7 @@ void LabelButton::UpdateThemedBorder() { scoped_ptr label_button_border = CreateDefaultBorder(); diff --git a/www/chromium/patches/patch-ui_views_controls_textfield_textfield_cc b/www/chromium/patches/patch-ui_views_controls_textfield_textfield_cc index d82bde70c47..ac32b5dd6dd 100644 --- a/www/chromium/patches/patch-ui_views_controls_textfield_textfield_cc +++ b/www/chromium/patches/patch-ui_views_controls_textfield_textfield_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.7 2015/03/18 19:26:29 robert Exp $ ---- ui/views/controls/textfield/textfield.cc.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/views/controls/textfield/textfield.cc Wed Mar 11 07:22:50 2015 +$OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.8 2015/04/27 16:38:25 robert Exp $ +--- ui/views/controls/textfield/textfield.cc.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/views/controls/textfield/textfield.cc Wed Apr 15 08:32:50 2015 @@ -41,7 +41,7 @@ #include "base/win/win_util.h" #endif @@ -37,7 +37,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.7 2015/03/18 19:26: // Convert a custom text edit |command| to the equivalent views command ID. int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) { const bool select = command.extend_selection(); -@@ -611,7 +611,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -612,7 +612,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e OnAfterUserAction(); } @@ -46,7 +46,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.7 2015/03/18 19:26: if (event.IsOnlyMiddleMouseButton()) { if (GetRenderText()->IsPointInSelection(event.location())) { OnBeforeUserAction(); -@@ -674,7 +674,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -678,7 +678,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -55,7 +55,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.7 2015/03/18 19:26: ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector commands; -@@ -799,7 +799,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -805,7 +805,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -64,7 +64,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.7 2015/03/18 19:26: // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1053,7 +1053,7 @@ void Textfield::WriteDragDataForView(View* sender, +@@ -1061,7 +1061,7 @@ void Textfield::WriteDragDataForView(View* sender, scoped_ptr canvas( GetCanvasForDragImage(GetWidget(), label.size())); label.SetEnabledColor(GetTextColor()); @@ -73,7 +73,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.7 2015/03/18 19:26: // Desktop Linux Aura does not yet support transparency in drag images. canvas->DrawColor(GetBackgroundColor()); #endif -@@ -1842,7 +1842,7 @@ void Textfield::CreateTouchSelectionControllerAndNotif +@@ -1855,7 +1855,7 @@ void Textfield::CreateTouchSelectionControllerAndNotif } void Textfield::UpdateSelectionClipboard() const { diff --git a/www/chromium/patches/patch-ui_views_views_gyp b/www/chromium/patches/patch-ui_views_views_gyp index aa5b78ebfb4..6793314bbe1 100644 --- a/www/chromium/patches/patch-ui_views_views_gyp +++ b/www/chromium/patches/patch-ui_views_views_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_views_views_gyp,v 1.6 2015/03/18 19:26:29 robert Exp $ ---- ui/views/views.gyp.orig.port Tue Mar 10 23:41:42 2015 -+++ ui/views/views.gyp Wed Mar 11 07:22:50 2015 -@@ -625,7 +625,7 @@ +$OpenBSD: patch-ui_views_views_gyp,v 1.7 2015/04/27 16:38:25 robert Exp $ +--- ui/views/views.gyp.orig.port Wed Apr 15 00:31:23 2015 ++++ ui/views/views.gyp Thu Apr 23 09:00:31 2015 +@@ -631,7 +631,7 @@ '../display/display.gyp:display_util', ], }], @@ -10,3 +10,12 @@ $OpenBSD: patch-ui_views_views_gyp,v 1.6 2015/03/18 19:26:29 robert Exp $ 'dependencies': [ '../shell_dialogs/shell_dialogs.gyp:shell_dialogs', ], +@@ -696,7 +696,7 @@ + ['use_aura and chromeos == 0', { + 'sources': [ '<@(views_desktop_aura_sources)' ], + 'conditions': [ +- ['OS == "linux"', { ++ ['OS == "linux" or os_bsd==1', { + 'sources': [ '<@(views_desktop_aura_linux_sources)' ], + }], + ['use_x11 == 1', { diff --git a/www/chromium/patches/patch-v8_src_base_macros_h b/www/chromium/patches/patch-v8_src_base_macros_h deleted file mode 100644 index a46435ae523..00000000000 --- a/www/chromium/patches/patch-v8_src_base_macros_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-v8_src_base_macros_h,v 1.3 2015/01/22 11:16:41 robert Exp $ ---- v8/src/base/macros.h.orig.port Wed Dec 3 03:33:20 2014 -+++ v8/src/base/macros.h Sat Dec 6 11:34:27 2014 -@@ -333,7 +333,7 @@ inline void USE(T) { } - # define V8_INTPTR_C(x) (x ## LL) - # define V8_PTR_PREFIX "I64" - #elif V8_HOST_ARCH_64_BIT --# if V8_OS_MACOSX -+# if V8_OS_MACOSX || defined(__OpenBSD__) - # define V8_UINT64_C(x) (x ## ULL) - # define V8_INT64_C(x) (x ## LL) - # else diff --git a/www/chromium/patches/patch-v8_src_base_platform_platform-posix_cc b/www/chromium/patches/patch-v8_src_base_platform_platform-posix_cc index 0bd6dbc1dbf..c0792697118 100644 --- a/www/chromium/patches/patch-v8_src_base_platform_platform-posix_cc +++ b/www/chromium/patches/patch-v8_src_base_platform_platform-posix_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-v8_src_base_platform_platform-posix_cc,v 1.5 2015/04/03 10:32:04 robert Exp $ ---- v8/src/base/platform/platform-posix.cc.orig.port Fri Apr 3 08:03:05 2015 -+++ v8/src/base/platform/platform-posix.cc Fri Apr 3 08:03:35 2015 -@@ -262,6 +262,8 @@ int OS::GetCurrentThreadId() { - return static_cast(gettid()); +$OpenBSD: patch-v8_src_base_platform_platform-posix_cc,v 1.6 2015/04/27 16:38:25 robert Exp $ +--- v8/src/base/platform/platform-posix.cc.orig.port Wed Apr 15 00:32:36 2015 ++++ v8/src/base/platform/platform-posix.cc Wed Apr 15 08:32:50 2015 +@@ -275,6 +275,8 @@ int OS::GetCurrentThreadId() { + return static_cast(thread_self()); #elif V8_OS_SOLARIS return static_cast(pthread_self()); +#elif V8_OS_OPENBSD diff --git a/www/chromium/pkg/PLIST b/www/chromium/pkg/PLIST index c455e5da56e..4355e791751 100644 --- a/www/chromium/pkg/PLIST +++ b/www/chromium/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.47 2015/03/18 19:26:29 robert Exp $ +@comment $OpenBSD: PLIST,v 1.48 2015/04/27 16:38:25 robert Exp $ @pkgpath www/chromium,proprietary bin/chrome chrome/ @@ -9,7 +9,6 @@ chrome/icudtl.dat chrome/keyboard_resources.pak chrome/libexif.so chrome/libffmpegsumo.so -${I386_DISABLE}chrome/libpdf.so chrome/locales/ chrome/locales/am.pak chrome/locales/ar.pak @@ -75,7 +74,6 @@ chrome/resources/extension/demo/library.js chrome/resources/inspector/ chrome/resources/inspector/Images/ chrome/resources/inspector/Images/applicationCache.png -chrome/resources/inspector/Images/back.png chrome/resources/inspector/Images/breakpoint.png chrome/resources/inspector/Images/breakpointConditional.png chrome/resources/inspector/Images/breakpointConditional_2x.png @@ -147,6 +145,7 @@ chrome/resources/inspector/Images/touchCursor_2x.png chrome/resources/inspector/InspectorBackendCommands.js chrome/resources/inspector/SupportedCSSProperties.js chrome/resources/inspector/audits_module.js +chrome/resources/inspector/components_lazy_module.js chrome/resources/inspector/console_module.js chrome/resources/inspector/devices_module.js chrome/resources/inspector/devtools.css @@ -172,6 +171,7 @@ chrome/resources/inspector/timeline_module.js chrome/resources/inspector/toolbox.css chrome/resources/inspector/toolbox.html chrome/resources/inspector/toolbox.js +chrome/resources/inspector/ui_lazy_module.js @man man/man1/chrome.1 share/applications/chromium-browser.desktop share/icons/hicolor/128x128/apps/chrome.png