From 8f5ce5387d1c3f57fa18640a86870b232128f2ec Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 27 Oct 2016 18:30:40 +0000 Subject: [PATCH] update to 54.0 --- www/iridium/Makefile | 131 ++---- www/iridium/distinfo | 4 +- www/iridium/files/audio_manager_openbsd.cc | 40 +- www/iridium/files/audio_manager_openbsd.h | 20 +- www/iridium/files/sndio_input.h | 8 +- www/iridium/files/sndio_output.cc | 1 - www/iridium/files/sndio_output.h | 2 +- www/iridium/patches/patch-BUILD_gn | 87 ++++ www/iridium/patches/patch-apps_apps_gypi | 11 - ...tch-apps_ui_views_app_window_frame_view_cc | 2 +- ...ch-ash_display_mirror_window_controller_cc | 6 +- www/iridium/patches/patch-ash_shell_cc | 12 + www/iridium/patches/patch-base_BUILD_gn | 32 ++ www/iridium/patches/patch-base_atomicops_h | 2 +- www/iridium/patches/patch-base_base_gypi | 22 - .../patches/patch-base_base_paths_posix_cc | 14 +- .../patch-base_debug_debugger_posix_cc | 2 +- .../patches/patch-base_debug_stack_trace_h | 2 +- .../patch-base_debug_stack_trace_posix_cc | 12 +- www/iridium/patches/patch-base_linux_util_cc | 12 + .../patch-base_message_loop_message_loop_cc | 12 - .../patch-base_native_library_posix_cc | 12 + ...tch-base_posix_unix_domain_socket_linux_cc | 2 +- .../patches/patch-base_process_launch_h | 8 +- .../patches/patch-base_process_memory_cc | 19 +- ...tch-base_process_process_handle_openbsd_cc | 2 +- ...h-base_process_process_iterator_openbsd_cc | 2 +- .../patch-base_process_process_metrics_h | 8 +- ...ch-base_process_process_metrics_openbsd_cc | 22 +- .../patch-base_process_process_posix_cc | 12 +- .../patches/patch-base_sys_info_openbsd_cc | 20 +- .../patches/patch-base_sys_info_posix_cc | 8 +- ...h-base_third_party_libevent_event-config_h | 12 + ...base_third_party_libevent_openbsd_config_h | 280 +++++++++++++ ...hird_party_libevent_openbsd_event-config_h | 288 +++++++++++++ ...ch-base_third_party_symbolize_symbolize_cc | 12 + ...ch-base_threading_platform_thread_linux_cc | 23 +- ...ch-base_threading_platform_thread_posix_cc | 8 +- ...h-base_trace_event_malloc_dump_provider_cc | 22 + ...ch-base_trace_event_process_memory_dump_cc | 8 +- www/iridium/patches/patch-build_all_gyp | 11 - www/iridium/patches/patch-build_common_gypi | 107 ----- .../patches/patch-build_config_BUILDCONFIG_gn | 104 +++++ .../patches/patch-build_config_BUILD_gn | 12 + .../patches/patch-build_config_allocator_gni | 12 + .../patch-build_config_compiler_BUILD_gn | 47 +++ .../patch-build_config_compiler_compiler_gni | 12 + .../patches/patch-build_config_features_gni | 21 + .../patch-build_config_linux_pkg-config_py | 12 + .../patches/patch-build_filename_rules_gypi | 12 - ...atch-build_toolchain_gcc_solink_wrapper_py | 12 + .../patch-build_toolchain_gcc_toolchain_gni | 33 ++ .../patch-build_toolchain_openbsd_BUILD_gn | 56 +++ www/iridium/patches/patch-cc_BUILD_gn | 23 + .../patch-chrome_app_chrome_command_ids_h | 12 + .../patches/patch-chrome_app_chrome_main_cc | 11 +- .../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_generated_resources_grd | 46 +- ...patch-chrome_app_google_chrome_strings_grd | 8 +- .../patch-chrome_app_mash_mash_runner_cc | 30 ++ ...h-chrome_app_resources_locale_settings_grd | 2 +- .../patches/patch-chrome_browser_BUILD_gn | 21 + .../patch-chrome_browser_about_flags_cc | 21 +- ...chrome_browser_after_startup_task_utils_cc | 8 +- ...tch-chrome_browser_browser_process_impl_cc | 21 + ...atch-chrome_browser_browser_process_impl_h | 12 + ...patch-chrome_browser_browser_resources_grd | 8 +- ...atch-chrome_browser_chrome_browser_main_cc | 37 +- ...hrome_browser_chrome_browser_main_linux_cc | 10 +- ...hrome_browser_chrome_browser_main_posix_cc | 10 +- ...e_browser_chrome_content_browser_client_cc | 26 +- ...me_browser_chrome_content_browser_client_h | 8 +- ...stom_handlers_protocol_handler_registry_cc | 2 +- .../patches/patch-chrome_browser_defaults_cc | 2 +- ...wnload_chrome_download_manager_delegate_cc | 10 +- ...rome_browser_download_download_commands_cc | 14 +- ...hrome_browser_download_download_commands_h | 8 +- ...-chrome_browser_download_download_prefs_cc | 20 +- ...h-chrome_browser_download_download_prefs_h | 2 +- ...er_download_download_shelf_context_menu_cc | 8 +- ...rowser_download_download_status_updater_cc | 2 +- .../patch-chrome_browser_extensions_BUILD_gn | 14 + ...writer_private_image_writer_private_api_cc | 2 +- ...r_extensions_api_input_ime_input_ime_api_h | 2 +- ...xtensions_api_messaging_message_service_cc | 16 +- ...i_music_manager_private_device_id_linux_cc | 2 +- ...wser_extensions_api_omnibox_omnibox_api_cc | 2 +- ..._browser_extensions_bookmark_app_helper_cc | 8 +- ...browser_context_keyed_service_factories_cc | 10 +- ...owser_extensions_external_provider_impl_cc | 10 +- ...wser_first_run_first_run_internal_posix_cc | 6 +- ...ch-chrome_browser_gpu_gl_string_manager_cc | 8 +- ...-chrome_browser_gpu_gpu_feature_checker_cc | 2 +- ..._interstitials_chrome_controller_client_cc | 2 +- ...alleries_fileapi_mtp_device_map_service_cc | 2 +- ...ia_galleries_media_file_system_registry_cc | 2 +- ...hrome_browser_media_webrtc_log_uploader_cc | 2 +- .../patch-chrome_browser_memory_details_cc | 2 +- ...chrome_browser_main_extra_parts_metrics_cc | 2 +- ...hrome_browser_net_async_dns_field_trial_cc | 2 +- ...ons_message_center_notification_manager_cc | 12 +- .../patch-chrome_browser_platform_util_h | 12 + ...atch-chrome_browser_platform_util_linux_cc | 8 +- ...rowser_plugins_plugins_resource_service_cc | 12 + ...-chrome_browser_process_singleton_posix_cc | 10 +- ...e_browser_profiles_profile_impl_io_data_cc | 12 + ...hrome_browser_renderer_preferences_util_cc | 14 +- ...sources_plugin_metadata_plugins_linux_json | 10 +- ...urces_safe_browsing_gen_file_type_proto_py | 20 + ...nt_reporting_incident_reporting_service_cc | 8 +- ...owser_safe_browsing_permission_reporter_cc | 12 + ...rome_browser_speech_tts_controller_impl_cc | 2 +- ...-chrome_browser_sync_chrome_sync_client_cc | 8 +- ...hrome_browser_task_manager_task_manager_cc | 12 - ..._browser_tracing_crash_service_uploader_cc | 8 +- ...me_browser_ui_app_list_app_list_service_cc | 12 - ...wser_ui_ash_system_tray_delegate_common_cc | 12 - ...e_browser_ui_browser_command_controller_cc | 16 +- ...ch-chrome_browser_ui_browser_view_prefs_cc | 14 +- ...xclusive_access_exclusive_access_bubble_cc | 2 +- ...i_input_method_input_method_engine_base_cc | 2 +- ...wser_ui_input_method_input_method_engine_h | 2 +- ...-chrome_browser_ui_panels_panel_manager_cc | 12 - ...ome_browser_ui_startup_bad_flags_prompt_cc | 8 +- ...wser_ui_startup_startup_browser_creator_cc | 38 +- .../patch-chrome_browser_ui_tab_helpers_cc | 12 + ...hrome_browser_ui_toolbar_app_menu_model_cc | 8 +- ...rome_browser_ui_views_accelerator_table_cc | 2 +- ..._ui_views_app_list_linux_app_list_linux_cc | 2 +- ...pps_chrome_native_app_window_views_aura_cc | 2 +- ...ash_chrome_browser_main_extra_parts_ash_cc | 12 - ..._browser_ui_views_chrome_views_delegate_cc | 12 +- ...e_browser_ui_views_chrome_views_delegate_h | 2 +- ..._ui_views_exclusive_access_bubble_views_cc | 12 - ...hrome_browser_ui_views_first_run_dialog_cc | 20 +- ...me_browser_ui_views_frame_browser_frame_cc | 24 +- ...ome_browser_ui_views_frame_browser_view_cc | 12 +- ...i_views_frame_opaque_browser_frame_view_cc | 10 +- ..._frame_opaque_browser_frame_view_layout_cc | 8 +- ...ue_browser_frame_view_platform_specific_cc | 2 +- ...i_views_frame_system_menu_model_builder_cc | 2 +- ..._views_frame_system_menu_model_delegate_cc | 21 + ...essage_center_message_center_frame_view_cc | 2 +- ...rowser_ui_views_panels_panel_frame_view_cc | 12 - ...owser_ui_views_tabs_tab_drag_controller_cc | 12 +- ...-chrome_browser_ui_views_tabs_tab_strip_cc | 8 +- ...rome_browser_ui_views_task_manager_view_cc | 12 - .../patch-chrome_browser_ui_webui_about_ui_cc | 22 +- ..._webui_chrome_web_ui_controller_factory_cc | 8 +- ...i_webui_options_browser_options_handler_cc | 14 +- ...ui_webui_options_browser_options_handler_h | 8 +- ..._md_settings_localized_strings_provider_cc | 12 + ...chrome_browser_web_applications_web_app_cc | 8 +- ...-chrome_browser_web_applications_web_app_h | 8 +- ...atch-chrome_chrome_browser_extensions_gypi | 24 -- .../patches/patch-chrome_chrome_browser_gypi | 52 --- .../patch-chrome_chrome_browser_ui_gypi | 21 - .../patches/patch-chrome_chrome_common_gypi | 32 -- .../patches/patch-chrome_chrome_exe_gypi | 12 - .../patches/patch-chrome_chrome_utility_gypi | 11 - .../patches/patch-chrome_common_BUILD_gn | 14 + .../patch-chrome_common_chrome_paths_cc | 12 +- .../patch-chrome_common_chrome_paths_h | 12 +- ...atch-chrome_common_chrome_paths_internal_h | 2 +- .../patch-chrome_common_chrome_switches_cc | 14 +- .../patch-chrome_common_chrome_switches_h | 10 +- ...-chrome_common_extensions_api_schemas_gypi | 24 -- ...mon_extensions_chrome_extensions_client_cc | 15 + .../patch-chrome_common_extensions_command_cc | 8 +- .../patches/patch-chrome_common_pref_names_cc | 25 +- .../patches/patch-chrome_common_pref_names_h | 23 +- .../patch-chrome_common_url_constants_cc | 10 +- .../patch-chrome_common_url_constants_h | 10 +- ...n_variations_fieldtrial_testing_config_gyp | 12 - .../patch-chrome_policy_templates_gypi | 12 - ...omecast_browser_cast_browser_main_parts_cc | 14 +- ...ast_browser_cast_content_browser_client_cc | 12 + ...patch-components_audio_modem_modem_impl_cc | 12 - ...ofill_core_browser_autofill_experiments_cc | 12 + ..._core_browser_website_settings_registry_cc | 12 + ...ponents_cookie_config_cookie_store_util_cc | 2 +- ...atch-components_crash_content_app_BUILD_gn | 21 + ...-components_crash_content_browser_BUILD_gn | 27 ++ ...h-components_filesystem_file_system_app_cc | 21 + .../patches/patch-components_metrics_BUILD_gn | 14 + ...ts_metrics_drive_metrics_provider_linux_cc | 2 +- .../patches/patch-components_metrics_gypi | 11 - ...-components_neterror_resources_neterror_js | 2 +- ...nts_omnibox_browser_omnibox_field_trial_cc | 2 +- .../patch-components_os_crypt_os_crypt_h | 21 + ...nts_policy_resources_policy_templates_json | 12 +- ...nts_policy_tools_generate_policy_source_py | 2 +- .../patch-components_storage_monitor_BUILD_gn | 36 ++ .../patch-components_storage_monitor_gypi | 26 -- ...storage_monitor_storage_monitor_openbsd_cc | 2 +- ..._storage_monitor_storage_monitor_openbsd_h | 9 +- ...-components_sync_base_get_session_name_cc} | 10 +- ...nents_sync_base_get_session_name_linux_cc} | 6 +- .../patch-content_app_content_main_runner_cc | 14 +- .../patches/patch-content_browser_BUILD_gn | 14 + ...wser_accessibility_browser_accessibility_h | 2 +- ...essibility_browser_accessibility_manager_h | 14 +- ...patch-content_browser_browser_main_loop_cc | 18 +- ...-content_browser_child_process_launcher_cc | 16 +- ...evice_sensors_data_fetcher_shared_memory_h | 12 + ..._browser_devtools_protocol_color_picker_cc | 2 +- ...atch-content_browser_download_base_file_cc | 8 +- ...ontent_browser_download_base_file_linux_cc | 2 +- ...ontent_browser_gamepad_gamepad_provider_cc | 12 - ...er_geolocation_location_arbitrator_impl_cc | 12 - ...owser_gpu_gpu_data_manager_impl_private_cc | 8 +- ...ch-content_browser_gpu_gpu_internals_ui_cc | 18 +- ...h-content_browser_media_media_internals_cc | 14 +- ...ontent_browser_power_usage_monitor_impl_cc | 2 +- ...ntent_browser_ppapi_plugin_process_host_cc | 12 +- ..._host_media_video_capture_device_client_cc | 8 +- ..._renderer_host_render_process_host_impl_cc | 12 +- ...r_renderer_host_render_widget_host_impl_cc | 12 - ...derer_host_render_widget_host_view_aura_cc | 18 +- ...patch-content_browser_time_zone_monitor_cc | 10 +- ...ntent_browser_utility_process_host_impl_cc | 20 +- .../patches/patch-content_common_BUILD_gn | 21 + ...tch-content_common_sandbox_init_openbsd_cc | 6 +- ...atch-content_common_sandbox_init_openbsd_h | 2 +- ...-content_common_set_process_title_linux_cc | 2 +- ...h-content_common_set_process_title_linux_h | 2 +- .../patch-content_content_browser_gypi | 70 ---- .../patches/patch-content_content_common_gypi | 47 --- .../patch-content_content_renderer_gypi | 11 - .../patches/patch-content_gpu_gpu_main_cc | 34 +- ...-content_ppapi_plugin_ppapi_plugin_main_cc | 10 +- ...-content_public_common_content_switches_cc | 10 +- ...h-content_public_common_content_switches_h | 10 +- ..._renderer_devtools_v8_sampling_profiler_cc | 16 +- ...nt_renderer_media_webrtc_audio_renderer_cc | 12 - ...tch-content_renderer_render_thread_impl_cc | 20 +- .../patch-content_renderer_renderer_main_cc | 16 +- ...r_renderer_main_platform_delegate_linux_cc | 2 +- ...rer_webscrollbarbehavior_impl_gtkoraura_cc | 10 +- ...ent_shell_browser_shell_browser_context_cc | 21 + ..._shell_browser_shell_browser_main_parts_cc | 21 + .../patch-content_utility_utility_main_cc | 10 +- .../patch-content_zygote_zygote_main_linux_cc | 12 + www/iridium/patches/patch-dbus_property_cc | 2 +- .../patches/patch-device_battery_battery_gyp | 12 - .../patches/patch-device_bluetooth_BUILD_gn | 12 + .../patch-device_gamepad_gamepad_provider_cc | 12 + ...ce_geolocation_location_arbitrator_impl_cc | 12 + www/iridium/patches/patch-device_hid_BUILD_gn | 17 + www/iridium/patches/patch-device_hid_hid_gyp | 22 - ...ol_media_transfer_protocol_daemon_client_h | 12 + ...protocol_media_transfer_protocol_manager_h | 12 + .../patches/patch-device_serial_BUILD_gn | 17 + .../patches/patch-device_serial_serial_gyp | 16 - ...h-device_serial_serial_io_handler_posix_cc | 2 +- ...patch-device_serial_serial_service_impl_cc | 8 +- www/iridium/patches/patch-device_usb_BUILD_gn | 12 + ...xtensions_browser_api_serial_serial_api_cc | 8 +- ...tch-gpu_config_gpu_info_collector_linux_cc | 8 +- ...atch-gpu_config_gpu_info_collector_linux_h | 2 +- ...patch-gpu_config_gpu_info_collector_x11_cc | 16 +- ..._conform_support_gles2_conform_support_gyp | 12 - www/iridium/patches/patch-gpu_gpu_config_gypi | 18 - .../patches/patch-gpu_gpu_ipc_service_gypi | 12 - www/iridium/patches/patch-gpu_tools_tools_gyp | 20 - .../patches/patch-ipc_ipc_message_utils_cc | 6 +- .../patches/patch-ipc_ipc_message_utils_h | 8 +- .../patches/patch-iridium_trknotify_cpp | 6 +- .../patches/patch-media_audio_BUILD_gn | 23 + ...atch-media_audio_audio_input_controller_cc | 12 - .../patch-media_audio_audio_manager_cc | 20 +- .../patches/patch-media_audio_audio_manager_h | 8 +- .../patches/patch-media_base_video_frame_cc | 16 +- .../patches/patch-media_base_video_frame_h | 16 +- ...video_fake_video_capture_device_factory_cc | 16 +- ...video_file_video_capture_device_factory_cc | 16 +- ...edia_capture_video_video_capture_device_cc | 21 - ...ture_video_video_capture_device_factory_cc | 8 +- ...media_capture_video_video_capture_device_h | 39 -- www/iridium/patches/patch-media_media_gyp | 95 ----- .../patches/patch-media_media_options_gni | 27 ++ ...ch-native_client_build_compiler_version_py | 2 +- www/iridium/patches/patch-net_BUILD_gn | 28 ++ .../patch-net_base_address_tracker_linux_h | 2 +- .../patch-net_base_network_change_notifier_cc | 8 +- ...patch-net_base_network_interfaces_posix_cc | 10 +- ...tch-net_disk_cache_blockfile_disk_format_h | 2 +- .../patch-net_dns_address_sorter_posix_cc | 8 +- www/iridium/patches/patch-net_dns_dns_util_cc | 10 +- .../patch-net_dns_host_resolver_proc_cc | 2 +- .../patch-net_http_http_network_session_cc | 2 +- www/iridium/patches/patch-net_net_common_gypi | 11 - www/iridium/patches/patch-net_net_gypi | 20 - ...ch-net_proxy_proxy_config_service_linux_cc | 14 +- .../patches/patch-net_proxy_proxy_service_cc | 12 +- .../patch-net_socket_socks5_client_socket_cc | 2 +- ...t_tools_get_server_time_get_server_time_cc | 14 +- .../patches/patch-net_udp_udp_socket_posix_cc | 12 +- ...url_request_url_request_context_builder_cc | 8 +- .../patches/patch-pdf_pdfium_pdfium_engine_cc | 18 +- ...d_impl_private_net_address_private_impl_cc | 2 +- ...tch-printing_backend_print_backend_cups_cc | 15 - ...atch-printing_backend_print_backend_cups_h | 15 + .../patches/patch-printing_printing_gyp | 25 -- .../patches/patch-remoting_remoting_all_gyp | 11 - .../patches/patch-remoting_remoting_host_gypi | 30 -- www/iridium/patches/patch-sandbox_BUILD_gn | 12 + .../patches/patch-sandbox_linux_BUILD_gn | 37 ++ .../patch-services_shell_runner_host_BUILD_gn | 12 + ...ch-services_ui_public_cpp_gles2_context_cc | 12 + ...s_ui_surfaces_surfaces_context_provider_cc | 12 + .../patch-skia_ext_SkMemory_new_handler_cpp | 8 +- .../patches/patch-skia_skia_chrome_gypi | 15 - .../patches/patch-skia_skia_common_gypi | 12 - ...Source_bindings_core_v8_V8ScriptRunner_cpp | 8 +- ...ch-third_party_WebKit_Source_core_core_gyp | 21 - ..._WebKit_Source_platform_blink_platform_gyp | 21 - ...WebKit_Source_platform_fonts_FontCache_cpp | 8 +- ...y_WebKit_Source_platform_fonts_FontCache_h | 8 +- ...Source_platform_fonts_FontPlatformData_cpp | 48 +++ ...t_Source_platform_fonts_FontPlatformData_h | 30 ++ ...t_Source_platform_fonts_SimpleFontData_cpp | 12 +- ...urce_platform_fonts_skia_FontCacheSkia_cpp | 23 +- ...t_Source_platform_heap_StackFrameDepth_cpp | 2 +- ...ebKit_Source_platform_heap_ThreadState_cpp | 8 +- ..._WebKit_Source_platform_heap_ThreadState_h | 8 +- ...orm_image-decoders_png_PNGImageDecoder_cpp | 12 - ..._party_WebKit_Source_web_PopupMenuImpl_cpp | 8 +- ...atch-third_party_WebKit_Source_web_web_gyp | 12 - ...tch-third_party_WebKit_Source_wtf_BUILD_gn | 12 + ...third_party_WebKit_Source_wtf_MathExtras_h | 2 +- .../patches/patch-third_party_angle_BUILD_gn | 56 +++ .../patches/patch-third_party_ffmpeg_BUILD_gn | 12 + ...mium_config_Chrome_openbsd_ia32_config_asm | 2 +- ...romium_config_Chrome_openbsd_ia32_config_h | 2 +- ...omium_config_Chrome_openbsd_x64_config_asm | 2 +- ...hromium_config_Chrome_openbsd_x64_config_h | 8 +- ...h-third_party_ffmpeg_ffmpeg_generated_gypi | 396 ------------------ .../patch-third_party_ffmpeg_ffmpeg_gyp | 12 - ...-third_party_ffmpeg_libavcodec_x86_cabac_h | 2 +- ...fmpeg_libavutil_autorename_libavutil_cpu_c | 11 - .../patch-third_party_ffmpeg_libavutil_cpu_c | 2 +- .../patch-third_party_ffmpeg_libavutil_mem_c | 2 +- .../patch-third_party_iccjpeg_iccjpeg_gyp | 17 - .../patch-third_party_libXNVCtrl_NVCtrl_c | 2 +- ...atch-third_party_libXNVCtrl_libXNVCtrl_gyp | 13 - .../patch-third_party_libjingle_libjingle_gyp | 21 - ...atch-third_party_libjpeg_turbo_libjpeg_gyp | 12 - ...p_src_phonenumbers_base_memory_singleton_h | 2 +- ...c_phonenumbers_base_synchronization_lock_h | 2 +- ...cpp_src_phonenumbers_base_thread_checker_h | 2 +- .../patches/patch-third_party_libusb_BUILD_gn | 38 ++ .../patch-third_party_libusb_libusb_gyp | 28 -- ...patch-third_party_libusb_src_libusb_core_c | 2 +- .../patch-third_party_libyuv_libyuv_gyp | 19 - ...h-third_party_pdfium_build_standalone_gypi | 21 - ...arty_pdfium_core_fxcrt_include_fx_system_h | 2 +- ..._party_pdfium_core_fxge_ge_fx_ge_linux_cpp | 12 +- ...rty_pdfium_fpdfsdk_javascript_JS_Value_cpp | 8 +- .../patch-third_party_pdfium_pdfium_gyp | 21 - ...ium_third_party_libopenjpeg20_opj_malloc_h | 2 +- ...obuf_src_google_protobuf_stubs_atomicops_h | 8 +- ...rc_google_protobuf_stubs_platform_macros_h | 12 + ...otobuf_src_google_protobuf_stubs_strutil_h | 8 +- .../patch-third_party_skia_gyp_ports_gyp | 11 - ...rd_party_skia_src_gpu_GrAutoLocaleSetter_h | 2 +- ...rd_party_skia_src_ports_SkOSFile_stdio_cpp | 8 +- .../patches/patch-third_party_sqlite_BUILD_gn | 21 + .../patch-third_party_usrsctp_BUILD_gn | 19 + .../patch-third_party_usrsctp_usrsctp_gyp | 15 - .../patches/patch-third_party_webrtc_BUILD_gn | 13 + .../patch-third_party_webrtc_base_BUILD_gn | 22 + .../patch-third_party_webrtc_base_base_gyp | 12 - ...atch-third_party_webrtc_base_httpcommon_cc | 2 +- .../patch-third_party_webrtc_base_network_cc | 10 +- ..._party_webrtc_base_physicalsocketserver_cc | 21 +- ...third_party_webrtc_base_platform_thread_cc | 2 +- ...atch-third_party_webrtc_base_stringutils_h | 2 +- ...patch-third_party_webrtc_build_common_gypi | 26 -- ...party_webrtc_modules_audio_device_BUILD_gn | 12 + ...hird_party_webrtc_system_wrappers_BUILD_gn | 12 + ...rappers_source_atomic32_non_darwin_unix_cc | 12 + ...c_system_wrappers_source_atomic32_posix_cc | 12 - ..._wrappers_source_timestamp_extrapolator_cc | 2 +- ...webrtc_voice_engine_voice_engine_defines_h | 2 +- ..._party_yasm_source_config_openbsd_config_h | 2 +- ...asm_source_config_openbsd_libyasm-stdint_h | 2 +- .../patches/patch-third_party_zlib_BUILD_gn | 12 + www/iridium/patches/patch-tools_gn_args_cc | 12 + .../patch-tools_gn_bootstrap_bootstrap_py | 49 +++ ...ch-tools_gn_bootstrap_build_ninja_template | 12 + ...atch-tools_gyp_pylib_gyp_generator_make_py | 2 +- ...tch-tools_gyp_pylib_gyp_generator_ninja_py | 10 +- ...tools_perf_chrome_telemetry_build_BUILD_gn | 12 + .../patch-ui_accessibility_accessibility_gyp | 21 - ..._accessibility_platform_ax_platform_node_h | 2 +- .../patch-ui_app_list_app_list_constants_cc | 8 +- .../patch-ui_app_list_app_list_constants_h | 8 +- .../patch-ui_app_list_app_list_menu_cc | 18 +- ...ch-ui_app_list_views_app_list_item_view_cc | 8 +- .../patch-ui_app_list_views_app_list_view_cc | 30 +- ...ui_base_ime_ime_engine_handler_interface_h | 2 +- .../patch-ui_base_ime_input_method_factory_cc | 16 +- ...ch-ui_base_ime_input_method_initializer_cc | 2 +- .../patch-ui_base_resource_resource_bundle_cc | 20 +- www/iridium/patches/patch-ui_base_ui_base_gyp | 30 -- .../patch-ui_base_webui_web_ui_util_cc | 2 +- ...nts_devices_x11_device_data_manager_x11_cc | 12 +- .../patches/patch-ui_events_event_switches_cc | 2 +- .../patches/patch-ui_events_event_switches_h | 2 +- ...i_events_keycodes_dom_keycode_converter_cc | 2 +- .../patches/patch-ui_gfx_canvas_skia_cc | 8 +- .../patches/patch-ui_gfx_codec_png_codec_cc | 2 +- .../patch-ui_gfx_font_fallback_linux_cc | 2 +- .../patches/patch-ui_gfx_font_render_params_h | 8 +- www/iridium/patches/patch-ui_gfx_gfx_gyp | 21 - www/iridium/patches/patch-ui_gl_BUILD_gn | 30 ++ .../patches/patch-ui_gl_generate_bindings_py | 8 +- .../patch-ui_gl_gl_bindings_api_autogen_glx_h | 2 +- .../patch-ui_gl_gl_bindings_autogen_glx_cc | 2 +- .../patch-ui_gl_gl_bindings_autogen_glx_h | 21 +- www/iridium/patches/patch-ui_gl_gl_gyp | 21 - .../patches/patch-ui_gl_gl_surface_glx_cc | 12 - ...patch-ui_gl_sync_control_vsync_provider_cc | 17 +- .../patch-ui_gl_sync_control_vsync_provider_h | 12 + ...h-ui_message_center_message_center_style_h | 8 +- ..._center_views_message_center_button_bar_cc | 16 +- ...e_center_views_message_center_button_bar_h | 8 +- ...essage_center_views_message_center_view_cc | 21 - ...ssage_center_views_message_view_factory_cc | 12 + ..._message_center_views_notification_view_cc | 12 - .../patch-ui_resources_ui_resources_grd | 2 +- ...-ui_touch_selection_ui_touch_selection_gyp | 11 - ..._accessibility_native_view_accessibility_h | 2 +- ...ui_views_bubble_bubble_dialog_delegate_cc} | 8 +- ...h-ui_views_controls_button_label_button_cc | 21 - ...iews_controls_scrollbar_base_scroll_bar_cc | 12 - ...h-ui_views_controls_textfield_textfield_cc | 52 +-- ...atch-ui_views_controls_webview_webview_gyp | 12 - .../patch-ui_views_corewm_tooltip_aura_cc | 12 + .../patch-ui_views_examples_widget_example_cc | 12 + .../patches/patch-ui_views_mus_aura_init_cc | 30 ++ .../patches/patch-ui_views_mus_aura_init_h | 12 + .../patch-ui_views_style_platform_style_cc | 20 +- .../patches/patch-ui_views_views_delegate_cc | 2 +- .../patches/patch-ui_views_views_delegate_h | 2 +- www/iridium/patches/patch-ui_views_views_gyp | 27 -- .../patches/patch-ui_views_views_switches_cc | 2 +- ...patch-ui_views_window_custom_frame_view_cc | 8 +- .../patch-ui_views_window_dialog_delegate_cc | 10 +- .../patches/patch-ui_webui_resources_js_cr_js | 2 +- .../patch-ui_webui_resources_js_icon_js | 12 + .../patch-ui_webui_resources_js_util_js | 12 - www/iridium/patches/patch-v8_BUILD_gn | 34 ++ ...h-v8_src_base_platform_platform-openbsd_cc | 309 -------------- ...tch-v8_src_base_platform_platform-posix_cc | 8 +- www/iridium/patches/patch-v8_src_globals_h | 17 +- www/iridium/patches/patch-v8_src_log-utils_h | 8 +- www/iridium/pkg/PLIST | 140 ++++--- 461 files changed, 3951 insertions(+), 3641 deletions(-) create mode 100644 www/iridium/patches/patch-BUILD_gn delete mode 100644 www/iridium/patches/patch-apps_apps_gypi create mode 100644 www/iridium/patches/patch-ash_shell_cc create mode 100644 www/iridium/patches/patch-base_BUILD_gn delete mode 100644 www/iridium/patches/patch-base_base_gypi create mode 100644 www/iridium/patches/patch-base_linux_util_cc delete mode 100644 www/iridium/patches/patch-base_message_loop_message_loop_cc create mode 100644 www/iridium/patches/patch-base_native_library_posix_cc create mode 100644 www/iridium/patches/patch-base_third_party_libevent_event-config_h create mode 100644 www/iridium/patches/patch-base_third_party_libevent_openbsd_config_h create mode 100644 www/iridium/patches/patch-base_third_party_libevent_openbsd_event-config_h create mode 100644 www/iridium/patches/patch-base_third_party_symbolize_symbolize_cc create mode 100644 www/iridium/patches/patch-base_trace_event_malloc_dump_provider_cc delete mode 100644 www/iridium/patches/patch-build_all_gyp delete mode 100644 www/iridium/patches/patch-build_common_gypi create mode 100644 www/iridium/patches/patch-build_config_BUILDCONFIG_gn create mode 100644 www/iridium/patches/patch-build_config_BUILD_gn create mode 100644 www/iridium/patches/patch-build_config_allocator_gni create mode 100644 www/iridium/patches/patch-build_config_compiler_BUILD_gn create mode 100644 www/iridium/patches/patch-build_config_compiler_compiler_gni create mode 100644 www/iridium/patches/patch-build_config_features_gni create mode 100644 www/iridium/patches/patch-build_config_linux_pkg-config_py delete mode 100644 www/iridium/patches/patch-build_filename_rules_gypi create mode 100644 www/iridium/patches/patch-build_toolchain_gcc_solink_wrapper_py create mode 100644 www/iridium/patches/patch-build_toolchain_gcc_toolchain_gni create mode 100644 www/iridium/patches/patch-build_toolchain_openbsd_BUILD_gn create mode 100644 www/iridium/patches/patch-cc_BUILD_gn create mode 100644 www/iridium/patches/patch-chrome_app_chrome_command_ids_h create mode 100644 www/iridium/patches/patch-chrome_app_mash_mash_runner_cc create mode 100644 www/iridium/patches/patch-chrome_browser_BUILD_gn create mode 100644 www/iridium/patches/patch-chrome_browser_browser_process_impl_cc create mode 100644 www/iridium/patches/patch-chrome_browser_browser_process_impl_h create mode 100644 www/iridium/patches/patch-chrome_browser_extensions_BUILD_gn create mode 100644 www/iridium/patches/patch-chrome_browser_platform_util_h create mode 100644 www/iridium/patches/patch-chrome_browser_plugins_plugins_resource_service_cc create mode 100644 www/iridium/patches/patch-chrome_browser_profiles_profile_impl_io_data_cc create mode 100644 www/iridium/patches/patch-chrome_browser_resources_safe_browsing_gen_file_type_proto_py create mode 100644 www/iridium/patches/patch-chrome_browser_safe_browsing_permission_reporter_cc delete mode 100644 www/iridium/patches/patch-chrome_browser_task_manager_task_manager_cc delete mode 100644 www/iridium/patches/patch-chrome_browser_ui_app_list_app_list_service_cc delete mode 100644 www/iridium/patches/patch-chrome_browser_ui_ash_system_tray_delegate_common_cc delete mode 100644 www/iridium/patches/patch-chrome_browser_ui_panels_panel_manager_cc create mode 100644 www/iridium/patches/patch-chrome_browser_ui_tab_helpers_cc delete mode 100644 www/iridium/patches/patch-chrome_browser_ui_views_ash_chrome_browser_main_extra_parts_ash_cc delete mode 100644 www/iridium/patches/patch-chrome_browser_ui_views_exclusive_access_bubble_views_cc create mode 100644 www/iridium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_delegate_cc delete mode 100644 www/iridium/patches/patch-chrome_browser_ui_views_panels_panel_frame_view_cc delete mode 100644 www/iridium/patches/patch-chrome_browser_ui_views_task_manager_view_cc create mode 100644 www/iridium/patches/patch-chrome_browser_ui_webui_settings_md_settings_localized_strings_provider_cc delete mode 100644 www/iridium/patches/patch-chrome_chrome_browser_extensions_gypi delete mode 100644 www/iridium/patches/patch-chrome_chrome_browser_gypi delete mode 100644 www/iridium/patches/patch-chrome_chrome_browser_ui_gypi delete mode 100644 www/iridium/patches/patch-chrome_chrome_common_gypi delete mode 100644 www/iridium/patches/patch-chrome_chrome_exe_gypi delete mode 100644 www/iridium/patches/patch-chrome_chrome_utility_gypi create mode 100644 www/iridium/patches/patch-chrome_common_BUILD_gn delete mode 100644 www/iridium/patches/patch-chrome_common_extensions_api_schemas_gypi create mode 100644 www/iridium/patches/patch-chrome_common_extensions_chrome_extensions_client_cc delete mode 100644 www/iridium/patches/patch-chrome_common_variations_fieldtrial_testing_config_gyp delete mode 100644 www/iridium/patches/patch-chrome_policy_templates_gypi create mode 100644 www/iridium/patches/patch-chromecast_browser_cast_content_browser_client_cc delete mode 100644 www/iridium/patches/patch-components_audio_modem_modem_impl_cc create mode 100644 www/iridium/patches/patch-components_autofill_core_browser_autofill_experiments_cc create mode 100644 www/iridium/patches/patch-components_content_settings_core_browser_website_settings_registry_cc create mode 100644 www/iridium/patches/patch-components_crash_content_app_BUILD_gn create mode 100644 www/iridium/patches/patch-components_crash_content_browser_BUILD_gn create mode 100644 www/iridium/patches/patch-components_filesystem_file_system_app_cc create mode 100644 www/iridium/patches/patch-components_metrics_BUILD_gn delete mode 100644 www/iridium/patches/patch-components_metrics_gypi create mode 100644 www/iridium/patches/patch-components_os_crypt_os_crypt_h create mode 100644 www/iridium/patches/patch-components_storage_monitor_BUILD_gn delete mode 100644 www/iridium/patches/patch-components_storage_monitor_gypi rename www/iridium/patches/{patch-sync_util_get_session_name_cc => patch-components_sync_base_get_session_name_cc} (57%) rename www/iridium/patches/{patch-sync_util_get_session_name_linux_cc => patch-components_sync_base_get_session_name_linux_cc} (57%) create mode 100644 www/iridium/patches/patch-content_browser_BUILD_gn create mode 100644 www/iridium/patches/patch-content_browser_device_sensors_data_fetcher_shared_memory_h delete mode 100644 www/iridium/patches/patch-content_browser_gamepad_gamepad_provider_cc delete mode 100644 www/iridium/patches/patch-content_browser_geolocation_location_arbitrator_impl_cc delete mode 100644 www/iridium/patches/patch-content_browser_renderer_host_render_widget_host_impl_cc create mode 100644 www/iridium/patches/patch-content_common_BUILD_gn delete mode 100644 www/iridium/patches/patch-content_content_browser_gypi delete mode 100644 www/iridium/patches/patch-content_content_common_gypi delete mode 100644 www/iridium/patches/patch-content_content_renderer_gypi delete mode 100644 www/iridium/patches/patch-content_renderer_media_webrtc_audio_renderer_cc create mode 100644 www/iridium/patches/patch-content_shell_browser_shell_browser_context_cc create mode 100644 www/iridium/patches/patch-content_shell_browser_shell_browser_main_parts_cc create mode 100644 www/iridium/patches/patch-content_zygote_zygote_main_linux_cc delete mode 100644 www/iridium/patches/patch-device_battery_battery_gyp create mode 100644 www/iridium/patches/patch-device_bluetooth_BUILD_gn create mode 100644 www/iridium/patches/patch-device_gamepad_gamepad_provider_cc create mode 100644 www/iridium/patches/patch-device_geolocation_location_arbitrator_impl_cc create mode 100644 www/iridium/patches/patch-device_hid_BUILD_gn delete mode 100644 www/iridium/patches/patch-device_hid_hid_gyp create mode 100644 www/iridium/patches/patch-device_media_transfer_protocol_media_transfer_protocol_daemon_client_h create mode 100644 www/iridium/patches/patch-device_media_transfer_protocol_media_transfer_protocol_manager_h create mode 100644 www/iridium/patches/patch-device_serial_BUILD_gn delete mode 100644 www/iridium/patches/patch-device_serial_serial_gyp create mode 100644 www/iridium/patches/patch-device_usb_BUILD_gn delete mode 100644 www/iridium/patches/patch-gpu_gles2_conform_support_gles2_conform_support_gyp delete mode 100644 www/iridium/patches/patch-gpu_gpu_config_gypi delete mode 100644 www/iridium/patches/patch-gpu_gpu_ipc_service_gypi delete mode 100644 www/iridium/patches/patch-gpu_tools_tools_gyp create mode 100644 www/iridium/patches/patch-media_audio_BUILD_gn delete mode 100644 www/iridium/patches/patch-media_audio_audio_input_controller_cc delete mode 100644 www/iridium/patches/patch-media_capture_video_video_capture_device_cc delete mode 100644 www/iridium/patches/patch-media_capture_video_video_capture_device_h delete mode 100644 www/iridium/patches/patch-media_media_gyp create mode 100644 www/iridium/patches/patch-media_media_options_gni create mode 100644 www/iridium/patches/patch-net_BUILD_gn delete mode 100644 www/iridium/patches/patch-net_net_common_gypi delete mode 100644 www/iridium/patches/patch-net_net_gypi delete mode 100644 www/iridium/patches/patch-printing_backend_print_backend_cups_cc create mode 100644 www/iridium/patches/patch-printing_backend_print_backend_cups_h delete mode 100644 www/iridium/patches/patch-printing_printing_gyp delete mode 100644 www/iridium/patches/patch-remoting_remoting_all_gyp delete mode 100644 www/iridium/patches/patch-remoting_remoting_host_gypi create mode 100644 www/iridium/patches/patch-sandbox_BUILD_gn create mode 100644 www/iridium/patches/patch-sandbox_linux_BUILD_gn create mode 100644 www/iridium/patches/patch-services_shell_runner_host_BUILD_gn create mode 100644 www/iridium/patches/patch-services_ui_public_cpp_gles2_context_cc create mode 100644 www/iridium/patches/patch-services_ui_surfaces_surfaces_context_provider_cc delete mode 100644 www/iridium/patches/patch-skia_skia_chrome_gypi delete mode 100644 www/iridium/patches/patch-skia_skia_common_gypi delete mode 100644 www/iridium/patches/patch-third_party_WebKit_Source_core_core_gyp delete mode 100644 www/iridium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp create mode 100644 www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontPlatformData_cpp create mode 100644 www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontPlatformData_h delete mode 100644 www/iridium/patches/patch-third_party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder_cpp delete mode 100644 www/iridium/patches/patch-third_party_WebKit_Source_web_web_gyp create mode 100644 www/iridium/patches/patch-third_party_WebKit_Source_wtf_BUILD_gn create mode 100644 www/iridium/patches/patch-third_party_angle_BUILD_gn create mode 100644 www/iridium/patches/patch-third_party_ffmpeg_BUILD_gn delete mode 100644 www/iridium/patches/patch-third_party_ffmpeg_ffmpeg_generated_gypi delete mode 100644 www/iridium/patches/patch-third_party_ffmpeg_ffmpeg_gyp delete mode 100644 www/iridium/patches/patch-third_party_ffmpeg_libavutil_autorename_libavutil_cpu_c delete mode 100644 www/iridium/patches/patch-third_party_iccjpeg_iccjpeg_gyp delete mode 100644 www/iridium/patches/patch-third_party_libXNVCtrl_libXNVCtrl_gyp delete mode 100644 www/iridium/patches/patch-third_party_libjingle_libjingle_gyp delete mode 100644 www/iridium/patches/patch-third_party_libjpeg_turbo_libjpeg_gyp create mode 100644 www/iridium/patches/patch-third_party_libusb_BUILD_gn delete mode 100644 www/iridium/patches/patch-third_party_libusb_libusb_gyp delete mode 100644 www/iridium/patches/patch-third_party_libyuv_libyuv_gyp delete mode 100644 www/iridium/patches/patch-third_party_pdfium_build_standalone_gypi delete mode 100644 www/iridium/patches/patch-third_party_pdfium_pdfium_gyp create mode 100644 www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros_h delete mode 100644 www/iridium/patches/patch-third_party_skia_gyp_ports_gyp create mode 100644 www/iridium/patches/patch-third_party_sqlite_BUILD_gn create mode 100644 www/iridium/patches/patch-third_party_usrsctp_BUILD_gn delete mode 100644 www/iridium/patches/patch-third_party_usrsctp_usrsctp_gyp create mode 100644 www/iridium/patches/patch-third_party_webrtc_BUILD_gn create mode 100644 www/iridium/patches/patch-third_party_webrtc_base_BUILD_gn delete mode 100644 www/iridium/patches/patch-third_party_webrtc_base_base_gyp delete mode 100644 www/iridium/patches/patch-third_party_webrtc_build_common_gypi create mode 100644 www/iridium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn create mode 100644 www/iridium/patches/patch-third_party_webrtc_system_wrappers_BUILD_gn create mode 100644 www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_atomic32_non_darwin_unix_cc delete mode 100644 www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_atomic32_posix_cc create mode 100644 www/iridium/patches/patch-third_party_zlib_BUILD_gn create mode 100644 www/iridium/patches/patch-tools_gn_args_cc create mode 100644 www/iridium/patches/patch-tools_gn_bootstrap_bootstrap_py create mode 100644 www/iridium/patches/patch-tools_gn_bootstrap_build_ninja_template create mode 100644 www/iridium/patches/patch-tools_perf_chrome_telemetry_build_BUILD_gn delete mode 100644 www/iridium/patches/patch-ui_accessibility_accessibility_gyp delete mode 100644 www/iridium/patches/patch-ui_base_ui_base_gyp delete mode 100644 www/iridium/patches/patch-ui_gfx_gfx_gyp create mode 100644 www/iridium/patches/patch-ui_gl_BUILD_gn delete mode 100644 www/iridium/patches/patch-ui_gl_gl_gyp delete mode 100644 www/iridium/patches/patch-ui_gl_gl_surface_glx_cc create mode 100644 www/iridium/patches/patch-ui_gl_sync_control_vsync_provider_h delete mode 100644 www/iridium/patches/patch-ui_message_center_views_message_center_view_cc create mode 100644 www/iridium/patches/patch-ui_message_center_views_message_view_factory_cc delete mode 100644 www/iridium/patches/patch-ui_message_center_views_notification_view_cc delete mode 100644 www/iridium/patches/patch-ui_touch_selection_ui_touch_selection_gyp rename www/iridium/patches/{patch-ui_views_bubble_bubble_delegate_cc => patch-ui_views_bubble_bubble_dialog_delegate_cc} (64%) delete mode 100644 www/iridium/patches/patch-ui_views_controls_button_label_button_cc delete mode 100644 www/iridium/patches/patch-ui_views_controls_scrollbar_base_scroll_bar_cc delete mode 100644 www/iridium/patches/patch-ui_views_controls_webview_webview_gyp create mode 100644 www/iridium/patches/patch-ui_views_corewm_tooltip_aura_cc create mode 100644 www/iridium/patches/patch-ui_views_examples_widget_example_cc create mode 100644 www/iridium/patches/patch-ui_views_mus_aura_init_cc create mode 100644 www/iridium/patches/patch-ui_views_mus_aura_init_h delete mode 100644 www/iridium/patches/patch-ui_views_views_gyp create mode 100644 www/iridium/patches/patch-ui_webui_resources_js_icon_js delete mode 100644 www/iridium/patches/patch-ui_webui_resources_js_util_js create mode 100644 www/iridium/patches/patch-v8_BUILD_gn delete mode 100644 www/iridium/patches/patch-v8_src_base_platform_platform-openbsd_cc diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 818901f0460..6d1d308e64a 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.55 2016/08/25 20:00:07 sthen Exp $ +# $OpenBSD: Makefile,v 1.56 2016/10/27 18:30:40 robert Exp $ USE_WXNEEDED= Yes @@ -7,18 +7,10 @@ DPB_PROPERTIES= parallel COMMENT= Iridium browser -V= 51.1 +V= 54.0 DISTNAME= iridium-browser-${V} PKGNAME= iridium-${V} -REVISION= 2 - -WRKDIST= ${WRKDIR}/${DISTNAME:S/rc1//} - -# The update from 43.4 to 43.5 is released as a patch -# this time due to the size of the tarball. -# XXX keep these lines for further releases -#PATCHFILES+= iridium-browser-44.0-rc1-final.diff -#PATCH_DIST_STRIP= -p1 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} CATEGORIES= www @@ -35,8 +27,8 @@ FLAVOR?= PERMIT_PACKAGE_CDROM= patents PERMIT_PACKAGE_FTP = Yes -MASTER_SITES= https://downloads.iridiumbrowser.de/source/ \ - http://nerd.hu/distfiles/ +MASTER_SITES= https://downloads.iridiumbrowser.de/source/ \ + http://nerd.hu/distfiles/ MODULES= lang/clang lang/python gcc4 @@ -96,71 +88,49 @@ BUILDTYPE= Debug BUILDTYPE= Release .endif +ALL_TARGET= chrome TEST_TARGET= base_unittests CONFIGURE_STYLE=none # prevent python MODULE from overriding do-build -CONFIGURE_ENV= CPPFLAGS="-idirafter ${LOCALBASE}/include -idirafter ${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - GYP_GENERATORS=ninja - -ALL_TARGET= chrome BUILDDIR= ${WRKSRC}/out/${BUILDTYPE} -GYP_DEFS= -Duse_system_bzip2=1 \ - -Duse_system_libevent=1 \ - -Duse_system_libjpeg=0 \ - -Duse_system_libpng=1 \ - -Duse_system_libusb=0 \ - -Duse_system_libvpx=0 \ - -Duse_system_libxml=1 \ - -Duse_system_sqlite=0 \ - -Duse_system_yasm=1 \ - -Duse_system_zlib=0 \ - -Duse_system_ssl=0 \ - -Duse_system_icu=0 \ - -Ddisable_nacl=1 \ - -Dlinux_breakpad=0 \ - -Duse_allocator=none \ - -Dlinux_strip_binary=0 \ - -Dlinux_use_heapchecker=0 \ - -Denable_webrtc=0 \ - -Denable_one_click_signin=1 \ - -Duse_kerberos=0 \ - -Duse_sndio=1 \ - -Duse_aura=1 \ - -Dclang=1 \ - -Dclang_use_chrome_plugins=0 \ - -Dwerror= \ - -Dno_gc_sections=1 \ - -Ddisable_fatal_linker_warnings=1 \ - -Dv8_use_external_startup_data=0 \ - -Dlibraries_for_target='-lestdc++' \ - -DOS=openbsd +# These libraries are used from the system and the build infrastructure +# removes them from the bundled third_party directory and replaces them +# with hooks to use them from the system. +GN_SYSTEM_LIBS= libevent \ + libxml \ + libxslt \ + yasm + +GN_ARGS= enable_nacl=false \ + is_debug=false \ + enable_webrtc=false \ + enable_one_click_signin=true \ + use_kerberos=false \ + use_sndio=true \ + use_cups=true \ + is_clang=true \ + use_sysroot=false \ + treat_warnings_as_errors=false \ + clang_use_chrome_plugins=false \ + use_allocator=\"none\" \ + extra_cppflags=\"-idirafter ${LOCALBASE}/include -idirafter ${X11BASE}/include\" \ + extra_ldflags=\"-L${LOCALBASE}/lib -L${X11BASE}/lib\" # Note: these keys are for OpenBSD use ONLY. For your own distribution, # please get your own set of keys. It's free! -GYP_DEFS+= -Dgoogle_api_key='AIzaSyA015yecfJyWi8UQpneQVrNzIKlxjv4MhI' \ - -Dgoogle_default_client_id='451220141585.apps.googleusercontent.com' \ - -Dgoogle_default_client_secret='nQcDyaBvDyCeDrsRqKIWSHJn' \ - -Dffmpeg_branding=Chrome \ - -Dproprietary_codecs=1 - -.if ${MACHINE_ARCH} == "i386" -CARCH= i386 -.elif ${MACHINE_ARCH} == "amd64" -CARCH= x86_64 -.endif - -REL!= uname -r +GN_ARGS+= google_api_key=\"AIzaSyA015yecfJyWi8UQpneQVrNzIKlxjv4MhI\" \ + google_default_client_id=\"451220141585.apps.googleusercontent.com\" \ + google_default_client_secret=\"nQcDyaBvDyCeDrsRqKIWSHJn\" \ + ffmpeg_branding=\"Chrome\" \ + proprietary_codecs=true .if ${FLAVOR:Mdebug} -GYP_DEFS+= -Dremove_webcore_debug_symbols=1 +GN_ARGS+= remove_webcore_debug_symbols=true MAKE_ENV+= V=1 .endif -MODPY_ADJ_FILES=build/linux/unbundle/replace_gyp_files.py - pre-configure: @ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python .for _arch in x64 ia32 @@ -170,29 +140,20 @@ pre-configure: @mkdir -p ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @cp ${FILESDIR}/sndio_{out,in}put.{cc,h} ${WRKSRC}/media/audio/sndio @cp ${FILESDIR}/audio_manager_openbsd.{cc,h} ${WRKSRC}/media/audio/openbsd - # XXX Create a missing html file to avoid a build failure (unused in the actual package) - @touch ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html -# gyp_chromium generates all the Makefiles from gyp +# Configuration consists of three steps: +# 1. replace the specified bundled libraries with hooks to use the system libs +# 2. bootstrap gn, the tool to generate ninja files +# 3. run gn with the appropriate configuration arguments do-configure: - cd ${WRKSRC} && \ - build/linux/unbundle/replace_gyp_files.py ${GYP_DEFS} && \ - env -i ${CONFIGURE_ENV} ${MODPY_BIN} build/gyp_chromium \ - ${GYP_DEFS} "--depth=${WRKSRC}" + @cd ${WRKSRC} && env -i ${MAKE_ENV} build/linux/unbundle/replace_gn_files.py \ + --system-libraries ${GN_SYSTEM_LIBS} + @cd ${WRKSRC}/tools/gn && env -i ${MAKE_ENV} ${MODPY_BIN} bootstrap/bootstrap.py \ + --no-clean -s --gn-gen-args "${GN_ARGS}" + @cd ${WRKSRC} && env -i ${CONFIGURE_ENV} ${WRKSRC}/out/${BUILDTYPE}/gn \ + gen --args="${GN_ARGS}" out/Release do-build: - # Build all the resources as the first step to avoid build failures - # due to internal dependency issues. - @cd ${WRKSRC}/out/${BUILDTYPE} && \ - for _r in generate_version_info cloud_policy_proto net_interfaces suggestions \ - cacheinvalidation cacheinvalidation_proto_cpp gfx_vector_icons \ - data_reduction_proxy_proto cloud_policy_code_generate common_constants \ - profile_reset_report_proto autofill_server_proto \ - $$(ninja -t targets | grep -E '(bindings_mojom|mojo_bindings|resources): phony' | \ - grep -v test | cut -d ':' -f1); do \ - cd ${WRKSRC} && env -i ${MAKE_ENV} ninja \ - -j ${MAKE_JOBS} -C out/${BUILDTYPE} $${_r}; \ - done @cd ${WRKSRC} && env -i ${MAKE_ENV} ninja \ -j ${MAKE_JOBS} -C out/${BUILDTYPE} ${ALL_TARGET} @@ -205,14 +166,12 @@ do-install: ${INSTALL_DATA} ${BUILDDIR}/*.pak ${PREFIX}/iridium ${INSTALL_DATA_DIR} ${PREFIX}/iridium/locales - ${INSTALL_DATA_DIR} ${PREFIX}/iridium/pseudo_locales ${INSTALL_DATA} ${BUILDDIR}/locales/* ${PREFIX}/iridium/locales - ${INSTALL_DATA} ${BUILDDIR}/pseudo_locales/* ${PREFIX}/iridium/pseudo_locales ${INSTALL_DATA} ${BUILDDIR}/*.png ${PREFIX}/iridium ${INSTALL_DATA_DIR} ${PREFIX}/iridium/resources @cp -Rp ${BUILDDIR}/resources/* ${PREFIX}/iridium/resources @chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/iridium/resources -.for f in protoc icudtl.dat mksnapshot +.for f in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin ${INSTALL_DATA} ${BUILDDIR}/${f} ${PREFIX}/iridium .endfor .for s in 22 24 48 64 128 256 diff --git a/www/iridium/distinfo b/www/iridium/distinfo index 5b84e556e79..c7378bf7fe3 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,2 +1,2 @@ -SHA256 (iridium-browser-51.1.tar.xz) = YUp81P4KW6V0lfx6+9QHwOXlnoiX2Yx4+W+Fnkyb+Ao= -SIZE (iridium-browser-51.1.tar.xz) = 451315944 +SHA256 (iridium-browser-54.0.tar.xz) = D5O+66BiWReP3haUj3ErmXQIsUvQRxjHVjpUN0gRx04= +SIZE (iridium-browser-54.0.tar.xz) = 546141012 diff --git a/www/iridium/files/audio_manager_openbsd.cc b/www/iridium/files/audio_manager_openbsd.cc index a6d8fdb1598..fc7f6705090 100644 --- a/www/iridium/files/audio_manager_openbsd.cc +++ b/www/iridium/files/audio_manager_openbsd.cc @@ -4,6 +4,7 @@ #include "media/audio/openbsd/audio_manager_openbsd.h" +#include "media/audio/audio_device_description.h" #include "media/audio/audio_output_dispatcher.h" #include "media/audio/sndio/sndio_input.h" #include "media/audio/sndio/sndio_output.h" @@ -20,8 +21,7 @@ static const int kDefaultSampleRate = 48000; void AddDefaultDevice(AudioDeviceNames* device_names) { DCHECK(device_names->empty()); - device_names->push_front(AudioDeviceName(AudioManager::GetDefaultDeviceName(), - AudioManagerBase::kDefaultDeviceId)); + device_names->push_front(AudioDeviceName::CreateDefault()); } bool AudioManagerOpenBSD::HasAudioOutputDevices() { @@ -60,8 +60,13 @@ AudioParameters AudioManagerOpenBSD::GetInputStreamParameters( kDefaultSampleRate, 16, buffer_size); } -AudioManagerOpenBSD::AudioManagerOpenBSD(AudioLogFactory* audio_log_factory) - : AudioManagerBase(audio_log_factory) { +AudioManagerOpenBSD::AudioManagerOpenBSD( + scoped_refptr task_runner, + scoped_refptr worker_task_runner, + AudioLogFactory* audio_log_factory) + : AudioManagerBase(std::move(task_runner), + std::move(worker_task_runner), + audio_log_factory) { DLOG(WARNING) << "AudioManagerOpenBSD"; SetMaxOutputStreamsAllowed(kMaxOutputStreams); } @@ -71,27 +76,33 @@ AudioManagerOpenBSD::~AudioManagerOpenBSD() { } AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream( - const AudioParameters& params) { + const AudioParameters& params, + const LogCallback& log_callback) { DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); return MakeOutputStream(params); } AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) { + const std::string& device_id, + const LogCallback& log_callback) { DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); return MakeOutputStream(params); } AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) { + const AudioParameters& params, + const std::string& device_id, + const LogCallback& log_callback) { DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); return MakeInputStream(params); } AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) { + const AudioParameters& params, + const std::string& device_id, + const LogCallback& log_callback) { DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); return MakeInputStream(params); } @@ -127,7 +138,7 @@ AudioInputStream* AudioManagerOpenBSD::MakeInputStream( const AudioParameters& params) { DLOG(WARNING) << "MakeInputStream"; return new SndioAudioInputStream(this, - AudioManagerBase::kDefaultDeviceId, params); + AudioDeviceDescription::kDefaultDeviceId, params); } AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream( @@ -136,11 +147,14 @@ AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream( return new SndioAudioOutputStream(params, this); } -// TODO(xians): Merge AudioManagerOpenBSD with AudioManagerPulse; -// static -AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) { +ScopedAudioManagerPtr CreateAudioManager( + scoped_refptr task_runner, + scoped_refptr worker_task_runner, + AudioLogFactory* audio_log_factory) { DLOG(WARNING) << "CreateAudioManager"; - return new AudioManagerOpenBSD(audio_log_factory); + return ScopedAudioManagerPtr( + new AudioManagerOpenBSD(std::move(task_runner), + std::move(worker_task_runner),audio_log_factory)); } } // namespace media diff --git a/www/iridium/files/audio_manager_openbsd.h b/www/iridium/files/audio_manager_openbsd.h index ae4b4f50cfe..15a91e45faa 100644 --- a/www/iridium/files/audio_manager_openbsd.h +++ b/www/iridium/files/audio_manager_openbsd.h @@ -8,13 +8,17 @@ #include #include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" #include "media/audio/audio_manager_base.h" namespace media { class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase { public: - AudioManagerOpenBSD(AudioLogFactory* audio_log_factory); + AudioManagerOpenBSD( + scoped_refptr task_runner, + scoped_refptr worker_task_runner, + AudioLogFactory* audio_log_factory); // Implementation of AudioManager. bool HasAudioOutputDevices() override; @@ -27,14 +31,20 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase { // Implementation of AudioManagerBase. AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) override; + const AudioParameters& params, + const LogCallback& log_callback) override; AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) override; + const std::string& device_id, + const LogCallback& log_callback) override; AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) override; + const AudioParameters& params, + const std::string& device_id, + const LogCallback& log_callback) override; AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) override; + const AudioParameters& params, + const std::string& device_id, + const LogCallback& log_callback) override; protected: ~AudioManagerOpenBSD() override; diff --git a/www/iridium/files/sndio_input.h b/www/iridium/files/sndio_input.h index 9f8b5b490e4..b354f66fd55 100644 --- a/www/iridium/files/sndio_input.h +++ b/www/iridium/files/sndio_input.h @@ -11,12 +11,12 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "media/audio/agc_audio_stream.h" #include "media/audio/audio_io.h" -#include "media/audio/audio_parameters.h" +#include "media/audio/audio_device_description.h" +#include "media/base/audio_parameters.h" namespace media { @@ -89,9 +89,9 @@ class SndioAudioInputStream : public AgcAudioStream { AudioInputCallback* callback_; // Valid during a recording session. base::TimeTicks next_read_time_; // Scheduled time for next read callback. struct sio_hdl* device_handle_; // Handle to the SNDIO PCM recording device. - scoped_ptr audio_buffer_; // Buffer used for reading audio data. + std::unique_ptr audio_buffer_; // Buffer used for reading audio data. bool read_callback_behind_schedule_; - scoped_ptr audio_bus_; + std::unique_ptr audio_bus_; int hw_delay_; int sndio_rec_bufsize_; diff --git a/www/iridium/files/sndio_output.cc b/www/iridium/files/sndio_output.cc index c82cfef6d65..fc1db9386b7 100644 --- a/www/iridium/files/sndio_output.cc +++ b/www/iridium/files/sndio_output.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/logging.h" -#include "media/audio/audio_parameters.h" #include "media/audio/audio_manager_base.h" #include "media/audio/sndio/sndio_output.h" diff --git a/www/iridium/files/sndio_output.h b/www/iridium/files/sndio_output.h index 78db73bbdce..e14ab4dfedd 100644 --- a/www/iridium/files/sndio_output.h +++ b/www/iridium/files/sndio_output.h @@ -60,7 +60,7 @@ class SndioAudioOutputStream : public AudioOutputStream { // Parameters of the source AudioParameters params; // Source stores data here - scoped_ptr audio_bus; + std::unique_ptr audio_bus; // Call-back that produces data to play AudioSourceCallback* source; // Handle of the audio device diff --git a/www/iridium/patches/patch-BUILD_gn b/www/iridium/patches/patch-BUILD_gn new file mode 100644 index 00000000000..63828e2db56 --- /dev/null +++ b/www/iridium/patches/patch-BUILD_gn @@ -0,0 +1,87 @@ +$OpenBSD: patch-BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- BUILD.gn.orig.port Wed Oct 12 21:02:52 2016 ++++ BUILD.gn Wed Oct 19 12:55:55 2016 +@@ -201,7 +201,7 @@ group("both_gn_and_gyp") { + ] + } + +- if (!is_ios && !is_android && !is_chromecast) { ++ if (!is_ios && !is_android && !is_chromecast && !is_openbsd) { + deps += [ + "//chrome", + "//chrome/test:browser_tests", +@@ -432,7 +432,7 @@ group("both_gn_and_gyp") { + } + } + +- if (is_linux || is_android) { ++ if ((is_linux && !is_openbsd) || is_android) { + deps += [ + "//breakpad:breakpad_unittests", + "//breakpad:core-2-minidump", +@@ -465,8 +465,6 @@ group("both_gn_and_gyp") { + "//net:disk_cache_memory_test", + "//net:quic_client", + "//net:quic_server", +- "//sandbox/linux:chrome_sandbox", +- "//sandbox/linux:sandbox_linux_unittests", + ] + + if (use_dbus) { +@@ -526,10 +524,6 @@ group("both_gn_and_gyp") { + "//chrome/test:sync_performance_tests", + "//chrome/test/chromedriver:chromedriver", + "//chrome/test/chromedriver:chromedriver_tests", +- "//courgette:courgette", +- "//courgette:courgette_fuzz", +- "//courgette:courgette_minimal_tool", +- "//courgette:courgette_unittests", + "//media/cast:generate_barcode_video", + "//media/cast:generate_timecode_audio", + "//net:crash_cache", +@@ -575,10 +569,6 @@ group("both_gn_and_gyp") { + + if (is_android || (is_linux && !is_chromeos)) { + deps += [ +- "//breakpad:dump_syms($host_toolchain)", +- "//breakpad:microdump_stackwalk($host_toolchain)", +- "//breakpad:minidump_dump($host_toolchain)", +- "//breakpad:minidump_stackwalk($host_toolchain)", + "//components/network_hints/browser", + "//content/public/app:browser", + "//content/public/app:child", +@@ -664,7 +654,7 @@ group("both_gn_and_gyp") { + deps += + [ "//chrome/installer/mini_installer:next_version_mini_installer" ] + } +- } else if (!is_android && !is_ios) { ++ } else if (!is_android && !is_ios && !is_openbsd) { + deps += [ "//breakpad:symupload($host_toolchain)" ] + } + +@@ -906,7 +896,7 @@ if (!is_ios) { + ] + } + +- if (!is_win && !is_android) { ++ if (!is_win && !is_android && !is_openbsd) { + deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + } + +@@ -917,7 +907,7 @@ if (!is_ios) { + ] + } + +- if (is_linux) { ++ if (is_linux && !is_openbsd) { + deps += [ "//breakpad:dump_syms($host_toolchain)" ] + } + +@@ -966,7 +956,6 @@ group("chromium_builder_perf") { + "//third_party/angle/src/tests:angle_perftests", + ] + } else { +- deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + } + } + } diff --git a/www/iridium/patches/patch-apps_apps_gypi b/www/iridium/patches/patch-apps_apps_gypi deleted file mode 100644 index a115ff5615b..00000000000 --- a/www/iridium/patches/patch-apps_apps_gypi +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-apps_apps_gypi,v 1.2 2015/05/06 14:27:23 robert Exp $ ---- apps/apps.gypi.orig.port Wed Nov 19 06:13:07 2014 -+++ apps/apps.gypi Wed Nov 19 08:38:24 2014 -@@ -19,6 +19,7 @@ - 'chrome_resources.gyp:theme_resources', - 'common/extensions/api/api.gyp:chrome_api', - '../skia/skia.gyp:skia', -+ 'chrome_resources.gyp:theme_resources', - ], - 'include_dirs': [ - '<(INTERMEDIATE_DIR)', diff --git a/www/iridium/patches/patch-apps_ui_views_app_window_frame_view_cc b/www/iridium/patches/patch-apps_ui_views_app_window_frame_view_cc index dccacf30caf..6f77f1ba089 100644 --- a/www/iridium/patches/patch-apps_ui_views_app_window_frame_view_cc +++ b/www/iridium/patches/patch-apps_ui_views_app_window_frame_view_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-apps_ui_views_app_window_frame_view_cc,v 1.3 2015/10/24 18:22:21 robert Exp $ +$OpenBSD: patch-apps_ui_views_app_window_frame_view_cc,v 1.4 2016/10/27 18:30:40 robert Exp $ --- apps/ui/views/app_window_frame_view.cc.orig.port Sat Aug 22 21:01:50 2015 +++ apps/ui/views/app_window_frame_view.cc Wed Sep 2 07:31:54 2015 @@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() diff --git a/www/iridium/patches/patch-ash_display_mirror_window_controller_cc b/www/iridium/patches/patch-ash_display_mirror_window_controller_cc index ba50822e540..c1882ee993c 100644 --- a/www/iridium/patches/patch-ash_display_mirror_window_controller_cc +++ b/www/iridium/patches/patch-ash_display_mirror_window_controller_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- ash/display/mirror_window_controller.cc.orig.port Wed May 25 21:00:54 2016 -+++ ash/display/mirror_window_controller.cc Thu May 26 08:09:39 2016 +$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.6 2016/10/27 18:30:40 robert Exp $ +--- ash/display/mirror_window_controller.cc.orig.port Thu Sep 1 00:03:25 2016 ++++ ash/display/mirror_window_controller.cc Thu Sep 1 11:12:17 2016 @@ -261,7 +261,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { diff --git a/www/iridium/patches/patch-ash_shell_cc b/www/iridium/patches/patch-ash_shell_cc new file mode 100644 index 00000000000..bf8f98f798a --- /dev/null +++ b/www/iridium/patches/patch-ash_shell_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-ash_shell_cc,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- ash/shell.cc.orig.port Tue Oct 25 21:56:43 2016 ++++ ash/shell.cc Tue Oct 25 21:57:45 2016 +@@ -698,7 +698,7 @@ void Shell::Init(const ShellInitParams& init_params) { + + immersive_handler_factory_ = base::MakeUnique(); + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + DCHECK(in_mus_) << "linux desktop does not support ash."; + #endif + diff --git a/www/iridium/patches/patch-base_BUILD_gn b/www/iridium/patches/patch-base_BUILD_gn new file mode 100644 index 00000000000..dc2c49aa206 --- /dev/null +++ b/www/iridium/patches/patch-base_BUILD_gn @@ -0,0 +1,32 @@ +$OpenBSD: patch-base_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- base/BUILD.gn.orig.port Wed Oct 12 21:02:52 2016 ++++ base/BUILD.gn Wed Oct 19 12:55:55 2016 +@@ -1365,6 +1365,28 @@ component("base") { + } + } + ++ if (is_openbsd) { ++ sources -= [ ++ "debug/proc_maps_linux.cc", ++ "files/file_path_watcher_linux.cc", ++ "files/file_util_linux.cc", ++ "process/memory_linux.cc", ++ "process/process_linux.cc", ++ "sys_info_linux.cc", ++ "process/process_iterator_linux.cc", ++ "process/process_metrics_linux.cc", ++ "process/process_handle_linux.cc" ++ ] ++ sources += [ ++ "process/memory_stubs.cc", ++ "process/process_handle_openbsd.cc", ++ "process/process_iterator_openbsd.cc", ++ "process/process_metrics_openbsd.cc", ++ "sys_info_openbsd.cc", ++ "files/file_path_watcher_stub.cc", ++ ] ++ } ++ + # iOS + if (is_ios) { + set_sources_assignment_filter([]) diff --git a/www/iridium/patches/patch-base_atomicops_h b/www/iridium/patches/patch-base_atomicops_h index 06ff49797cb..b77c0ce91b7 100644 --- a/www/iridium/patches/patch-base_atomicops_h +++ b/www/iridium/patches/patch-base_atomicops_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_atomicops_h,v 1.2 2015/05/06 14:27:23 robert Exp $ +$OpenBSD: patch-base_atomicops_h,v 1.3 2016/10/27 18:30:40 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; diff --git a/www/iridium/patches/patch-base_base_gypi b/www/iridium/patches/patch-base_base_gypi deleted file mode 100644 index 8e27453de5d..00000000000 --- a/www/iridium/patches/patch-base_base_gypi +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-base_base_gypi,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- base/base.gypi.orig.port Wed May 25 21:00:55 2016 -+++ base/base.gypi Thu May 26 08:09:39 2016 -@@ -1021,11 +1021,17 @@ - 'process/memory_stubs.cc', - ], - 'sources/': [ -+ ['exclude', '^debug/proc_maps_linux\\.cc$'], - ['exclude', '^files/file_path_watcher_linux\\.cc$'], -- ['exclude', '^files/file_path_watcher_stub\\.cc$'], -+ ['exclude', '^files/file_path_watcher_kqueue\\.cc$'], - ['exclude', '^files/file_util_linux\\.cc$'], -+ ['exclude', '^process/memory_linux\\.cc$'], - ['exclude', '^process/process_linux\\.cc$'], - ['exclude', '^sys_info_linux\\.cc$'], -+ ['exclude', '^process/process_iterator_linux\\.cc$'], -+ ['exclude', '^process/process_metrics_linux\\.cc$'], -+ ['exclude', '^files/file_path_watcher_fsevents\\.cc$'], -+ ['exclude', '^files/file_path_watcher_fsevents\\.h$'], - ], - }], - # Remove all unnecessary files for build_nexe.py to avoid exceeding diff --git a/www/iridium/patches/patch-base_base_paths_posix_cc b/www/iridium/patches/patch-base_base_paths_posix_cc index 9b4faeef744..662f891cae9 100644 --- a/www/iridium/patches/patch-base_base_paths_posix_cc +++ b/www/iridium/patches/patch-base_base_paths_posix_cc @@ -1,8 +1,12 @@ -$OpenBSD: patch-base_base_paths_posix_cc,v 1.3 2016/05/28 14:49:39 robert Exp $ ---- base/base_paths_posix.cc.orig.port Wed May 25 04:54:06 2016 -+++ base/base_paths_posix.cc Sat May 28 10:25:21 2016 -@@ -73,7 +73,7 @@ bool PathProviderPosix(int key, FilePath* result) { - if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) +$OpenBSD: patch-base_base_paths_posix_cc,v 1.4 2016/10/27 18:30:40 robert Exp $ +--- base/base_paths_posix.cc.orig.port Thu Oct 27 14:43:06 2016 ++++ base/base_paths_posix.cc Thu Oct 27 14:43:25 2016 +@@ -70,10 +70,10 @@ bool PathProviderPosix(int key, FilePath* result) { + #elif defined(OS_OPENBSD) + // There is currently no way to get the executable path on OpenBSD + char* cpath; +- if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) ++ if ((cpath = getenv("IRIDIUM_EXE_PATH")) != NULL) *result = FilePath(cpath); else - *result = FilePath("/usr/local/chrome/chrome"); diff --git a/www/iridium/patches/patch-base_debug_debugger_posix_cc b/www/iridium/patches/patch-base_debug_debugger_posix_cc index 8e6d4a06f34..f73007ed46c 100644 --- a/www/iridium/patches/patch-base_debug_debugger_posix_cc +++ b/www/iridium/patches/patch-base_debug_debugger_posix_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.6 2016/10/27 18:30:40 robert Exp $ --- base/debug/debugger_posix.cc.orig.port Wed May 25 04:54:06 2016 +++ base/debug/debugger_posix.cc Thu May 26 08:09:39 2016 @@ -32,6 +32,10 @@ diff --git a/www/iridium/patches/patch-base_debug_stack_trace_h b/www/iridium/patches/patch-base_debug_stack_trace_h index d5c52fa8fdf..851ff2003f1 100644 --- a/www/iridium/patches/patch-base_debug_stack_trace_h +++ b/www/iridium/patches/patch-base_debug_stack_trace_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_debug_stack_trace_h,v 1.3 2016/03/23 20:13:06 robert Exp $ +$OpenBSD: patch-base_debug_stack_trace_h,v 1.4 2016/10/27 18:30:40 robert Exp $ --- base/debug/stack_trace.h.orig.port Wed Feb 24 00:01:57 2016 +++ base/debug/stack_trace.h Thu Mar 3 09:43:25 2016 @@ -14,6 +14,7 @@ diff --git a/www/iridium/patches/patch-base_debug_stack_trace_posix_cc b/www/iridium/patches/patch-base_debug_stack_trace_posix_cc index 697b62deda3..fe61f62186d 100644 --- a/www/iridium/patches/patch-base_debug_stack_trace_posix_cc +++ b/www/iridium/patches/patch-base_debug_stack_trace_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.7 2016/05/28 14:49:39 robert Exp $ ---- base/debug/stack_trace_posix.cc.orig.port Wed May 25 04:54:06 2016 -+++ base/debug/stack_trace_posix.cc Thu May 26 08:09:39 2016 -@@ -572,6 +572,9 @@ class SandboxSymbolizeHelper { +$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.8 2016/10/27 18:30:40 robert Exp $ +--- base/debug/stack_trace_posix.cc.orig.port Wed Oct 12 21:02:52 2016 ++++ base/debug/stack_trace_posix.cc Wed Oct 19 12:55:56 2016 +@@ -571,6 +571,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -11,7 +11,7 @@ $OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.7 2016/05/28 14:49:39 robert // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -587,6 +590,7 @@ class SandboxSymbolizeHelper { +@@ -586,6 +589,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -19,7 +19,7 @@ $OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.7 2016/05/28 14:49:39 robert } // Opens all object files and caches their file descriptors. -@@ -717,7 +721,7 @@ StackTrace::StackTrace() { +@@ -718,7 +722,7 @@ StackTrace::StackTrace() { // NOTE: This code MUST be async-signal safe (it's used by in-process // stack dumping signal handler). NO malloc or stdio is allowed here. diff --git a/www/iridium/patches/patch-base_linux_util_cc b/www/iridium/patches/patch-base_linux_util_cc new file mode 100644 index 00000000000..0e8ed9b3bdb --- /dev/null +++ b/www/iridium/patches/patch-base_linux_util_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-base_linux_util_cc,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- base/linux_util.cc.orig.port Wed Oct 12 21:02:52 2016 ++++ base/linux_util.cc Wed Oct 19 12:55:56 2016 +@@ -115,7 +115,7 @@ char g_linux_distro[kDistroSize] = + #endif + + std::string GetLinuxDistro() { +-#if defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + return g_linux_distro; + #elif defined(OS_LINUX) + LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance(); diff --git a/www/iridium/patches/patch-base_message_loop_message_loop_cc b/www/iridium/patches/patch-base_message_loop_message_loop_cc deleted file mode 100644 index f62de6025f0..00000000000 --- a/www/iridium/patches/patch-base_message_loop_message_loop_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-base_message_loop_message_loop_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- base/message_loop/message_loop.cc.orig.port Wed May 25 21:00:55 2016 -+++ base/message_loop/message_loop.cc Thu May 26 08:09:39 2016 -@@ -211,7 +211,7 @@ std::unique_ptr MessageLoop::CreateMessag - // TODO(rvargas): Get rid of the OS guards. - #if defined(USE_GLIB) && !defined(OS_NACL) - typedef MessagePumpGlib MessagePumpForUI; --#elif defined(OS_LINUX) && !defined(OS_NACL) -+#elif defined(OS_BSD) && !defined(OS_NACL) - typedef MessagePumpLibevent MessagePumpForUI; - #endif - diff --git a/www/iridium/patches/patch-base_native_library_posix_cc b/www/iridium/patches/patch-base_native_library_posix_cc new file mode 100644 index 00000000000..640e76fd734 --- /dev/null +++ b/www/iridium/patches/patch-base_native_library_posix_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-base_native_library_posix_cc,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- base/native_library_posix.cc.orig.port Thu Oct 20 11:34:10 2016 ++++ base/native_library_posix.cc Thu Oct 20 11:34:27 2016 +@@ -30,7 +30,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP + // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, + // and http://crbug.com/40794. + int flags = RTLD_LAZY; +-#if defined(OS_ANDROID) ++#if defined(OS_ANDROID) || defined(OS_BSD) + // Android dlopen() requires further investigation, as it might vary across + // versions. Crash here to warn developers that they're trying to rely on + // uncertain behavior. diff --git a/www/iridium/patches/patch-base_posix_unix_domain_socket_linux_cc b/www/iridium/patches/patch-base_posix_unix_domain_socket_linux_cc index 29e4fa93482..ea0e872ff51 100644 --- a/www/iridium/patches/patch-base_posix_unix_domain_socket_linux_cc +++ b/www/iridium/patches/patch-base_posix_unix_domain_socket_linux_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_posix_unix_domain_socket_linux_cc,v 1.4 2015/10/24 18:22:21 robert Exp $ +$OpenBSD: patch-base_posix_unix_domain_socket_linux_cc,v 1.5 2016/10/27 18:30:40 robert Exp $ --- base/posix/unix_domain_socket_linux.cc.orig.port Sat Aug 22 21:01:50 2015 +++ base/posix/unix_domain_socket_linux.cc Wed Sep 2 07:31:54 2015 @@ -5,7 +5,10 @@ diff --git a/www/iridium/patches/patch-base_process_launch_h b/www/iridium/patches/patch-base_process_launch_h index 409f63e7502..afbe30be839 100644 --- a/www/iridium/patches/patch-base_process_launch_h +++ b/www/iridium/patches/patch-base_process_launch_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-base_process_launch_h,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- base/process/launch.h.orig.port Wed May 25 04:54:06 2016 -+++ base/process/launch.h Thu May 26 08:09:39 2016 +$OpenBSD: patch-base_process_launch_h,v 1.6 2016/10/27 18:30:40 robert Exp $ +--- base/process/launch.h.orig.port Wed Oct 12 21:02:52 2016 ++++ base/process/launch.h Wed Oct 19 12:55:56 2016 @@ -138,7 +138,7 @@ struct BASE_EXPORT LaunchOptions { // will be the same as its pid. - bool new_process_group; + bool new_process_group = false; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/iridium/patches/patch-base_process_memory_cc b/www/iridium/patches/patch-base_process_memory_cc index 23d3e199320..8be4ec08782 100644 --- a/www/iridium/patches/patch-base_process_memory_cc +++ b/www/iridium/patches/patch-base_process_memory_cc @@ -1,8 +1,17 @@ -$OpenBSD: patch-base_process_memory_cc,v 1.4 2016/03/23 20:13:06 robert Exp $ ---- base/process/memory.cc.orig.port Wed Feb 24 00:01:57 2016 -+++ base/process/memory.cc Thu Mar 3 09:43:25 2016 -@@ -26,7 +26,7 @@ void TerminateBecauseOutOfMemory(size_t size) { - } +$OpenBSD: patch-base_process_memory_cc,v 1.5 2016/10/27 18:30:40 robert Exp $ +--- base/process/memory.cc.orig.port Fri Oct 21 00:01:59 2016 ++++ base/process/memory.cc Sat Oct 22 15:54:28 2016 +@@ -10,7 +10,7 @@ + namespace base { + + // Defined in memory_win.cc for Windows. +-#if !defined(OS_WIN) ++#if !defined(OS_WIN) && !defined(OS_BSD) + + namespace { + +@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) { + #endif // Defined in memory_mac.mm for Mac. -#if !defined(OS_MACOSX) diff --git a/www/iridium/patches/patch-base_process_process_handle_openbsd_cc b/www/iridium/patches/patch-base_process_process_handle_openbsd_cc index feab2d828ec..725af6843ce 100644 --- a/www/iridium/patches/patch-base_process_process_handle_openbsd_cc +++ b/www/iridium/patches/patch-base_process_process_handle_openbsd_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_process_process_handle_openbsd_cc,v 1.3 2016/03/23 20:13:06 robert Exp $ +$OpenBSD: patch-base_process_process_handle_openbsd_cc,v 1.4 2016/10/27 18:30:40 robert Exp $ --- base/process/process_handle_openbsd.cc.orig.port Thu Mar 3 09:47:09 2016 +++ base/process/process_handle_openbsd.cc Thu Mar 3 09:49:15 2016 @@ -6,6 +6,8 @@ diff --git a/www/iridium/patches/patch-base_process_process_iterator_openbsd_cc b/www/iridium/patches/patch-base_process_process_iterator_openbsd_cc index 3950e85b27d..cdd64ff5394 100644 --- a/www/iridium/patches/patch-base_process_process_iterator_openbsd_cc +++ b/www/iridium/patches/patch-base_process_process_iterator_openbsd_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_process_process_iterator_openbsd_cc,v 1.3 2016/03/23 20:13:06 robert Exp $ +$OpenBSD: patch-base_process_process_iterator_openbsd_cc,v 1.4 2016/10/27 18:30:40 robert Exp $ --- base/process/process_iterator_openbsd.cc.orig.port Thu Mar 3 09:49:21 2016 +++ base/process/process_iterator_openbsd.cc Thu Mar 3 09:49:53 2016 @@ -6,6 +6,9 @@ diff --git a/www/iridium/patches/patch-base_process_process_metrics_h b/www/iridium/patches/patch-base_process_process_metrics_h index b09030d8ebf..3ee1262b60c 100644 --- a/www/iridium/patches/patch-base_process_process_metrics_h +++ b/www/iridium/patches/patch-base_process_process_metrics_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_process_process_metrics_h,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- base/process/process_metrics.h.orig.port Wed May 25 04:54:06 2016 -+++ base/process/process_metrics.h Thu May 26 08:09:40 2016 -@@ -253,7 +253,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto +$OpenBSD: patch-base_process_process_metrics_h,v 1.5 2016/10/27 18:30:40 robert Exp $ +--- base/process/process_metrics.h.orig.port Wed Oct 12 21:02:53 2016 ++++ base/process/process_metrics.h Wed Oct 19 12:55:56 2016 +@@ -254,7 +254,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto #endif // defined(OS_POSIX) #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ diff --git a/www/iridium/patches/patch-base_process_process_metrics_openbsd_cc b/www/iridium/patches/patch-base_process_process_metrics_openbsd_cc index 368292b7ea8..0f8a04fafcb 100644 --- a/www/iridium/patches/patch-base_process_process_metrics_openbsd_cc +++ b/www/iridium/patches/patch-base_process_process_metrics_openbsd_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:06 robert Exp $ ---- base/process/process_metrics_openbsd.cc.orig.port Thu Mar 3 09:50:00 2016 -+++ base/process/process_metrics_openbsd.cc Thu Mar 3 09:52:22 2016 -@@ -5,10 +5,21 @@ - #include "base/macros.h" +$OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.4 2016/10/27 18:30:40 robert Exp $ +--- base/process/process_metrics_openbsd.cc.orig.port Wed Oct 12 21:02:53 2016 ++++ base/process/process_metrics_openbsd.cc Wed Oct 19 12:55:56 2016 +@@ -4,10 +4,21 @@ + #include "base/process/process_metrics.h" +#include "base/files/file_util.h" @@ -21,9 +21,9 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:0 #include +#include - namespace base { - -@@ -18,20 +29,27 @@ ProcessMetrics* ProcessMetrics::CreateProcessMetrics(P + #include "base/macros.h" + #include "base/memory/ptr_util.h" +@@ -22,20 +33,27 @@ std::unique_ptr ProcessMetrics::Create } size_t ProcessMetrics::GetPagefileUsage() const { @@ -56,7 +56,7 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:0 } size_t ProcessMetrics::GetPeakPagefileUsage() const { -@@ -39,20 +57,28 @@ size_t ProcessMetrics::GetPeakPagefileUsage() const { +@@ -43,20 +61,28 @@ size_t ProcessMetrics::GetPeakPagefileUsage() const { } size_t ProcessMetrics::GetWorkingSetSize() const { @@ -90,7 +90,7 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:0 } size_t ProcessMetrics::GetPeakWorkingSetSize() const { -@@ -92,20 +118,27 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun +@@ -96,20 +122,27 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun } static int GetProcessCPU(pid_t pid) { @@ -122,7 +122,7 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:0 } double ProcessMetrics::GetCPUUsage() { -@@ -119,7 +152,6 @@ double ProcessMetrics::GetCPUUsage() { +@@ -123,7 +156,6 @@ double ProcessMetrics::GetCPUUsage() { } int64_t time_delta = (time - last_cpu_time_).InMicroseconds(); diff --git a/www/iridium/patches/patch-base_process_process_posix_cc b/www/iridium/patches/patch-base_process_process_posix_cc index 97c82611fb3..c661274fd22 100644 --- a/www/iridium/patches/patch-base_process_process_posix_cc +++ b/www/iridium/patches/patch-base_process_process_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_process_process_posix_cc,v 1.6 2016/03/23 20:13:06 robert Exp $ ---- base/process/process_posix.cc.orig.port Wed Feb 24 00:01:57 2016 -+++ base/process/process_posix.cc Thu Mar 3 09:43:25 2016 -@@ -19,9 +19,13 @@ +$OpenBSD: patch-base_process_process_posix_cc,v 1.7 2016/10/27 18:30:40 robert Exp $ +--- base/process/process_posix.cc.orig.port Wed Oct 12 21:02:53 2016 ++++ base/process/process_posix.cc Wed Oct 19 12:55:56 2016 +@@ -20,9 +20,13 @@ #if defined(OS_MACOSX) #include #endif @@ -15,7 +15,7 @@ $OpenBSD: patch-base_process_process_posix_cc,v 1.6 2016/03/23 20:13:06 robert E #if !defined(OS_NACL_NONSFI) bool WaitpidWithTimeout(base::ProcessHandle handle, -@@ -256,12 +260,10 @@ Process Process::DeprecatedGetProcessFromHandle(Proces +@@ -257,12 +261,10 @@ Process Process::DeprecatedGetProcessFromHandle(Proces return Process(handle); } @@ -29,7 +29,7 @@ $OpenBSD: patch-base_process_process_posix_cc,v 1.6 2016/03/23 20:13:06 robert E bool Process::IsValid() const { return process_ != kNullProcessHandle; -@@ -357,21 +359,23 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout +@@ -361,21 +363,23 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout return WaitForExitWithTimeoutImpl(Handle(), exit_code, timeout); } diff --git a/www/iridium/patches/patch-base_sys_info_openbsd_cc b/www/iridium/patches/patch-base_sys_info_openbsd_cc index 00b38a53829..c5c6bca1166 100644 --- a/www/iridium/patches/patch-base_sys_info_openbsd_cc +++ b/www/iridium/patches/patch-base_sys_info_openbsd_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-base_sys_info_openbsd_cc,v 1.5 2016/03/23 20:13:06 robert Exp $ ---- base/sys_info_openbsd.cc.orig.port Wed Feb 24 00:01:57 2016 -+++ base/sys_info_openbsd.cc Sat Mar 5 23:38:02 2016 +$OpenBSD: patch-base_sys_info_openbsd_cc,v 1.6 2016/10/27 18:30:40 robert Exp $ +--- base/sys_info_openbsd.cc.orig.port Thu Sep 1 00:03:26 2016 ++++ base/sys_info_openbsd.cc Thu Sep 1 11:44:07 2016 @@ -29,6 +29,8 @@ int64_t AmountOfMemory(int pages_name) { namespace base { @@ -10,7 +10,7 @@ $OpenBSD: patch-base_sys_info_openbsd_cc,v 1.5 2016/03/23 20:13:06 robert Exp $ // static int SysInfo::NumberOfProcessors() { int mib[] = { CTL_HW, HW_NCPU }; -@@ -43,12 +45,10 @@ int SysInfo::NumberOfProcessors() { +@@ -43,24 +45,10 @@ int SysInfo::NumberOfProcessors() { // static int64_t SysInfo::AmountOfPhysicalMemory() { @@ -20,6 +20,18 @@ $OpenBSD: patch-base_sys_info_openbsd_cc,v 1.5 2016/03/23 20:13:06 robert Exp $ -// static -int64_t SysInfo::AmountOfAvailablePhysicalMemory() { - return AmountOfMemory(_SC_AVPHYS_PAGES); +-} +- +-// static +-uint64_t SysInfo::MaxSharedMemorySize() { +- int mib[] = { CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX }; +- size_t limit; +- size_t size = sizeof(limit); +- if (sysctl(mib, arraysize(mib), &limit, &size, NULL, 0) < 0) { +- NOTREACHED(); +- return 0; +- } +- return static_cast(limit); + // pledge(2) + if (!aofpmem) + aofpmem = AmountOfMemory(_SC_PHYS_PAGES); diff --git a/www/iridium/patches/patch-base_sys_info_posix_cc b/www/iridium/patches/patch-base_sys_info_posix_cc index 79f45222e58..7cc8637a67a 100644 --- a/www/iridium/patches/patch-base_sys_info_posix_cc +++ b/www/iridium/patches/patch-base_sys_info_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_sys_info_posix_cc,v 1.3 2016/03/23 20:13:06 robert Exp $ ---- base/sys_info_posix.cc.orig.port Thu Mar 3 09:54:05 2016 -+++ base/sys_info_posix.cc Thu Mar 3 11:01:40 2016 -@@ -89,6 +89,17 @@ int64_t SysInfo::AmountOfVirtualMemory() { +$OpenBSD: patch-base_sys_info_posix_cc,v 1.4 2016/10/27 18:30:40 robert Exp $ +--- base/sys_info_posix.cc.orig.port Wed Oct 12 21:02:53 2016 ++++ base/sys_info_posix.cc Wed Oct 19 12:55:56 2016 +@@ -140,6 +140,17 @@ int64_t SysInfo::AmountOfVirtualMemory() { } // static diff --git a/www/iridium/patches/patch-base_third_party_libevent_event-config_h b/www/iridium/patches/patch-base_third_party_libevent_event-config_h new file mode 100644 index 00000000000..00c9cf7badc --- /dev/null +++ b/www/iridium/patches/patch-base_third_party_libevent_event-config_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-base_third_party_libevent_event-config_h,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- base/third_party/libevent/event-config.h.orig.port Sun Aug 14 16:13:31 2016 ++++ base/third_party/libevent/event-config.h Sun Aug 14 16:13:43 2016 +@@ -15,6 +15,8 @@ + #include "base/third_party/libevent/linux/event-config.h" + #elif defined(__FreeBSD__) + #include "base/third_party/libevent/freebsd/event-config.h" ++#elif defined(__OpenBSD__) ++#include "base/third_party/libevent/openbsd/event-config.h" + #elif defined(__sun) + #include "base/third_party/libevent/solaris/event-config.h" + #else diff --git a/www/iridium/patches/patch-base_third_party_libevent_openbsd_config_h b/www/iridium/patches/patch-base_third_party_libevent_openbsd_config_h new file mode 100644 index 00000000000..9e9c78db076 --- /dev/null +++ b/www/iridium/patches/patch-base_third_party_libevent_openbsd_config_h @@ -0,0 +1,280 @@ +$OpenBSD: patch-base_third_party_libevent_openbsd_config_h,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- base/third_party/libevent/openbsd/config.h.orig.port Sun Aug 14 16:14:00 2016 ++++ base/third_party/libevent/openbsd/config.h Sun Aug 14 16:14:07 2016 +@@ -0,0 +1,276 @@ ++/* config.h. Generated from config.h.in by configure. */ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* Define if clock_gettime is available in libc */ ++#define DNS_USE_CPU_CLOCK_FOR_ID 1 ++ ++/* Define is no secure id variant is available */ ++/* #undef DNS_USE_GETTIMEOFDAY_FOR_ID */ ++ ++/* Define to 1 if you have the `clock_gettime' function. */ ++#define HAVE_CLOCK_GETTIME 1 ++ ++/* Define if /dev/poll is available */ ++/* #undef HAVE_DEVPOLL */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_DLFCN_H 1 ++ ++/* Define if your system supports the epoll system calls */ ++/* #undef HAVE_EPOLL */ ++ ++/* Define to 1 if you have the `epoll_ctl' function. */ ++/* #undef HAVE_EPOLL_CTL */ ++ ++/* Define if your system supports event ports */ ++/* #undef HAVE_EVENT_PORTS */ ++ ++/* Define to 1 if you have the `fcntl' function. */ ++#define HAVE_FCNTL 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_FCNTL_H 1 ++ ++/* Define to 1 if the system has the type `fd_mask'. */ ++#define HAVE_FD_MASK 1 ++ ++/* Define to 1 if you have the `getaddrinfo' function. */ ++#define HAVE_GETADDRINFO 1 ++ ++/* Define to 1 if you have the `getegid' function. */ ++#define HAVE_GETEGID 1 ++ ++/* Define to 1 if you have the `geteuid' function. */ ++#define HAVE_GETEUID 1 ++ ++/* Define to 1 if you have the `getnameinfo' function. */ ++#define HAVE_GETNAMEINFO 1 ++ ++/* Define to 1 if you have the `gettimeofday' function. */ ++#define HAVE_GETTIMEOFDAY 1 ++ ++/* Define to 1 if you have the `inet_ntop' function. */ ++#define HAVE_INET_NTOP 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the `issetugid' function. */ ++#define HAVE_ISSETUGID 1 ++ ++/* Define to 1 if you have the `kqueue' function. */ ++#define HAVE_KQUEUE 1 ++ ++/* Define to 1 if you have the `nsl' library (-lnsl). */ ++/* #undef HAVE_LIBNSL */ ++ ++/* Define to 1 if you have the `resolv' library (-lresolv). */ ++/* #undef HAVE_LIBRESOLV */ ++ ++/* Define to 1 if you have the `rt' library (-lrt). */ ++/* #undef HAVE_LIBRT */ ++ ++/* Define to 1 if you have the `socket' library (-lsocket). */ ++/* #undef HAVE_LIBSOCKET */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_NETINET_IN6_H */ ++ ++/* Define to 1 if you have the `poll' function. */ ++#define HAVE_POLL 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_POLL_H 1 ++ ++/* Define to 1 if you have the `port_create' function. */ ++/* #undef HAVE_PORT_CREATE */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_PORT_H */ ++ ++/* Define to 1 if you have the `select' function. */ ++#define HAVE_SELECT 1 ++ ++/* Define if F_SETFD is defined in */ ++#define HAVE_SETFD 1 ++ ++/* Define to 1 if you have the `sigaction' function. */ ++#define HAVE_SIGACTION 1 ++ ++/* Define to 1 if you have the `signal' function. */ ++#define HAVE_SIGNAL 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SIGNAL_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDARG_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the `strlcpy' function. */ ++#define HAVE_STRLCPY 1 ++ ++/* Define to 1 if you have the `strsep' function. */ ++#define HAVE_STRSEP 1 ++ ++/* Define to 1 if you have the `strtok_r' function. */ ++#define HAVE_STRTOK_R 1 ++ ++/* Define to 1 if you have the `strtoll' function. */ ++#define HAVE_STRTOLL 1 ++ ++/* Define to 1 if the system has the type `struct in6_addr'. */ ++#define HAVE_STRUCT_IN6_ADDR 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SYS_DEVPOLL_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SYS_EPOLL_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_EVENT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_IOCTL_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_PARAM_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_QUEUE_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_SELECT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_SOCKET_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TIME_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define if TAILQ_FOREACH is defined in */ ++#define HAVE_TAILQFOREACH 1 ++ ++/* Define if timeradd is defined in */ ++#define HAVE_TIMERADD 1 ++ ++/* Define if timerclear is defined in */ ++#define HAVE_TIMERCLEAR 1 ++ ++/* Define if timercmp is defined in */ ++#define HAVE_TIMERCMP 1 ++ ++/* Define if timerisset is defined in */ ++#define HAVE_TIMERISSET 1 ++ ++/* Define to 1 if the system has the type `uint16_t'. */ ++#define HAVE_UINT16_T 1 ++ ++/* Define to 1 if the system has the type `uint32_t'. */ ++#define HAVE_UINT32_T 1 ++ ++/* Define to 1 if the system has the type `uint64_t'. */ ++#define HAVE_UINT64_T 1 ++ ++/* Define to 1 if the system has the type `uint8_t'. */ ++#define HAVE_UINT8_T 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_UNISTD_H 1 ++ ++/* Define to 1 if you have the `vasprintf' function. */ ++#define HAVE_VASPRINTF 1 ++ ++/* Define if kqueue works correctly with pipes */ ++#define HAVE_WORKING_KQUEUE 1 ++ ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#define LT_OBJDIR ".libs/" ++ ++/* Numeric representation of the version */ ++#define NUMERIC_VERSION 0x01040f00 ++ ++/* Name of package */ ++#define PACKAGE "libevent" ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "" ++ ++/* Define to the home page for this package. */ ++#define PACKAGE_URL "" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "" ++ ++/* The size of `int', as computed by sizeof. */ ++#define SIZEOF_INT 4 ++ ++/* The size of `long', as computed by sizeof. */ ++#define SIZEOF_LONG 8 ++ ++/* The size of `long long', as computed by sizeof. */ ++#define SIZEOF_LONG_LONG 8 ++ ++/* The size of `short', as computed by sizeof. */ ++#define SIZEOF_SHORT 2 ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Define to 1 if you can safely include both and . */ ++#define TIME_WITH_SYS_TIME 1 ++ ++/* Version number of package */ ++#define VERSION "1.4.15" ++ ++/* Define to appropriate substitue if compiler doesnt have __func__ */ ++/* #undef __func__ */ ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++/* #undef const */ ++ ++/* Define to `__inline__' or `__inline' if that's what the C compiler ++ calls it, or to nothing if 'inline' is not supported under any name. */ ++#ifndef __cplusplus ++/* #undef inline */ ++#endif ++ ++/* Define to `int' if does not define. */ ++/* #undef pid_t */ ++ ++/* Define to `unsigned int' if does not define. */ ++/* #undef size_t */ ++ ++/* Define to unsigned int if you dont have it */ ++/* #undef socklen_t */ diff --git a/www/iridium/patches/patch-base_third_party_libevent_openbsd_event-config_h b/www/iridium/patches/patch-base_third_party_libevent_openbsd_event-config_h new file mode 100644 index 00000000000..f98765d02a2 --- /dev/null +++ b/www/iridium/patches/patch-base_third_party_libevent_openbsd_event-config_h @@ -0,0 +1,288 @@ +$OpenBSD: patch-base_third_party_libevent_openbsd_event-config_h,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- base/third_party/libevent/openbsd/event-config.h.orig.port Sun Aug 14 16:14:04 2016 ++++ base/third_party/libevent/openbsd/event-config.h Sun Aug 14 16:14:07 2016 +@@ -0,0 +1,284 @@ ++/* event-config.h ++ * Generated by autoconf; post-processed by libevent. ++ * Do not edit this file. ++ * Do not rely on macros in this file existing in later versions. ++ */ ++#ifndef _EVENT_CONFIG_H_ ++#define _EVENT_CONFIG_H_ ++/* config.h. Generated from config.h.in by configure. */ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* Define if clock_gettime is available in libc */ ++#define _EVENT_DNS_USE_CPU_CLOCK_FOR_ID 1 ++ ++/* Define is no secure id variant is available */ ++/* #undef _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID */ ++ ++/* Define to 1 if you have the `clock_gettime' function. */ ++#define _EVENT_HAVE_CLOCK_GETTIME 1 ++ ++/* Define if /dev/poll is available */ ++/* #undef _EVENT_HAVE_DEVPOLL */ ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_DLFCN_H 1 ++ ++/* Define if your system supports the epoll system calls */ ++/* #undef _EVENT_HAVE_EPOLL */ ++ ++/* Define to 1 if you have the `epoll_ctl' function. */ ++/* #undef _EVENT_HAVE_EPOLL_CTL */ ++ ++/* Define if your system supports event ports */ ++/* #undef _EVENT_HAVE_EVENT_PORTS */ ++ ++/* Define to 1 if you have the `fcntl' function. */ ++#define _EVENT_HAVE_FCNTL 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_FCNTL_H 1 ++ ++/* Define to 1 if the system has the type `fd_mask'. */ ++#define _EVENT_HAVE_FD_MASK 1 ++ ++/* Define to 1 if you have the `getaddrinfo' function. */ ++#define _EVENT_HAVE_GETADDRINFO 1 ++ ++/* Define to 1 if you have the `getegid' function. */ ++#define _EVENT_HAVE_GETEGID 1 ++ ++/* Define to 1 if you have the `geteuid' function. */ ++#define _EVENT_HAVE_GETEUID 1 ++ ++/* Define to 1 if you have the `getnameinfo' function. */ ++#define _EVENT_HAVE_GETNAMEINFO 1 ++ ++/* Define to 1 if you have the `gettimeofday' function. */ ++#define _EVENT_HAVE_GETTIMEOFDAY 1 ++ ++/* Define to 1 if you have the `inet_ntop' function. */ ++#define _EVENT_HAVE_INET_NTOP 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the `issetugid' function. */ ++#define _EVENT_HAVE_ISSETUGID 1 ++ ++/* Define to 1 if you have the `kqueue' function. */ ++#define _EVENT_HAVE_KQUEUE 1 ++ ++/* Define to 1 if you have the `nsl' library (-lnsl). */ ++/* #undef _EVENT_HAVE_LIBNSL */ ++ ++/* Define to 1 if you have the `resolv' library (-lresolv). */ ++/* #undef _EVENT_HAVE_LIBRESOLV */ ++ ++/* Define to 1 if you have the `rt' library (-lrt). */ ++/* #undef _EVENT_HAVE_LIBRT */ ++ ++/* Define to 1 if you have the `socket' library (-lsocket). */ ++/* #undef _EVENT_HAVE_LIBSOCKET */ ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef _EVENT_HAVE_NETINET_IN6_H */ ++ ++/* Define to 1 if you have the `poll' function. */ ++#define _EVENT_HAVE_POLL 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_POLL_H 1 ++ ++/* Define to 1 if you have the `port_create' function. */ ++/* #undef _EVENT_HAVE_PORT_CREATE */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef _EVENT_HAVE_PORT_H */ ++ ++/* Define to 1 if you have the `select' function. */ ++#define _EVENT_HAVE_SELECT 1 ++ ++/* Define if F_SETFD is defined in */ ++#define _EVENT_HAVE_SETFD 1 ++ ++/* Define to 1 if you have the `sigaction' function. */ ++#define _EVENT_HAVE_SIGACTION 1 ++ ++/* Define to 1 if you have the `signal' function. */ ++#define _EVENT_HAVE_SIGNAL 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_SIGNAL_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_STDARG_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the `strlcpy' function. */ ++#define _EVENT_HAVE_STRLCPY 1 ++ ++/* Define to 1 if you have the `strsep' function. */ ++#define _EVENT_HAVE_STRSEP 1 ++ ++/* Define to 1 if you have the `strtok_r' function. */ ++#define _EVENT_HAVE_STRTOK_R 1 ++ ++/* Define to 1 if you have the `strtoll' function. */ ++#define _EVENT_HAVE_STRTOLL 1 ++ ++/* Define to 1 if the system has the type `struct in6_addr'. */ ++#define _EVENT_HAVE_STRUCT_IN6_ADDR 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef _EVENT_HAVE_SYS_DEVPOLL_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef _EVENT_HAVE_SYS_EPOLL_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_SYS_EVENT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_SYS_IOCTL_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_SYS_PARAM_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_SYS_QUEUE_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_SYS_SELECT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_SYS_SOCKET_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_SYS_TIME_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_SYS_TYPES_H 1 ++ ++/* Define if TAILQ_FOREACH is defined in */ ++#define _EVENT_HAVE_TAILQFOREACH 1 ++ ++/* Define if timeradd is defined in */ ++#define _EVENT_HAVE_TIMERADD 1 ++ ++/* Define if timerclear is defined in */ ++#define _EVENT_HAVE_TIMERCLEAR 1 ++ ++/* Define if timercmp is defined in */ ++#define _EVENT_HAVE_TIMERCMP 1 ++ ++/* Define if timerisset is defined in */ ++#define _EVENT_HAVE_TIMERISSET 1 ++ ++/* Define to 1 if the system has the type `uint16_t'. */ ++#define _EVENT_HAVE_UINT16_T 1 ++ ++/* Define to 1 if the system has the type `uint32_t'. */ ++#define _EVENT_HAVE_UINT32_T 1 ++ ++/* Define to 1 if the system has the type `uint64_t'. */ ++#define _EVENT_HAVE_UINT64_T 1 ++ ++/* Define to 1 if the system has the type `uint8_t'. */ ++#define _EVENT_HAVE_UINT8_T 1 ++ ++/* Define to 1 if you have the header file. */ ++#define _EVENT_HAVE_UNISTD_H 1 ++ ++/* Define to 1 if you have the `vasprintf' function. */ ++#define _EVENT_HAVE_VASPRINTF 1 ++ ++/* Define if kqueue works correctly with pipes */ ++#define _EVENT_HAVE_WORKING_KQUEUE 1 ++ ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#define _EVENT_LT_OBJDIR ".libs/" ++ ++/* Numeric representation of the version */ ++#define _EVENT_NUMERIC_VERSION 0x01040f00 ++ ++/* Name of package */ ++#define _EVENT_PACKAGE "libevent" ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define _EVENT_PACKAGE_BUGREPORT "" ++ ++/* Define to the full name of this package. */ ++#define _EVENT_PACKAGE_NAME "" ++ ++/* Define to the full name and version of this package. */ ++#define _EVENT_PACKAGE_STRING "" ++ ++/* Define to the one symbol short name of this package. */ ++#define _EVENT_PACKAGE_TARNAME "" ++ ++/* Define to the home page for this package. */ ++#define _EVENT_PACKAGE_URL "" ++ ++/* Define to the version of this package. */ ++#define _EVENT_PACKAGE_VERSION "" ++ ++/* The size of `int', as computed by sizeof. */ ++#define _EVENT_SIZEOF_INT 4 ++ ++/* The size of `long', as computed by sizeof. */ ++#define _EVENT_SIZEOF_LONG 8 ++ ++/* The size of `long long', as computed by sizeof. */ ++#define _EVENT_SIZEOF_LONG_LONG 8 ++ ++/* The size of `short', as computed by sizeof. */ ++#define _EVENT_SIZEOF_SHORT 2 ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define _EVENT_STDC_HEADERS 1 ++ ++/* Define to 1 if you can safely include both and . */ ++#define _EVENT_TIME_WITH_SYS_TIME 1 ++ ++/* Version number of package */ ++#define _EVENT_VERSION "1.4.15" ++ ++/* Define to appropriate substitue if compiler doesnt have __func__ */ ++/* #undef _EVENT___func__ */ ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++/* #undef _EVENT_const */ ++ ++/* Define to `__inline__' or `__inline' if that's what the C compiler ++ calls it, or to nothing if 'inline' is not supported under any name. */ ++#ifndef _EVENT___cplusplus ++/* #undef _EVENT_inline */ ++#endif ++ ++/* Define to `int' if does not define. */ ++/* #undef _EVENT_pid_t */ ++ ++/* Define to `unsigned int' if does not define. */ ++/* #undef _EVENT_size_t */ ++ ++/* Define to unsigned int if you dont have it */ ++/* #undef _EVENT_socklen_t */ ++#endif diff --git a/www/iridium/patches/patch-base_third_party_symbolize_symbolize_cc b/www/iridium/patches/patch-base_third_party_symbolize_symbolize_cc new file mode 100644 index 00000000000..4dc3b2d13a9 --- /dev/null +++ b/www/iridium/patches/patch-base_third_party_symbolize_symbolize_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-base_third_party_symbolize_symbolize_cc,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- base/third_party/symbolize/symbolize.cc.orig.port Sun Aug 14 15:07:06 2016 ++++ base/third_party/symbolize/symbolize.cc Sun Aug 14 15:07:14 2016 +@@ -108,7 +108,7 @@ _END_GOOGLE_NAMESPACE_ + #if defined(__ELF__) + + #include +-#if defined(OS_OPENBSD) ++#if defined(__OpenBSD__) + #include + #else + #include diff --git a/www/iridium/patches/patch-base_threading_platform_thread_linux_cc b/www/iridium/patches/patch-base_threading_platform_thread_linux_cc index fcbd8867d14..5d76f7efa96 100644 --- a/www/iridium/patches/patch-base_threading_platform_thread_linux_cc +++ b/www/iridium/patches/patch-base_threading_platform_thread_linux_cc @@ -1,17 +1,17 @@ -$OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.7 2016/04/27 12:46:16 robert Exp $ ---- base/threading/platform_thread_linux.cc.orig.port Fri Apr 8 18:02:06 2016 -+++ base/threading/platform_thread_linux.cc Thu Apr 14 08:25:08 2016 -@@ -17,7 +17,9 @@ +$OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.8 2016/10/27 18:30:40 robert Exp $ +--- base/threading/platform_thread_linux.cc.orig.port Wed Oct 19 13:23:29 2016 ++++ base/threading/platform_thread_linux.cc Wed Oct 19 14:18:22 2016 +@@ -19,7 +19,9 @@ #if !defined(OS_NACL) #include +#if !defined(OS_BSD) #include +#endif + #include + #include #include - #include - #endif -@@ -70,7 +72,7 @@ void PlatformThread::SetName(const std::string& name) +@@ -110,7 +112,7 @@ void PlatformThread::SetName(const std::string& name) ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); @@ -20,3 +20,12 @@ $OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.7 2016/04/27 12:46:1 // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall +@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::string& name) + #endif // !defined(OS_NACL) + } + +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + // static + void PlatformThread::SetThreadPriority(PlatformThreadId thread_id, + ThreadPriority priority) { diff --git a/www/iridium/patches/patch-base_threading_platform_thread_posix_cc b/www/iridium/patches/patch-base_threading_platform_thread_posix_cc index 246fec944e4..51faa84df98 100644 --- a/www/iridium/patches/patch-base_threading_platform_thread_posix_cc +++ b/www/iridium/patches/patch-base_threading_platform_thread_posix_cc @@ -1,10 +1,10 @@ -$OpenBSD: patch-base_threading_platform_thread_posix_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-base_threading_platform_thread_posix_cc,v 1.3 2016/10/27 18:30:40 robert Exp $ XXX pledge(2) ---- base/threading/platform_thread_posix.cc.orig.port Wed May 25 04:54:06 2016 -+++ base/threading/platform_thread_posix.cc Thu May 26 08:09:40 2016 -@@ -55,7 +55,7 @@ void* ThreadFunc(void* params) { +--- base/threading/platform_thread_posix.cc.orig.port Wed Oct 12 21:02:53 2016 ++++ base/threading/platform_thread_posix.cc Wed Oct 19 12:55:56 2016 +@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::ThreadRestrictions::SetSingletonAllowed(false); diff --git a/www/iridium/patches/patch-base_trace_event_malloc_dump_provider_cc b/www/iridium/patches/patch-base_trace_event_malloc_dump_provider_cc new file mode 100644 index 00000000000..2403dcc07fd --- /dev/null +++ b/www/iridium/patches/patch-base_trace_event_malloc_dump_provider_cc @@ -0,0 +1,22 @@ +$OpenBSD: patch-base_trace_event_malloc_dump_provider_cc,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- base/trace_event/malloc_dump_provider.cc.orig.port Wed Oct 19 13:24:08 2016 ++++ base/trace_event/malloc_dump_provider.cc Wed Oct 19 13:25:19 2016 +@@ -19,6 +19,8 @@ + + #if defined(OS_MACOSX) + #include ++#elif defined(OS_BSD) ++#include + #else + #include + #endif +@@ -224,6 +226,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump + resident_size = all_heap_info.committed_size; + allocated_objects_size = all_heap_info.allocated_size; + allocated_objects_count = all_heap_info.block_count; ++#elif defined(OS_BSD) ++ total_virtual_size = 0; ++ allocated_objects_size = 0; + #else + struct mallinfo info = mallinfo(); + DCHECK_GE(info.arena + info.hblkhd, info.uordblks); diff --git a/www/iridium/patches/patch-base_trace_event_process_memory_dump_cc b/www/iridium/patches/patch-base_trace_event_process_memory_dump_cc index b71098fd7f8..d85632929c1 100644 --- a/www/iridium/patches/patch-base_trace_event_process_memory_dump_cc +++ b/www/iridium/patches/patch-base_trace_event_process_memory_dump_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_trace_event_process_memory_dump_cc,v 1.1 2016/05/28 14:49:39 robert Exp $ ---- base/trace_event/process_memory_dump.cc.orig.port Thu May 26 09:33:50 2016 -+++ base/trace_event/process_memory_dump.cc Thu May 26 09:58:14 2016 -@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta +$OpenBSD: patch-base_trace_event_process_memory_dump_cc,v 1.2 2016/10/27 18:30:40 robert Exp $ +--- base/trace_event/process_memory_dump.cc.orig.port Thu Sep 1 00:03:26 2016 ++++ base/trace_event/process_memory_dump.cc Thu Sep 1 11:12:18 2016 +@@ -89,7 +89,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta const size_t kMaxChunkSize = 8 * 1024 * 1024; size_t max_vec_size = GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size); diff --git a/www/iridium/patches/patch-build_all_gyp b/www/iridium/patches/patch-build_all_gyp deleted file mode 100644 index 2df0754cf56..00000000000 --- a/www/iridium/patches/patch-build_all_gyp +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-build_all_gyp,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- build/all.gyp.orig.port Wed May 25 21:00:55 2016 -+++ build/all.gyp Thu May 26 08:09:40 2016 -@@ -358,7 +358,6 @@ - '../media/midi/midi.gyp:midi_unittests', - '../mojo/mojo.gyp:mojo', - '../ppapi/ppapi_internal.gyp:ppapi_unittests', -- '../remoting/remoting.gyp:remoting_unittests', - '../third_party/catapult/telemetry/telemetry.gyp:*', - '../third_party/WebKit/public/all.gyp:all_blink', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', diff --git a/www/iridium/patches/patch-build_common_gypi b/www/iridium/patches/patch-build_common_gypi deleted file mode 100644 index 4108464c628..00000000000 --- a/www/iridium/patches/patch-build_common_gypi +++ /dev/null @@ -1,107 +0,0 @@ -$OpenBSD: patch-build_common_gypi,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- build/common.gypi.orig.port Wed May 25 21:00:55 2016 -+++ build/common.gypi Thu May 26 08:09:40 2016 -@@ -113,7 +113,7 @@ - - 'conditions': [ - # Windows and Linux use Aura, but not Ash. -- ['OS=="win" or OS=="linux"', { -+ ['OS=="win" or OS=="linux" or OS=="openbsd"', { - 'use_aura%': 1, - }], - -@@ -255,13 +255,13 @@ - }], - - # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS). -- ['OS=="mac" or OS=="win" or OS=="linux"', { -+ ['OS=="mac" or OS=="win" or OS=="linux" or OS=="openbsd"', { - 'enable_hidpi%': 1, - }], - - # Enable Top Chrome Material Design on Chrome OS, Windows, and Linux, - # and Mac. -- ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac"', { -+ ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac" or OS=="openbsd"', { - 'enable_topchrome_md%': 1, - }], - -@@ -790,7 +790,7 @@ - }], - - # DBus usage. -- ['OS=="linux" and embedded==0', { -+ ['(OS=="linux" or OS=="openbsd") and embedded==0', { - 'use_dbus%': 1, - }, { - 'use_dbus%': 0, -@@ -892,7 +892,7 @@ - - # Use GPU accelerated cross process image transport by default - # on linux builds with the Aura window manager -- ['use_aura==1 and OS=="linux"', { -+ ['use_aura==1 and (OS=="linux" or OS=="openbsd")', { - 'ui_compositor_image_transport%': 1, - }, { - 'ui_compositor_image_transport%': 0, -@@ -1005,7 +1005,7 @@ - # --help for more information. Meant to be overriden with GYP_DEFINES. - # TODO(maruel): Remove the conditions as more configurations are - # supported. -- ['OS!="ios" and OS!="android" and chromeos==0', { -+ ['OS!="ios" and OS!="android" and chromeos==0 and OS!="openbsd"', { - 'test_isolation_mode%': 'check', - }, { - 'test_isolation_mode%': 'noop', -@@ -1021,7 +1021,7 @@ - }, { - 'use_openmax_dl_fft%': 0, - }], -- ['OS=="win" or OS=="linux"', { -+ ['OS=="win" or OS=="linux" or OS=="openbsd"', { - 'enable_mdns%' : 1, - }], - -@@ -1663,7 +1663,7 @@ - ['OS=="win"', { - 'windows_driver_kit_path%': '$(WDK_DIR)', - }], -- ['os_posix==1 and OS!="mac" and OS!="ios"', { -+ ['os_posix==1 and OS!="mac" and OS!="ios" and OS!="openbsd"', { - 'conditions': [ - ['target_arch=="mipsel" or target_arch=="mips64el"', { - 'werror%': '', -@@ -3594,6 +3594,13 @@ - }, - }, - 'conditions': [ -+ ['OS=="openbsd"', { -+ 'target_defaults': { -+ 'cflags': [ -+ '-Wno-unknown-warning-option', -+ ], -+ }, -+ }], - ['os_posix==1', { - 'target_defaults': { - 'ldflags': [ -@@ -4719,7 +4726,7 @@ - }], - # FreeBSD-specific options; note that most FreeBSD options are set above, - # with Linux. -- ['OS=="freebsd"', { -+ ['OS=="freebsd" or OS=="openbsd"', { - 'target_defaults': { - 'ldflags': [ - '-Wl,--no-keep-memory', -@@ -6005,8 +6012,8 @@ - ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' - 'and OS!="win"', { - 'make_global_settings': [ -- ['CC', '<(make_clang_dir)/bin/clang'], -- ['CXX', '<(make_clang_dir)/bin/clang++'], -+ ['CC', '/usr/local/bin/clang'], -+ ['CXX', '/usr/local/bin/clang++'], - ['CC.host', '$(CC)'], - ['CXX.host', '$(CXX)'], - ], diff --git a/www/iridium/patches/patch-build_config_BUILDCONFIG_gn b/www/iridium/patches/patch-build_config_BUILDCONFIG_gn new file mode 100644 index 00000000000..9b7ae464ba8 --- /dev/null +++ b/www/iridium/patches/patch-build_config_BUILDCONFIG_gn @@ -0,0 +1,104 @@ +$OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- build/config/BUILDCONFIG.gn.orig.port Wed Oct 19 13:25:29 2016 ++++ build/config/BUILDCONFIG.gn Wed Oct 19 14:21:17 2016 +@@ -134,12 +134,13 @@ declare_args() { + is_debug = !is_official_build + + # Whether we're a traditional desktop unix. +- is_desktop_linux = current_os == "linux" ++ is_desktop_linux = current_os == "linux" || current_os == "openbsd" + + # Set to true when compiling with the Clang compiler. Typically this is used + # to configure warnings. + is_clang = current_os == "mac" || current_os == "ios" || +- current_os == "linux" || current_os == "chromeos" ++ current_os == "linux" || current_os == "chromeos" || ++ current_os == "openbsd" + + # Allows the path to a custom target toolchain to be injected as a single + # argument, and set as the default toolchain. +@@ -195,6 +196,8 @@ if (host_toolchain == "") { + } else { + host_toolchain = "//build/toolchain/linux:$host_cpu" + } ++ } else if (host_os == "openbsd") { ++ host_toolchain = "//build/toolchain/openbsd:clang_$host_cpu" + } else if (host_os == "mac") { + host_toolchain = "//build/toolchain/mac:clang_$host_cpu" + } else if (host_os == "win") { +@@ -229,6 +232,8 @@ if (target_os == "android") { + } + } else if (target_os == "ios") { + _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu" ++} else if (target_os == "openbsd") { ++ _default_toolchain = host_toolchain + } else if (target_os == "mac") { + assert(host_os == "mac", "Mac cross-compiles are unsupported.") + _default_toolchain = host_toolchain +@@ -282,6 +287,7 @@ if (current_os == "win" || current_os == "winrt_81" || + is_mac = false + is_nacl = false + is_posix = false ++ is_openbsd = false + is_win = true + } else if (current_os == "mac") { + is_android = false +@@ -291,6 +297,7 @@ if (current_os == "win" || current_os == "winrt_81" || + is_mac = true + is_nacl = false + is_posix = true ++ is_openbsd = false + is_win = false + } else if (current_os == "android") { + is_android = true +@@ -300,6 +307,7 @@ if (current_os == "win" || current_os == "winrt_81" || + is_mac = false + is_nacl = false + is_posix = true ++ is_openbsd = false + is_win = false + } else if (current_os == "chromeos") { + is_android = false +@@ -309,6 +317,7 @@ if (current_os == "win" || current_os == "winrt_81" || + is_mac = false + is_nacl = false + is_posix = true ++ is_openbsd = false + is_win = false + } else if (current_os == "nacl") { + # current_os == "nacl" will be passed by the nacl toolchain definition. +@@ -321,6 +330,7 @@ if (current_os == "win" || current_os == "winrt_81" || + is_mac = false + is_nacl = true + is_posix = true ++ is_openbsd = false + is_win = false + } else if (current_os == "ios") { + is_android = false +@@ -330,6 +340,7 @@ if (current_os == "win" || current_os == "winrt_81" || + is_mac = false + is_nacl = false + is_posix = true ++ is_openbsd = false + is_win = false + } else if (current_os == "linux") { + is_android = false +@@ -339,7 +350,18 @@ if (current_os == "win" || current_os == "winrt_81" || + is_mac = false + is_nacl = false + is_posix = true ++ is_openbsd = false + is_win = false ++} else if (current_os == "openbsd") { ++ is_android = false ++ is_chromeos = false ++ is_ios = false ++ is_linux = true ++ is_mac = false ++ is_nacl = false ++ is_posix = true ++ is_win = false ++ is_openbsd = true + } + + # ============================================================================= diff --git a/www/iridium/patches/patch-build_config_BUILD_gn b/www/iridium/patches/patch-build_config_BUILD_gn new file mode 100644 index 00000000000..5239cd5f5ba --- /dev/null +++ b/www/iridium/patches/patch-build_config_BUILD_gn @@ -0,0 +1,12 @@ +$OpenBSD: patch-build_config_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- build/config/BUILD.gn.orig.port Wed Oct 12 21:02:53 2016 ++++ build/config/BUILD.gn Wed Oct 19 12:55:56 2016 +@@ -380,7 +380,7 @@ config("default_libs") { + "CoreText.framework", + "Foundation.framework", + ] +- } else if (is_linux) { ++ } else if (is_linux && !is_openbsd) { + libs = [ + "dl", + "rt", diff --git a/www/iridium/patches/patch-build_config_allocator_gni b/www/iridium/patches/patch-build_config_allocator_gni new file mode 100644 index 00000000000..8b0c782672d --- /dev/null +++ b/www/iridium/patches/patch-build_config_allocator_gni @@ -0,0 +1,12 @@ +$OpenBSD: patch-build_config_allocator_gni,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- build/config/allocator.gni.orig.port Wed Oct 19 13:28:18 2016 ++++ build/config/allocator.gni Wed Oct 19 13:29:39 2016 +@@ -17,7 +17,7 @@ if (is_android || current_cpu == "mipsel" || is_mac || + # the shim. NaCl in particular does seem to link some binaries statically + # against the debug CRT with "is_nacl=false". + if ((is_linux || is_android || (is_win && !is_component_build && !is_debug)) && +- !is_syzyasan && !is_asan && !is_lsan && !is_tsan && !is_msan) { ++ !is_syzyasan && !is_asan && !is_lsan && !is_tsan && !is_msan && !is_openbsd) { + _default_use_experimental_allocator_shim = true + } else { + _default_use_experimental_allocator_shim = false diff --git a/www/iridium/patches/patch-build_config_compiler_BUILD_gn b/www/iridium/patches/patch-build_config_compiler_BUILD_gn new file mode 100644 index 00000000000..87de8d2a2f6 --- /dev/null +++ b/www/iridium/patches/patch-build_config_compiler_BUILD_gn @@ -0,0 +1,47 @@ +$OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- build/config/compiler/BUILD.gn.orig.port Wed Oct 19 13:29:47 2016 ++++ build/config/compiler/BUILD.gn Wed Oct 19 13:30:51 2016 +@@ -38,7 +38,7 @@ declare_args() { + # only two architectures that are currently checked in). Turn this off when + # you are using a custom toolchain and need to control -B in cflags. + linux_use_bundled_binutils = +- is_linux && (current_cpu == "x64" || current_cpu == "x86") ++ (is_linux && !is_openbsd) && (current_cpu == "x64" || current_cpu == "x86") + binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", + root_build_dir) + +@@ -201,7 +201,7 @@ config("compiler") { + + # Linker warnings. + if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && +- !(is_android && use_order_profiling) && !is_mac && !is_ios) { ++ !(is_android && use_order_profiling) && !is_mac && !is_ios && !is_openbsd) { + # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 + # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 + # crbug.com/485542 +@@ -283,7 +283,7 @@ config("compiler") { + "-Wl,-z,now", + "-Wl,-z,relro", + ] +- if (!using_sanitizer && !use_cfi_diag) { ++ if (!using_sanitizer && !use_cfi_diag && !is_openbsd) { + ldflags += [ "-Wl,-z,defs" ] + } + } +@@ -1014,14 +1014,14 @@ config("default_warnings") { + # Chrome's hermetic Clang compiler, NaCl's Clang compiler and Xcode's Clang + # compiler will almost always have different versions. Certain flags may not + # be recognized by one version or the other. +- if (!is_nacl) { ++ if (!is_nacl && !is_openbsd) { + # Flags NaCl (Clang 3.7) does not recognize. + cflags += [ + # TODO(thakis): Enable this, crbug.com/507717 + "-Wno-shift-negative-value", + ] + } +- if (!is_nacl && !use_xcode_clang) { ++ if (!is_nacl && !use_xcode_clang && !is_openbsd) { + # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not + # recognize. + cflags += [ diff --git a/www/iridium/patches/patch-build_config_compiler_compiler_gni b/www/iridium/patches/patch-build_config_compiler_compiler_gni new file mode 100644 index 00000000000..02146687246 --- /dev/null +++ b/www/iridium/patches/patch-build_config_compiler_compiler_gni @@ -0,0 +1,12 @@ +$OpenBSD: patch-build_config_compiler_compiler_gni,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- build/config/compiler/compiler.gni.orig.port Thu Sep 1 00:03:26 2016 ++++ build/config/compiler/compiler.gni Thu Sep 1 11:12:18 2016 +@@ -67,7 +67,7 @@ declare_args() { + + declare_args() { + # Whether to use the gold linker from binutils instead of lld or bfd. +- use_gold = !use_lld && !(is_chromecast && is_linux && ++ use_gold = !is_openbsd && !use_lld && !(is_chromecast && is_linux && + (current_cpu == "arm" || current_cpu == "mipsel")) && + ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || + current_cpu == "arm" || current_cpu == "mipsel")) || diff --git a/www/iridium/patches/patch-build_config_features_gni b/www/iridium/patches/patch-build_config_features_gni new file mode 100644 index 00000000000..e0e77829a13 --- /dev/null +++ b/www/iridium/patches/patch-build_config_features_gni @@ -0,0 +1,21 @@ +$OpenBSD: patch-build_config_features_gni,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- build/config/features.gni.orig.port Wed Oct 12 21:02:53 2016 ++++ build/config/features.gni Wed Oct 19 12:55:57 2016 +@@ -102,7 +102,7 @@ declare_args() { + enable_wifi_display = false + + # libudev usage. This currently only affects the content layer. +- use_udev = is_linux && !is_chromecast ++ use_udev = is_linux && !is_chromecast && !is_openbsd + + use_dbus = is_linux && !is_chromecast + +@@ -151,7 +151,7 @@ enable_pepper_cdms = + use_seccomp_bpf = + (is_linux || is_android) && + (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" || +- current_cpu == "arm64" || current_cpu == "mipsel") ++ current_cpu == "arm64" || current_cpu == "mipsel") && !is_openbsd + + # Enable notifications everywhere except iOS. + enable_notifications = !is_ios diff --git a/www/iridium/patches/patch-build_config_linux_pkg-config_py b/www/iridium/patches/patch-build_config_linux_pkg-config_py new file mode 100644 index 00000000000..d12d2907095 --- /dev/null +++ b/www/iridium/patches/patch-build_config_linux_pkg-config_py @@ -0,0 +1,12 @@ +$OpenBSD: patch-build_config_linux_pkg-config_py,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- build/config/linux/pkg-config.py.orig.port Sun Aug 14 13:26:34 2016 ++++ build/config/linux/pkg-config.py Sun Aug 14 13:26:45 2016 +@@ -107,7 +107,7 @@ def main(): + # If this is run on non-Linux platforms, just return nothing and indicate + # success. This allows us to "kind of emulate" a Linux build from other + # platforms. +- if "linux" not in sys.platform: ++ if "openbsd" not in sys.platform: + print "[[],[],[],[],[]]" + return 0 + diff --git a/www/iridium/patches/patch-build_filename_rules_gypi b/www/iridium/patches/patch-build_filename_rules_gypi deleted file mode 100644 index ddf9bfc3d81..00000000000 --- a/www/iridium/patches/patch-build_filename_rules_gypi +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-build_filename_rules_gypi,v 1.3 2016/04/27 12:46:16 robert Exp $ ---- build/filename_rules.gypi.orig.port Fri Apr 8 18:02:06 2016 -+++ build/filename_rules.gypi Thu Apr 14 08:25:08 2016 -@@ -89,7 +89,7 @@ - ['exclude', '_ashwin\\.(h|cc)$'] - ] - }], -- ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', { -+ ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd") or >(nacl_untrusted_build)==1', { - 'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ] - }], - ['<(use_ozone)==0 or >(nacl_untrusted_build)==1', { diff --git a/www/iridium/patches/patch-build_toolchain_gcc_solink_wrapper_py b/www/iridium/patches/patch-build_toolchain_gcc_solink_wrapper_py new file mode 100644 index 00000000000..f1aae830d7c --- /dev/null +++ b/www/iridium/patches/patch-build_toolchain_gcc_solink_wrapper_py @@ -0,0 +1,12 @@ +$OpenBSD: patch-build_toolchain_gcc_solink_wrapper_py,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- build/toolchain/gcc_solink_wrapper.py.orig.port Sun Aug 14 23:16:08 2016 ++++ build/toolchain/gcc_solink_wrapper.py Sun Aug 14 23:16:21 2016 +@@ -47,7 +47,7 @@ def CollectDynSym(args): + """Replaces: nm --format=posix -g -D $sofile | cut -f1-2 -d' '""" + toc = '' + nm = subprocess.Popen(CommandToRun([ +- args.nm, '--format=posix', '-g', '-D', args.sofile]), ++ args.nm, '-g', '-D', args.sofile]), + stdout=subprocess.PIPE, bufsize=-1) + for line in nm.stdout: + toc += ' '.join(line.split(' ', 2)[:2]) + '\n' diff --git a/www/iridium/patches/patch-build_toolchain_gcc_toolchain_gni b/www/iridium/patches/patch-build_toolchain_gcc_toolchain_gni new file mode 100644 index 00000000000..07aa6151a4c --- /dev/null +++ b/www/iridium/patches/patch-build_toolchain_gcc_toolchain_gni @@ -0,0 +1,33 @@ +$OpenBSD: patch-build_toolchain_gcc_toolchain_gni,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- build/toolchain/gcc_toolchain.gni.orig.port Fri Oct 21 00:01:59 2016 ++++ build/toolchain/gcc_toolchain.gni Tue Oct 25 08:33:20 2016 +@@ -10,6 +10,11 @@ import("//build/toolchain/cc_wrapper.gni") + import("//build/toolchain/goma.gni") + import("//build/toolchain/toolchain.gni") + ++declare_args() { ++ extra_cppflags = "" ++ extra_ldflags = "" ++} ++ + # This template defines a toolchain for something that works like gcc + # (including clang). + # +@@ -258,7 +263,7 @@ template("gcc_toolchain") { + # POSIX-like toolchains such as NaCl on Windows). + ar_wrapper = + rebase_path("//build/toolchain/gcc_ar_wrapper.py", root_build_dir) +- command = "$python_path \"$ar_wrapper\" --output={{output}} --ar=\"$ar\" {{arflags}} rcsD @\"$rspfile\"" ++ command = "$python_path \"$ar_wrapper\" --output={{output}} --ar=\"$ar\" {{arflags}} rcs @\"$rspfile\"" + description = "AR {{output}}" + rspfile_content = "{{inputs}}" + outputs = [ +@@ -453,7 +458,7 @@ template("clang_toolchain") { + } + + gcc_toolchain(target_name) { +- prefix = rebase_path("$clang_base_path/bin", root_build_dir) ++ prefix = "/usr/local/bin" + cc = "$prefix/clang" + cxx = "$prefix/clang++" + ld = cxx diff --git a/www/iridium/patches/patch-build_toolchain_openbsd_BUILD_gn b/www/iridium/patches/patch-build_toolchain_openbsd_BUILD_gn new file mode 100644 index 00000000000..afadfea0c45 --- /dev/null +++ b/www/iridium/patches/patch-build_toolchain_openbsd_BUILD_gn @@ -0,0 +1,56 @@ +$OpenBSD: patch-build_toolchain_openbsd_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- build/toolchain/openbsd/BUILD.gn.orig.port Wed Oct 19 13:16:59 2016 ++++ build/toolchain/openbsd/BUILD.gn Wed Oct 19 14:23:37 2016 +@@ -0,0 +1,52 @@ ++# Copyright 2013 The Chromium Authors. All rights reserved. ++# Use of this source code is governed by a BSD-style license that can be ++# found in the LICENSE file. ++ ++import("//build/config/sysroot.gni") ++import("//build/toolchain/gcc_toolchain.gni") ++ ++clang_toolchain("clang_x86") { ++ toolchain_args = { ++ current_cpu = "x86" ++ current_os = "openbsd" ++ } ++} ++ ++gcc_toolchain("x86") { ++ cc = "gcc" ++ cxx = "g++" ++ ++ readelf = "readelf" ++ nm = "nm" ++ ar = "ar" ++ ld = cxx ++ ++ toolchain_args = { ++ current_cpu = "x86" ++ current_os = "openbsd" ++ is_clang = false ++ } ++} ++ ++clang_toolchain("clang_x64") { ++ toolchain_args = { ++ current_cpu = "x64" ++ current_os = "openbsd" ++ } ++} ++ ++gcc_toolchain("x64") { ++ cc = "gcc" ++ cxx = "g++" ++ ++ readelf = "readelf" ++ nm = "nm" ++ ar = "ar" ++ ld = cxx ++ ++ toolchain_args = { ++ current_cpu = "x64" ++ current_os = "openbsd" ++ is_clang = false ++ } ++} diff --git a/www/iridium/patches/patch-cc_BUILD_gn b/www/iridium/patches/patch-cc_BUILD_gn new file mode 100644 index 00000000000..8e205346c7c --- /dev/null +++ b/www/iridium/patches/patch-cc_BUILD_gn @@ -0,0 +1,23 @@ +$OpenBSD: patch-cc_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- cc/BUILD.gn.orig.port Wed Oct 12 21:02:53 2016 ++++ cc/BUILD.gn Wed Oct 19 12:55:57 2016 +@@ -781,7 +781,7 @@ static_library("test_support") { + "//ui/gl", + "//ui/gl:test_support", + ] +- if (!is_android) { ++ if (!is_android && !is_openbsd) { + data_deps = [ + "//third_party/mesa:osmesa", + ] +@@ -989,10 +989,6 @@ test("cc_unittests") { + "//ui/gfx/geometry", + "//ui/gl", + "//ui/gl:test_support", +- ] +- +- data_deps = [ +- "//third_party/mesa:osmesa", + ] + } + diff --git a/www/iridium/patches/patch-chrome_app_chrome_command_ids_h b/www/iridium/patches/patch-chrome_app_chrome_command_ids_h new file mode 100644 index 00000000000..fcfadd1663d --- /dev/null +++ b/www/iridium/patches/patch-chrome_app_chrome_command_ids_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_app_chrome_command_ids_h,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- chrome/app/chrome_command_ids.h.orig.port Sat Oct 22 15:48:44 2016 ++++ chrome/app/chrome_command_ids.h Sat Oct 22 15:48:55 2016 +@@ -75,7 +75,7 @@ + #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049 + #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050 + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + #define IDC_USE_SYSTEM_TITLE_BAR 34051 + #endif + diff --git a/www/iridium/patches/patch-chrome_app_chrome_main_cc b/www/iridium/patches/patch-chrome_app_chrome_main_cc index 49ea707eeac..c2c8ee8a078 100644 --- a/www/iridium/patches/patch-chrome_app_chrome_main_cc +++ b/www/iridium/patches/patch-chrome_app_chrome_main_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_app_chrome_main_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- chrome/app/chrome_main.cc.orig.port Tue Apr 26 16:20:04 2016 -+++ chrome/app/chrome_main.cc Wed Apr 27 11:11:15 2016 +$OpenBSD: patch-chrome_app_chrome_main_cc,v 1.5 2016/10/27 18:30:40 robert Exp $ +--- chrome/app/chrome_main.cc.orig.port Thu Oct 27 14:43:34 2016 ++++ chrome/app/chrome_main.cc Thu Oct 27 20:19:45 2016 @@ -3,6 +3,8 @@ // found in the LICENSE file. @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_app_chrome_main_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ #include "build/build_config.h" #include "chrome/common/features.h" -@@ -39,7 +41,11 @@ int ChromeMain(int argc, const char** argv); +@@ -39,7 +41,12 @@ int ChromeMain(int argc, const char** argv); #if !defined(CHROME_MULTIPLE_DLL_CHILD) static void trace_url_request(const std::string &caller, const GURL &url) { @@ -19,7 +19,8 @@ $OpenBSD: patch-chrome_app_chrome_main_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ + if (!command_line->HasSwitch(switches::kTrk)) + return; + -+ iridium::log_url_request(caller, url); ++ iridium::log_url_request(caller, url); ++ if (url.scheme() != url::kTraceScheme) /* Do not show infobar for non-trk URLs */ return; diff --git a/www/iridium/patches/patch-chrome_app_chrome_main_delegate_cc b/www/iridium/patches/patch-chrome_app_chrome_main_delegate_cc index 1249d924b93..072aee5f435 100644 --- a/www/iridium/patches/patch-chrome_app_chrome_main_delegate_cc +++ b/www/iridium/patches/patch-chrome_app_chrome_main_delegate_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- chrome/app/chrome_main_delegate.cc.orig.port Thu May 26 08:15:51 2016 -+++ chrome/app/chrome_main_delegate.cc Thu May 26 08:18:13 2016 -@@ -80,7 +80,7 @@ - #include +$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.10 2016/10/27 18:30:40 robert Exp $ +--- chrome/app/chrome_main_delegate.cc.orig.port Thu Sep 1 00:03:26 2016 ++++ chrome/app/chrome_main_delegate.cc Thu Sep 1 11:12:18 2016 +@@ -84,7 +84,7 @@ + #include "chrome/app/chrome_crash_reporter_client.h" #endif -#if !defined(DISABLE_NACL) && defined(OS_LINUX) @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -115,7 +115,7 @@ +@@ -119,7 +119,7 @@ #include "components/crash/content/app/breakpad_linux.h" #endif @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob #include "base/environment.h" #endif -@@ -151,7 +151,7 @@ base::LazyInstance g_chrom +@@ -161,7 +161,7 @@ base::LazyInstance g_chrom LAZY_INSTANCE_INITIALIZER; #endif @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob base::LazyInstance::Leaky g_chrome_crash_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -268,7 +268,7 @@ static void AdjustLinuxOOMScore(const std::string& pro +@@ -278,7 +278,7 @@ static void AdjustLinuxOOMScore(const std::string& pro // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -320,7 +320,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -330,7 +330,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } #endif @@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob void SIGTERMProfilingShutdown(int signal) { Profiling::Stop(); struct sigaction sigact; -@@ -354,7 +354,7 @@ void InitializeUserDataDir() { +@@ -364,7 +364,7 @@ void InitializeUserDataDir() { std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -55,7 +55,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob // 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. -@@ -684,7 +684,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -703,7 +703,7 @@ void ChromeMainDelegate::PreSandboxStartup() { std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -64,7 +64,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -805,7 +805,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -836,7 +836,7 @@ void ChromeMainDelegate::PreSandboxStartup() { chrome::InitializePDF(); #endif @@ -73,7 +73,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -933,7 +933,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization( +@@ -964,7 +964,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization( #endif return process_type == switches::kRelauncherProcess; } diff --git a/www/iridium/patches/patch-chrome_app_chrome_main_delegate_h b/www/iridium/patches/patch-chrome_app_chrome_main_delegate_h index ef2d215cd8c..2ad6c7e86e0 100644 --- a/www/iridium/patches/patch-chrome_app_chrome_main_delegate_h +++ b/www/iridium/patches/patch-chrome_app_chrome_main_delegate_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.3 2016/03/23 20:13:06 robert Exp $ ---- chrome/app/chrome_main_delegate.h.orig.port Wed Feb 24 00:01:57 2016 -+++ chrome/app/chrome_main_delegate.h Thu Mar 3 09:43:25 2016 -@@ -38,7 +38,7 @@ class ChromeMainDelegate : public content::ContentMain +$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.4 2016/10/27 18:30:40 robert Exp $ +--- chrome/app/chrome_main_delegate.h.orig.port Wed Jul 20 21:03:19 2016 ++++ chrome/app/chrome_main_delegate.h Thu Jul 21 10:25:26 2016 +@@ -39,7 +39,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/iridium/patches/patch-chrome_app_chromium_strings_grd b/www/iridium/patches/patch-chrome_app_chromium_strings_grd index a64da8af8af..ade1e5a1bae 100644 --- a/www/iridium/patches/patch-chrome_app_chromium_strings_grd +++ b/www/iridium/patches/patch-chrome_app_chromium_strings_grd @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- chrome/app/chromium_strings.grd.orig.port Fri May 27 10:48:11 2016 -+++ chrome/app/chromium_strings.grd Sat May 28 10:25:22 2016 -@@ -937,7 +937,7 @@ Signing in anyway will merge browser information like +$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.12 2016/10/27 18:30:40 robert Exp $ +--- chrome/app/chromium_strings.grd.orig.port Sun Oct 23 21:04:51 2016 ++++ chrome/app/chromium_strings.grd Thu Oct 27 11:16:53 2016 +@@ -938,7 +938,7 @@ Signing in anyway will merge browser information like diff --git a/www/iridium/patches/patch-chrome_app_generated_resources_grd b/www/iridium/patches/patch-chrome_app_generated_resources_grd index 78cde24537a..7538b481e35 100644 --- a/www/iridium/patches/patch-chrome_app_generated_resources_grd +++ b/www/iridium/patches/patch-chrome_app_generated_resources_grd @@ -1,12 +1,48 @@ -$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.3 2016/05/28 14:49:39 robert Exp $ ---- chrome/app/generated_resources.grd.orig.port Wed May 25 21:00:56 2016 -+++ chrome/app/generated_resources.grd Thu May 26 08:09:40 2016 -@@ -6595,7 +6595,7 @@ Keep your key file in a safe place. You will need it t +$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.4 2016/10/27 18:30:40 robert Exp $ +--- chrome/app/generated_resources.grd.orig.port Fri Oct 21 00:02:00 2016 ++++ chrome/app/generated_resources.grd Sat Oct 22 16:20:22 2016 +@@ -2,7 +2,7 @@ + + +@@ -6841,7 +6841,7 @@ Keep your key file in a safe place. You will need it t Right-to-left - -+ ++ Enable Input IME API +@@ -10140,7 +10140,7 @@ I don't think this site should be blocked! + + Appearance + +- ++ + + Themes + +@@ -10148,7 +10148,7 @@ I don't think this site should be blocked! + + Reset to default theme + +- ++ + + Use GTK+ theme + +@@ -11435,7 +11435,7 @@ Tell us what happened exactly before you got the profi + Set as default + + +- ++ + + Use system title bar and borders + diff --git a/www/iridium/patches/patch-chrome_app_google_chrome_strings_grd b/www/iridium/patches/patch-chrome_app_google_chrome_strings_grd index 11ccf8864a7..bba86e72a4a 100644 --- a/www/iridium/patches/patch-chrome_app_google_chrome_strings_grd +++ b/www/iridium/patches/patch-chrome_app_google_chrome_strings_grd @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/app/google_chrome_strings.grd.orig.port Wed May 25 21:00:56 2016 -+++ chrome/app/google_chrome_strings.grd Sat May 28 10:25:24 2016 -@@ -938,7 +938,7 @@ Signing in anyway will merge Chrome information like b +$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.11 2016/10/27 18:30:40 robert Exp $ +--- chrome/app/google_chrome_strings.grd.orig.port Wed Oct 12 21:02:53 2016 ++++ chrome/app/google_chrome_strings.grd Wed Oct 19 12:55:57 2016 +@@ -939,7 +939,7 @@ Signing in anyway will merge Chrome information like b diff --git a/www/iridium/patches/patch-chrome_app_mash_mash_runner_cc b/www/iridium/patches/patch-chrome_app_mash_mash_runner_cc new file mode 100644 index 00000000000..5a9e4aafdea --- /dev/null +++ b/www/iridium/patches/patch-chrome_app_mash_mash_runner_cc @@ -0,0 +1,30 @@ +$OpenBSD: patch-chrome_app_mash_mash_runner_cc,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- chrome/app/mash/mash_runner.cc.orig.port Tue Oct 25 21:56:43 2016 ++++ chrome/app/mash/mash_runner.cc Tue Oct 25 21:59:47 2016 +@@ -35,7 +35,7 @@ + #include "services/shell/runner/host/child_process_base.h" + #include "services/ui/service.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "components/font_service/font_service_app.h" + #endif + +@@ -100,7 +100,7 @@ class DefaultService : public shell::Service, + return base::WrapUnique(new mash::quick_launch::QuickLaunch); + if (name == "mojo:task_viewer") + return base::WrapUnique(new mash::task_viewer::TaskViewer); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (name == "mojo:font_service") + return base::WrapUnique(new font_service::FontServiceApp); + #endif +@@ -228,7 +228,7 @@ int MashMain() { + + // TODO(sky): use MessagePumpMojo. + std::unique_ptr message_loop; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::AtExitManager exit_manager; + #endif + if (!IsChild()) diff --git a/www/iridium/patches/patch-chrome_app_resources_locale_settings_grd b/www/iridium/patches/patch-chrome_app_resources_locale_settings_grd index d9a5576d787..c2ccd4119a3 100644 --- a/www/iridium/patches/patch-chrome_app_resources_locale_settings_grd +++ b/www/iridium/patches/patch-chrome_app_resources_locale_settings_grd @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_app_resources_locale_settings_grd,v 1.4 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-chrome_app_resources_locale_settings_grd,v 1.5 2016/10/27 18:30:40 robert Exp $ --- chrome/app/resources/locale_settings.grd.orig.port Fri Apr 8 18:02:07 2016 +++ chrome/app/resources/locale_settings.grd Thu Apr 14 08:25:08 2016 @@ -156,7 +156,7 @@ diff --git a/www/iridium/patches/patch-chrome_browser_BUILD_gn b/www/iridium/patches/patch-chrome_browser_BUILD_gn new file mode 100644 index 00000000000..d6abb264905 --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_BUILD_gn @@ -0,0 +1,21 @@ +$OpenBSD: patch-chrome_browser_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/BUILD.gn.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/BUILD.gn Wed Oct 19 12:55:57 2016 +@@ -729,6 +729,17 @@ split_static_library("browser") { + "//chrome") + } + ++ if (is_openbsd) { ++ sources -= [ ++ "media_galleries/linux/mtp_device_delegate_impl_linux.cc", ++ "media_galleries/linux/mtp_device_object_enumerator.cc", ++ "media_galleries/linux/mtp_device_task_helper.cc", ++ "media_galleries/linux/mtp_device_task_helper_map_service.cc", ++ "media_galleries/linux/mtp_read_file_worker.cc", ++ "media_galleries/linux/snapshot_file_details.cc", ++ ] ++ } ++ + if (!is_chrome_branded) { + sources += [ + "search/local_files_ntp_source.cc", diff --git a/www/iridium/patches/patch-chrome_browser_about_flags_cc b/www/iridium/patches/patch-chrome_browser_about_flags_cc index 35dd5afdbb7..90e1b71cf1d 100644 --- a/www/iridium/patches/patch-chrome_browser_about_flags_cc +++ b/www/iridium/patches/patch-chrome_browser_about_flags_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/about_flags.cc.orig.port Wed May 25 21:00:57 2016 -+++ chrome/browser/about_flags.cc Sat May 28 10:25:25 2016 -@@ -651,7 +651,7 @@ const FeatureEntry kFeatureEntries[] = { +$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.11 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/about_flags.cc.orig.port Fri Oct 21 00:02:00 2016 ++++ chrome/browser/about_flags.cc Tue Oct 25 22:00:03 2016 +@@ -785,7 +785,7 @@ const FeatureEntry kFeatureEntries[] = { kOsLinux | kOsCrOS | kOsWin | kOsAndroid, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling, switches::kDisableSmoothScrolling)}, @@ -10,9 +10,18 @@ $OpenBSD: patch-chrome_browser_about_flags_cc,v 1.10 2016/05/28 14:49:39 robert {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, // Uses the system preference on Mac (a different implementation). -@@ -1691,7 +1691,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1336,7 +1336,7 @@ const FeatureEntry kFeatureEntries[] = { + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, + switches::kDisableTranslateNewUX)}, + #endif +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD) + {"translate-2016q2-ui", IDS_FLAGS_TRANSLATE_2016Q2_UI_NAME, + IDS_FLAGS_TRANSLATE_2016Q2_UI_DESCRIPTION, kOsCrOS | kOsWin | kOsLinux, + FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)}, +@@ -1823,7 +1823,7 @@ const FeatureEntry kFeatureEntries[] = { IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop, - SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)}, + FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/iridium/patches/patch-chrome_browser_after_startup_task_utils_cc b/www/iridium/patches/patch-chrome_browser_after_startup_task_utils_cc index a2017559b86..48a6bf5d5e3 100644 --- a/www/iridium/patches/patch-chrome_browser_after_startup_task_utils_cc +++ b/www/iridium/patches/patch-chrome_browser_after_startup_task_utils_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_after_startup_task_utils_cc,v 1.2 2016/03/23 20:13:06 robert Exp $ ---- chrome/browser/after_startup_task_utils.cc.orig.port Wed Feb 24 21:01:31 2016 -+++ chrome/browser/after_startup_task_utils.cc Thu Mar 3 09:43:25 2016 -@@ -93,7 +93,7 @@ void QueueTask(scoped_ptr queued_tas +$OpenBSD: patch-chrome_browser_after_startup_task_utils_cc,v 1.3 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/after_startup_task_utils.cc.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/after_startup_task_utils.cc Wed Oct 19 12:55:57 2016 +@@ -93,7 +93,7 @@ void QueueTask(std::unique_ptr queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); diff --git a/www/iridium/patches/patch-chrome_browser_browser_process_impl_cc b/www/iridium/patches/patch-chrome_browser_browser_process_impl_cc new file mode 100644 index 00000000000..463fb7798c1 --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_browser_process_impl_cc @@ -0,0 +1,21 @@ +$OpenBSD: patch-chrome_browser_browser_process_impl_cc,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/browser_process_impl.cc.orig.port Tue Oct 25 21:56:43 2016 ++++ chrome/browser/browser_process_impl.cc Tue Oct 25 22:00:31 2016 +@@ -162,7 +162,7 @@ + #include "chrome/browser/media/webrtc_log_uploader.h" + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/memory/tab_manager.h" + #endif + +@@ -778,7 +778,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { + + memory::TabManager* BrowserProcessImpl::GetTabManager() { + DCHECK(CalledOnValidThread()); +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + if (!tab_manager_.get()) + tab_manager_.reset(new memory::TabManager()); + return tab_manager_.get(); diff --git a/www/iridium/patches/patch-chrome_browser_browser_process_impl_h b/www/iridium/patches/patch-chrome_browser_browser_process_impl_h new file mode 100644 index 00000000000..6259cae59f0 --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_browser_process_impl_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_browser_browser_process_impl_h,v 1.1 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/browser_process_impl.h.orig.port Tue Oct 25 21:56:43 2016 ++++ chrome/browser/browser_process_impl.h Tue Oct 25 22:19:37 2016 +@@ -336,7 +336,7 @@ class BrowserProcessImpl : public BrowserProcess, + + std::unique_ptr device_client_; + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + // Any change to this #ifdef must be reflected as well in + // chrome/browser/memory/tab_manager_browsertest.cc + std::unique_ptr tab_manager_; diff --git a/www/iridium/patches/patch-chrome_browser_browser_resources_grd b/www/iridium/patches/patch-chrome_browser_browser_resources_grd index d71050e61d7..2e68ce5be7c 100644 --- a/www/iridium/patches/patch-chrome_browser_browser_resources_grd +++ b/www/iridium/patches/patch-chrome_browser_browser_resources_grd @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/browser_resources.grd.orig.port Wed May 25 21:00:57 2016 -+++ chrome/browser/browser_resources.grd Thu May 26 08:09:40 2016 -@@ -278,7 +278,7 @@ +$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.11 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/browser_resources.grd.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/browser_resources.grd Wed Oct 19 12:55:57 2016 +@@ -335,7 +335,7 @@ diff --git a/www/iridium/patches/patch-chrome_browser_chrome_browser_main_cc b/www/iridium/patches/patch-chrome_browser_chrome_browser_main_cc index 5f655af1a92..66636d93394 100644 --- a/www/iridium/patches/patch-chrome_browser_chrome_browser_main_cc +++ b/www/iridium/patches/patch-chrome_browser_chrome_browser_main_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.6 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/chrome_browser_main.cc.orig.port Sat May 28 10:26:16 2016 -+++ chrome/browser/chrome_browser_main.cc Sat May 28 10:27:05 2016 -@@ -173,7 +173,7 @@ +$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.7 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/chrome_browser_main.cc.orig.port Fri Oct 21 00:02:00 2016 ++++ chrome/browser/chrome_browser_main.cc Tue Oct 25 22:01:10 2016 +@@ -188,7 +188,7 @@ #include "chrome/browser/feedback/feedback_profile_observer.h" #endif // defined(OS_ANDROID) @@ -10,7 +10,25 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.6 2016/05/28 14:49:39 #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -1109,7 +1109,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -282,7 +282,7 @@ + #endif + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "chrome/browser/metrics/desktop_engagement/desktop_engagement_service.h" + #endif + +@@ -955,7 +955,7 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrial + sampling_profiler_config_.RegisterSyntheticFieldTrial(); + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + metrics::DesktopEngagementService::Initialize(); + #endif + +@@ -1325,7 +1325,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) @@ -19,3 +37,12 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.6 2016/05/28 14:49:39 // Set the product channel for crash reports. base::debug::SetCrashKeyValue(crash_keys::kChannel, chrome::GetChannelString()); +@@ -1516,7 +1516,7 @@ void ChromeBrowserMainParts::PreBrowserStart() { + + // Start the tab manager here so that we give the most amount of time for the + // other services to start up before we start adjusting the oom priority. +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + g_browser_process->GetTabManager()->Start(); + #endif + diff --git a/www/iridium/patches/patch-chrome_browser_chrome_browser_main_linux_cc b/www/iridium/patches/patch-chrome_browser_chrome_browser_main_linux_cc index d6657b89cd9..b119cb5ddb3 100644 --- a/www/iridium/patches/patch-chrome_browser_chrome_browser_main_linux_cc +++ b/www/iridium/patches/patch-chrome_browser_chrome_browser_main_linux_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/chrome_browser_main_linux.cc.orig.port Wed May 25 04:54:08 2016 -+++ chrome/browser/chrome_browser_main_linux.cc Thu May 26 08:09:40 2016 -@@ -57,12 +57,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +$OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.5 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/chrome_browser_main_linux.cc.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/chrome_browser_main_linux.cc Wed Oct 19 12:55:58 2016 +@@ -75,12 +75,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); @@ -17,7 +17,7 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.4 2016/05/28 14: bluez::DBusThreadManagerLinux::Initialize(); bluez::BluezDBusManager::Initialize( bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false); -@@ -72,7 +74,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS +@@ -90,7 +92,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/iridium/patches/patch-chrome_browser_chrome_browser_main_posix_cc b/www/iridium/patches/patch-chrome_browser_chrome_browser_main_posix_cc index 08032ae1e05..7667ee93e47 100644 --- a/www/iridium/patches/patch-chrome_browser_chrome_browser_main_posix_cc +++ b/www/iridium/patches/patch-chrome_browser_chrome_browser_main_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.3 2016/03/23 20:13:06 robert Exp $ ---- chrome/browser/chrome_browser_main_posix.cc.orig.port Wed Feb 24 00:01:58 2016 -+++ chrome/browser/chrome_browser_main_posix.cc Thu Mar 3 09:43:25 2016 -@@ -274,6 +274,11 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS +$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.4 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/chrome_browser_main_posix.cc.orig.port Thu Sep 1 00:03:27 2016 ++++ chrome/browser/chrome_browser_main_posix.cc Thu Sep 1 11:12:19 2016 +@@ -275,6 +275,11 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; @@ -13,7 +13,7 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.3 2016/03/23 20: #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else -@@ -281,6 +286,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS +@@ -282,6 +287,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS // shadow stacks) bloat the stack frames, so we need to increase the stack // size to avoid hitting the guard page. const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; diff --git a/www/iridium/patches/patch-chrome_browser_chrome_content_browser_client_cc b/www/iridium/patches/patch-chrome_browser_chrome_content_browser_client_cc index 9d979df5174..61f4b00587c 100644 --- a/www/iridium/patches/patch-chrome_browser_chrome_content_browser_client_cc +++ b/www/iridium/patches/patch-chrome_browser_chrome_content_browser_client_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/chrome_content_browser_client.cc.orig.port Wed May 25 21:00:57 2016 -+++ chrome/browser/chrome_content_browser_client.cc Thu May 26 08:09:40 2016 -@@ -196,7 +196,7 @@ - #include "chrome/browser/chromeos/system/input_device_settings.h" +$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.12 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/chrome_content_browser_client.cc.orig.port Wed Oct 19 13:31:02 2016 ++++ chrome/browser/chrome_content_browser_client.cc Wed Oct 19 13:32:41 2016 +@@ -211,7 +211,7 @@ + #include "chrome/browser/ui/browser_dialogs.h" #include "chromeos/chromeos_switches.h" #include "components/user_manager/user_manager.h" -#elif defined(OS_LINUX) @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2 #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "chrome/browser/chrome_browser_main_android.h" -@@ -209,7 +209,7 @@ +@@ -223,7 +223,7 @@ #include "chrome/browser/chrome_browser_main_posix.h" #endif @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2 #include "base/debug/leak_annotations.h" #include "components/crash/content/app/breakpad_linux.h" #include "components/crash/content/browser/crash_handler_host_linux.h" -@@ -231,7 +231,7 @@ +@@ -245,7 +245,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -508,7 +508,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer +@@ -534,7 +534,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer return false; } @@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -779,7 +779,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: +@@ -840,7 +840,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: main_parts = new ChromeBrowserMainPartsMac(parameters); #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); @@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2 main_parts = new ChromeBrowserMainPartsLinux(parameters); #elif defined(OS_ANDROID) main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -795,7 +795,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: +@@ -856,7 +856,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -55,7 +55,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2 main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1407,7 +1407,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -1451,7 +1451,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -63,8 +63,8 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2 +#elif defined(OS_POSIX) && !defined(OS_BSD) if (breakpad::IsCrashReporterEnabled()) { std::string switch_value; - scoped_ptr client_info = -@@ -2604,7 +2604,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi + std::unique_ptr client_info = +@@ -2732,7 +2732,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path); DCHECK(!app_data_path.empty()); } diff --git a/www/iridium/patches/patch-chrome_browser_chrome_content_browser_client_h b/www/iridium/patches/patch-chrome_browser_chrome_content_browser_client_h index 80b569cec7d..be016db4b90 100644 --- a/www/iridium/patches/patch-chrome_browser_chrome_content_browser_client_h +++ b/www/iridium/patches/patch-chrome_browser_chrome_content_browser_client_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/chrome_content_browser_client.h.orig.port Wed May 25 21:00:57 2016 -+++ chrome/browser/chrome_content_browser_client.h Thu May 26 08:09:40 2016 -@@ -256,7 +256,7 @@ class ChromeContentBrowserClient : public content::Con +$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.10 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/chrome_content_browser_client.h.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/chrome_content_browser_client.h Wed Oct 19 12:55:58 2016 +@@ -269,7 +269,7 @@ class ChromeContentBrowserClient : public content::Con int child_process_id, content::FileDescriptorInfo* mappings, std::map* regions) override; diff --git a/www/iridium/patches/patch-chrome_browser_custom_handlers_protocol_handler_registry_cc b/www/iridium/patches/patch-chrome_browser_custom_handlers_protocol_handler_registry_cc index 6934e9a361f..cfb7125057d 100644 --- a/www/iridium/patches/patch-chrome_browser_custom_handlers_protocol_handler_registry_cc +++ b/www/iridium/patches/patch-chrome_browser_custom_handlers_protocol_handler_registry_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_custom_handlers_protocol_handler_registry_cc,v 1.4 2016/03/23 20:13:06 robert Exp $ +$OpenBSD: patch-chrome_browser_custom_handlers_protocol_handler_registry_cc,v 1.5 2016/10/27 18:30:40 robert Exp $ --- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig.port Wed Feb 24 21:01:31 2016 +++ chrome/browser/custom_handlers/protocol_handler_registry.cc Thu Mar 3 09:43:25 2016 @@ -46,7 +46,7 @@ const ProtocolHandler& LookupHandler( diff --git a/www/iridium/patches/patch-chrome_browser_defaults_cc b/www/iridium/patches/patch-chrome_browser_defaults_cc index 5d713b44468..e02784e494b 100644 --- a/www/iridium/patches/patch-chrome_browser_defaults_cc +++ b/www/iridium/patches/patch-chrome_browser_defaults_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_defaults_cc,v 1.6 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-chrome_browser_defaults_cc,v 1.7 2016/10/27 18:30:40 robert Exp $ --- chrome/browser/defaults.cc.orig.port Wed May 25 04:54:08 2016 +++ chrome/browser/defaults.cc Thu May 26 08:09:40 2016 @@ -44,7 +44,7 @@ const bool kSyncAutoStarts = true; diff --git a/www/iridium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc b/www/iridium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc index 0b60da79e7b..67d8e6d053c 100644 --- a/www/iridium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc +++ b/www/iridium/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.6 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port Wed Apr 27 11:15:49 2016 -+++ chrome/browser/download/chrome_download_manager_delegate.cc Wed Apr 27 11:16:04 2016 -@@ -736,7 +736,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.7 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port Thu Sep 1 00:03:27 2016 ++++ chrome/browser/download/chrome_download_manager_delegate.cc Thu Sep 1 11:12:20 2016 +@@ -774,7 +774,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1. if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -751,7 +751,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -789,7 +789,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/iridium/patches/patch-chrome_browser_download_download_commands_cc b/www/iridium/patches/patch-chrome_browser_download_download_commands_cc index da217b4aa12..a39f576ca89 100644 --- a/www/iridium/patches/patch-chrome_browser_download_download_commands_cc +++ b/www/iridium/patches/patch-chrome_browser_download_download_commands_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.5 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/download/download_commands.cc.orig.port Thu Apr 14 08:36:11 2016 -+++ chrome/browser/download/download_commands.cc Thu Apr 14 08:36:32 2016 -@@ -211,7 +211,7 @@ bool DownloadCommands::IsCommandChecked(Command comman +$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.6 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/download/download_commands.cc.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/download/download_commands.cc Wed Oct 19 12:55:58 2016 +@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked(Command comman return download_item_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_item_); case ALWAYS_OPEN_TYPE: @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.5 2016/04/27 12 if (CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( download_item_->GetBrowserContext()); -@@ -254,7 +254,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Command command) bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( download_item_->GetBrowserContext()); @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.5 2016/04/27 12 if (CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); DownloadItemModel(download_item_) -@@ -352,7 +352,7 @@ Browser* DownloadCommands::GetBrowser() const { +@@ -375,7 +375,7 @@ Browser* DownloadCommands::GetBrowser() const { return browser_displayer.browser(); } @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.5 2016/04/27 12 bool DownloadCommands::IsDownloadPdf() const { base::FilePath path = download_item_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -369,7 +369,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons +@@ -392,7 +392,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); diff --git a/www/iridium/patches/patch-chrome_browser_download_download_commands_h b/www/iridium/patches/patch-chrome_browser_download_download_commands_h index fecb322fcb6..9f254bc1d20 100644 --- a/www/iridium/patches/patch-chrome_browser_download_download_commands_h +++ b/www/iridium/patches/patch-chrome_browser_download_download_commands_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.3 2016/03/23 20:13:07 robert Exp $ ---- chrome/browser/download/download_commands.h.orig.port Wed Feb 24 00:01:58 2016 -+++ chrome/browser/download/download_commands.h Thu Mar 3 09:43:25 2016 -@@ -42,7 +42,7 @@ class DownloadCommands { +$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.4 2016/10/27 18:30:40 robert Exp $ +--- chrome/browser/download/download_commands.h.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/download/download_commands.h Wed Oct 19 12:55:58 2016 +@@ -43,7 +43,7 @@ class DownloadCommands { void ExecuteCommand(Command command); #if defined(OS_WIN) || defined(OS_LINUX) || \ diff --git a/www/iridium/patches/patch-chrome_browser_download_download_prefs_cc b/www/iridium/patches/patch-chrome_browser_download_download_prefs_cc index 1ce2ba2e458..4a6e9863316 100644 --- a/www/iridium/patches/patch-chrome_browser_download_download_prefs_cc +++ b/www/iridium/patches/patch-chrome_browser_download_download_prefs_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/download/download_prefs.cc.orig.port Thu Apr 14 08:36:37 2016 -+++ chrome/browser/download/download_prefs.cc Thu Apr 14 08:37:05 2016 -@@ -55,7 +55,7 @@ namespace { +$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/download/download_prefs.cc.orig.port Wed Jul 20 21:03:19 2016 ++++ chrome/browser/download/download_prefs.cc Thu Jul 21 10:25:26 2016 +@@ -56,7 +56,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46 base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -135,7 +135,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46 should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -211,7 +211,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -213,7 +213,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46 registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif } -@@ -288,7 +288,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenUsed() const { @@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46 if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -302,7 +302,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( +@@ -304,7 +304,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46 if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader()) return true; #endif -@@ -335,7 +335,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( +@@ -338,7 +338,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( SaveAutoOpenState(); } @@ -55,7 +55,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46 void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -356,7 +356,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -359,7 +359,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpen() { diff --git a/www/iridium/patches/patch-chrome_browser_download_download_prefs_h b/www/iridium/patches/patch-chrome_browser_download_download_prefs_h index abde7455f59..fb46fbf9c55 100644 --- a/www/iridium/patches/patch-chrome_browser_download_download_prefs_h +++ b/www/iridium/patches/patch-chrome_browser_download_download_prefs_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.5 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.6 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/download/download_prefs.h.orig.port Thu Apr 14 08:37:10 2016 +++ chrome/browser/download/download_prefs.h Thu Apr 14 08:37:20 2016 @@ -79,7 +79,7 @@ class DownloadPrefs { diff --git a/www/iridium/patches/patch-chrome_browser_download_download_shelf_context_menu_cc b/www/iridium/patches/patch-chrome_browser_download_download_shelf_context_menu_cc index 564d65812ac..ffa15ab3d1e 100644 --- a/www/iridium/patches/patch-chrome_browser_download_download_shelf_context_menu_cc +++ b/www/iridium/patches/patch-chrome_browser_download_download_shelf_context_menu_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.4 2016/03/23 20:13:07 robert Exp $ ---- chrome/browser/download/download_shelf_context_menu.cc.orig.port Wed Feb 24 00:01:58 2016 -+++ chrome/browser/download/download_shelf_context_menu.cc Thu Mar 3 09:43:25 2016 -@@ -142,7 +142,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo +$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/download/download_shelf_context_menu.cc.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/download/download_shelf_context_menu.cc Wed Oct 19 12:55:58 2016 +@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; } diff --git a/www/iridium/patches/patch-chrome_browser_download_download_status_updater_cc b/www/iridium/patches/patch-chrome_browser_download_download_status_updater_cc index 5206f95673c..7ae7fdb0455 100644 --- a/www/iridium/patches/patch-chrome_browser_download_download_status_updater_cc +++ b/www/iridium/patches/patch-chrome_browser_download_download_status_updater_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_download_download_status_updater_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-chrome_browser_download_download_status_updater_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/download/download_status_updater.cc.orig.port Wed Feb 24 00:01:58 2016 +++ chrome/browser/download/download_status_updater.cc Thu Mar 3 09:43:25 2016 @@ -13,7 +13,7 @@ diff --git a/www/iridium/patches/patch-chrome_browser_extensions_BUILD_gn b/www/iridium/patches/patch-chrome_browser_extensions_BUILD_gn new file mode 100644 index 00000000000..55afe92904a --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_extensions_BUILD_gn @@ -0,0 +1,14 @@ +$OpenBSD: patch-chrome_browser_extensions_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/extensions/BUILD.gn.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/extensions/BUILD.gn Wed Oct 19 12:55:58 2016 +@@ -252,6 +252,10 @@ static_library("extensions") { + defines += [ "ENABLE_HOTWORDING" ] + } + ++ if (is_openbsd) { ++ sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ] ++ } ++ + if (enable_service_discovery) { + sources += rebase_path( + gypi_values.chrome_browser_extensions_service_discovery_sources, diff --git a/www/iridium/patches/patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc b/www/iridium/patches/patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc index ed94d35ecbb..8bb62a7ed05 100644 --- a/www/iridium/patches/patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc +++ b/www/iridium/patches/patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc,v 1.3 2015/10/24 18:22:21 robert Exp $ +$OpenBSD: patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig.port Sat Aug 22 21:01:52 2015 +++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc Wed Sep 2 07:31:55 2015 @@ -166,10 +166,12 @@ ImageWriterPrivateListRemovableStorageDevicesFunction: diff --git a/www/iridium/patches/patch-chrome_browser_extensions_api_input_ime_input_ime_api_h b/www/iridium/patches/patch-chrome_browser_extensions_api_input_ime_input_ime_api_h index 62027234f73..bfec4eae7aa 100644 --- a/www/iridium/patches/patch-chrome_browser_extensions_api_input_ime_input_ime_api_h +++ b/www/iridium/patches/patch-chrome_browser_extensions_api_input_ime_input_ime_api_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_extensions_api_input_ime_input_ime_api_h,v 1.2 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-chrome_browser_extensions_api_input_ime_input_ime_api_h,v 1.3 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig.port Wed May 25 04:54:08 2016 +++ chrome/browser/extensions/api/input_ime/input_ime_api.h Thu May 26 08:09:40 2016 @@ -28,7 +28,7 @@ diff --git a/www/iridium/patches/patch-chrome_browser_extensions_api_messaging_message_service_cc b/www/iridium/patches/patch-chrome_browser_extensions_api_messaging_message_service_cc index 2f5091e789d..b787e696c6c 100644 --- a/www/iridium/patches/patch-chrome_browser_extensions_api_messaging_message_service_cc +++ b/www/iridium/patches/patch-chrome_browser_extensions_api_messaging_message_service_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.5 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/extensions/api/messaging/message_service.cc.orig.port Wed Apr 13 22:59:39 2016 -+++ chrome/browser/extensions/api/messaging/message_service.cc Thu Apr 14 08:25:09 2016 -@@ -118,7 +118,7 @@ MessageService::PolicyPermission MessageService::IsNat +$OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/extensions/api/messaging/message_service.cc.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/extensions/api/messaging/message_service.cc Wed Oct 19 12:55:58 2016 +@@ -119,7 +119,7 @@ MessageService::PolicyPermission MessageService::IsNat const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; @@ -10,12 +10,12 @@ $OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.5 const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -415,7 +415,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -416,7 +416,7 @@ void MessageService::OpenChannelToNativeApp( if (!source) return; -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - Profile* profile = - Profile::FromBrowserContext(source->GetProcess()->GetBrowserContext()); - ExtensionService* extension_service = + content::WebContents* web_contents = + content::WebContents::FromRenderFrameHost(source); + ExtensionWebContentsObserver* extension_web_contents_observer = diff --git a/www/iridium/patches/patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc b/www/iridium/patches/patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc index b2563d1e4c4..dc71b459b69 100644 --- a/www/iridium/patches/patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc +++ b/www/iridium/patches/patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig.port Wed Feb 24 00:01:58 2016 +++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc Sat Mar 5 19:12:21 2016 @@ -4,6 +4,15 @@ diff --git a/www/iridium/patches/patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc b/www/iridium/patches/patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc index 228c880ca34..09c618b735f 100644 --- a/www/iridium/patches/patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc +++ b/www/iridium/patches/patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc,v 1.4 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig.port Wed May 25 04:54:08 2016 +++ chrome/browser/extensions/api/omnibox/omnibox_api.cc Thu May 26 08:09:41 2016 @@ -45,7 +45,7 @@ const char kBackgroundTabDisposition[] = "newBackgroun diff --git a/www/iridium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc b/www/iridium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc index 80524aabfd8..3eb3eb0d9f1 100644 --- a/www/iridium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc +++ b/www/iridium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/extensions/bookmark_app_helper.cc.orig.port Wed May 25 04:54:08 2016 -+++ chrome/browser/extensions/bookmark_app_helper.cc Thu May 26 08:09:41 2016 -@@ -705,7 +705,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten +$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/extensions/bookmark_app_helper.cc.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/extensions/bookmark_app_helper.cc Wed Oct 19 12:55:58 2016 +@@ -707,7 +707,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten #if !defined(OS_MACOSX) #if !defined(USE_ASH) web_app::ShortcutLocations creation_locations; diff --git a/www/iridium/patches/patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc b/www/iridium/patches/patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc index ebb82637dbb..778902f955e 100644 --- a/www/iridium/patches/patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc +++ b/www/iridium/patches/patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig.port Wed May 25 04:54:08 2016 -+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc Thu May 26 08:09:41 2016 -@@ -63,7 +63,7 @@ +$OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig.port Wed Jul 20 21:03:20 2016 ++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc Thu Jul 21 10:25:27 2016 +@@ -62,7 +62,7 @@ #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #include "chrome/browser/extensions/api/log_private/log_private_api.h" @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factorie #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -104,7 +104,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -103,7 +103,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); diff --git a/www/iridium/patches/patch-chrome_browser_extensions_external_provider_impl_cc b/www/iridium/patches/patch-chrome_browser_extensions_external_provider_impl_cc index 0923b1d0c2a..9be8ac94d72 100644 --- a/www/iridium/patches/patch-chrome_browser_extensions_external_provider_impl_cc +++ b/www/iridium/patches/patch-chrome_browser_extensions_external_provider_impl_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/extensions/external_provider_impl.cc.orig.port Wed May 25 04:54:09 2016 -+++ chrome/browser/extensions/external_provider_impl.cc Thu May 26 08:09:41 2016 -@@ -646,7 +646,7 @@ void ExternalProviderImpl::CreateExternalProviders( +$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/extensions/external_provider_impl.cc.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/extensions/external_provider_impl.cc Wed Oct 19 12:55:59 2016 +@@ -647,7 +647,7 @@ void ExternalProviderImpl::CreateExternalProviders( Manifest::EXTERNAL_PREF_DOWNLOAD, oem_extension_creation_flags))); } @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.2 2016/0 if (!profile->IsLegacySupervised()) { provider_list->push_back( linked_ptr( -@@ -688,7 +688,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -689,7 +689,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags))); // Define a per-user source of external extensions. diff --git a/www/iridium/patches/patch-chrome_browser_first_run_first_run_internal_posix_cc b/www/iridium/patches/patch-chrome_browser_first_run_first_run_internal_posix_cc index b45d7ac9267..46e2511d7d7 100644 --- a/www/iridium/patches/patch-chrome_browser_first_run_first_run_internal_posix_cc +++ b/www/iridium/patches/patch-chrome_browser_first_run_first_run_internal_posix_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_first_run_first_run_internal_posix_cc,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/first_run/first_run_internal_posix.cc.orig.port Fri May 27 10:48:10 2016 -+++ chrome/browser/first_run/first_run_internal_posix.cc Sat May 28 10:25:25 2016 +$OpenBSD: patch-chrome_browser_first_run_first_run_internal_posix_cc,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/first_run/first_run_internal_posix.cc.orig.port Sun Oct 23 21:05:00 2016 ++++ chrome/browser/first_run/first_run_internal_posix.cc Thu Oct 27 11:16:54 2016 @@ -25,7 +25,7 @@ namespace first_run { namespace internal { diff --git a/www/iridium/patches/patch-chrome_browser_gpu_gl_string_manager_cc b/www/iridium/patches/patch-chrome_browser_gpu_gl_string_manager_cc index 9a6fb91c6af..32c4bd7c904 100644 --- a/www/iridium/patches/patch-chrome_browser_gpu_gl_string_manager_cc +++ b/www/iridium/patches/patch-chrome_browser_gpu_gl_string_manager_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_gpu_gl_string_manager_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/gpu/gl_string_manager.cc.orig.port Fri Apr 8 18:02:07 2016 -+++ chrome/browser/gpu/gl_string_manager.cc Thu Apr 14 08:25:09 2016 -@@ -28,7 +28,7 @@ GLStringManager::~GLStringManager() { +$OpenBSD: patch-chrome_browser_gpu_gl_string_manager_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/gpu/gl_string_manager.cc.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/gpu/gl_string_manager.cc Wed Oct 19 12:55:59 2016 +@@ -33,7 +33,7 @@ GLStringManager::~GLStringManager() { void GLStringManager::Initialize() { // On MacOSX or Windows, preliminary GPUInfo is enough. diff --git a/www/iridium/patches/patch-chrome_browser_gpu_gpu_feature_checker_cc b/www/iridium/patches/patch-chrome_browser_gpu_gpu_feature_checker_cc index 9c88704bf04..f6d61d18768 100644 --- a/www/iridium/patches/patch-chrome_browser_gpu_gpu_feature_checker_cc +++ b/www/iridium/patches/patch-chrome_browser_gpu_gpu_feature_checker_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_gpu_gpu_feature_checker_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-chrome_browser_gpu_gpu_feature_checker_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/gpu/gpu_feature_checker.cc.orig.port Wed Feb 24 00:01:58 2016 +++ chrome/browser/gpu/gpu_feature_checker.cc Thu Mar 3 09:43:25 2016 @@ -34,7 +34,7 @@ void GPUFeatureChecker::CheckGPUFeatureAvailability() diff --git a/www/iridium/patches/patch-chrome_browser_interstitials_chrome_controller_client_cc b/www/iridium/patches/patch-chrome_browser_interstitials_chrome_controller_client_cc index ec67d59562a..419e5d623ae 100644 --- a/www/iridium/patches/patch-chrome_browser_interstitials_chrome_controller_client_cc +++ b/www/iridium/patches/patch-chrome_browser_interstitials_chrome_controller_client_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_interstitials_chrome_controller_client_cc,v 1.1 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-chrome_browser_interstitials_chrome_controller_client_cc,v 1.2 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/interstitials/chrome_controller_client.cc.orig.port Sat Apr 16 13:33:45 2016 +++ chrome/browser/interstitials/chrome_controller_client.cc Sat Apr 16 13:36:17 2016 @@ -55,7 +55,7 @@ void LaunchDateAndTimeSettingsOnFile() { diff --git a/www/iridium/patches/patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc b/www/iridium/patches/patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc index b9fd1fe2a98..c8454726d8b 100644 --- a/www/iridium/patches/patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc +++ b/www/iridium/patches/patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc,v 1.3 2015/05/26 17:37:39 robert Exp $ +$OpenBSD: patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig.port Wed May 20 10:03:54 2015 +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc Wed May 20 10:04:12 2015 @@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( diff --git a/www/iridium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc b/www/iridium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc index 0cb782ea3f3..cc9abdeb9b1 100644 --- a/www/iridium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc +++ b/www/iridium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.8 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.9 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/media_galleries/media_file_system_registry.cc.orig.port Wed May 25 04:54:09 2016 +++ chrome/browser/media_galleries/media_file_system_registry.cc Thu May 26 08:09:41 2016 @@ -757,7 +757,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI diff --git a/www/iridium/patches/patch-chrome_browser_media_webrtc_log_uploader_cc b/www/iridium/patches/patch-chrome_browser_media_webrtc_log_uploader_cc index 96e8016d2c9..db11a9e8ab3 100644 --- a/www/iridium/patches/patch-chrome_browser_media_webrtc_log_uploader_cc +++ b/www/iridium/patches/patch-chrome_browser_media_webrtc_log_uploader_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_media_webrtc_log_uploader_cc,v 1.1 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-chrome_browser_media_webrtc_log_uploader_cc,v 1.2 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/media/webrtc_log_uploader.cc.orig.port Mon Apr 25 17:42:10 2016 +++ chrome/browser/media/webrtc_log_uploader.cc Mon Apr 25 17:42:31 2016 @@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart( diff --git a/www/iridium/patches/patch-chrome_browser_memory_details_cc b/www/iridium/patches/patch-chrome_browser_memory_details_cc index d59a4a4cfe4..363ce90298c 100644 --- a/www/iridium/patches/patch-chrome_browser_memory_details_cc +++ b/www/iridium/patches/patch-chrome_browser_memory_details_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.8 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.9 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/memory_details.cc.orig.port Wed May 25 21:00:57 2016 +++ chrome/browser/memory_details.cc Thu May 26 08:09:41 2016 @@ -32,7 +32,7 @@ diff --git a/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc b/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc index ebb81d9ac31..7ec9dd06865 100644 --- a/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc +++ b/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc,v 1.4 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig.port Wed Feb 24 21:01:31 2016 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc Thu Mar 3 09:43:26 2016 @@ -36,8 +36,10 @@ diff --git a/www/iridium/patches/patch-chrome_browser_net_async_dns_field_trial_cc b/www/iridium/patches/patch-chrome_browser_net_async_dns_field_trial_cc index b1e83f453ad..afb33a7c3c0 100644 --- a/www/iridium/patches/patch-chrome_browser_net_async_dns_field_trial_cc +++ b/www/iridium/patches/patch-chrome_browser_net_async_dns_field_trial_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_net_async_dns_field_trial_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-chrome_browser_net_async_dns_field_trial_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/net/async_dns_field_trial.cc.orig.port Thu Apr 14 08:37:58 2016 +++ chrome/browser/net/async_dns_field_trial.cc Thu Apr 14 08:38:05 2016 @@ -61,7 +61,7 @@ void HistogramPrefSource(PrefSource source, bool enabl diff --git a/www/iridium/patches/patch-chrome_browser_notifications_message_center_notification_manager_cc b/www/iridium/patches/patch-chrome_browser_notifications_message_center_notification_manager_cc index 3c774f10d70..58d5f3c718e 100644 --- a/www/iridium/patches/patch-chrome_browser_notifications_message_center_notification_manager_cc +++ b/www/iridium/patches/patch-chrome_browser_notifications_message_center_notification_manager_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_notifications_message_center_notification_manager_cc,v 1.7 2016/03/23 20:13:07 robert Exp $ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig.port Wed Feb 24 00:01:58 2016 -+++ chrome/browser/notifications/message_center_notification_manager.cc Thu Mar 3 09:43:26 2016 -@@ -74,7 +74,7 @@ MessageCenterNotificationManager::MessageCenterNotific - blockers_.push_back(make_scoped_ptr( - new FullscreenNotificationBlocker(message_center))); +$OpenBSD: patch-chrome_browser_notifications_message_center_notification_manager_cc,v 1.8 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/notifications/message_center_notification_manager.cc.orig.port Wed Jul 20 21:03:20 2016 ++++ chrome/browser/notifications/message_center_notification_manager.cc Thu Jul 21 10:25:28 2016 +@@ -66,7 +66,7 @@ MessageCenterNotificationManager::MessageCenterNotific + blockers_.push_back( + base::WrapUnique(new FullscreenNotificationBlocker(message_center))); -#if defined(OS_WIN) || defined(OS_MACOSX) \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) \ diff --git a/www/iridium/patches/patch-chrome_browser_platform_util_h b/www/iridium/patches/patch-chrome_browser_platform_util_h new file mode 100644 index 00000000000..42fd4fffdd0 --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_platform_util_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_browser_platform_util_h,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/platform_util.h.orig.port Thu Jul 21 15:53:20 2016 ++++ chrome/browser/platform_util.h Thu Jul 21 15:53:27 2016 +@@ -40,7 +40,7 @@ enum OpenOperationResult { + enum OpenItemType { + OPEN_FILE, + OPEN_FOLDER, +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + SHOW_ITEM_IN_FOLDER + #endif + }; diff --git a/www/iridium/patches/patch-chrome_browser_platform_util_linux_cc b/www/iridium/patches/patch-chrome_browser_platform_util_linux_cc index 2b5ebfb7603..cdec52f1403 100644 --- a/www/iridium/patches/patch-chrome_browser_platform_util_linux_cc +++ b/www/iridium/patches/patch-chrome_browser_platform_util_linux_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_platform_util_linux_cc,v 1.2 2015/05/06 14:27:23 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, +$OpenBSD: patch-chrome_browser_platform_util_linux_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/platform_util_linux.cc.orig.port Wed Jul 20 21:03:20 2016 ++++ chrome/browser/platform_util_linux.cc Thu Jul 21 10:25:28 2016 +@@ -36,7 +36,9 @@ void RunCommand(const std::string& command, base::LaunchOptions options; options.current_directory = working_directory; diff --git a/www/iridium/patches/patch-chrome_browser_plugins_plugins_resource_service_cc b/www/iridium/patches/patch-chrome_browser_plugins_plugins_resource_service_cc new file mode 100644 index 00000000000..5d7c12f949b --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_plugins_plugins_resource_service_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_browser_plugins_plugins_resource_service_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/plugins/plugins_resource_service.cc.orig.port Tue Oct 25 21:56:43 2016 ++++ chrome/browser/plugins/plugins_resource_service.cc Tue Oct 25 22:02:34 2016 +@@ -31,7 +31,7 @@ GURL GetPluginsServerURL() { + std::string filename; + #if defined(OS_WIN) + filename = "plugins_win.json"; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + filename = "plugins_linux.json"; + #elif defined(OS_MACOSX) + filename = "plugins_mac.json"; diff --git a/www/iridium/patches/patch-chrome_browser_process_singleton_posix_cc b/www/iridium/patches/patch-chrome_browser_process_singleton_posix_cc index ffb362539ba..c77a0de6110 100644 --- a/www/iridium/patches/patch-chrome_browser_process_singleton_posix_cc +++ b/www/iridium/patches/patch-chrome_browser_process_singleton_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.9 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/process_singleton_posix.cc.orig.port Fri Apr 8 18:02:07 2016 -+++ chrome/browser/process_singleton_posix.cc Thu Apr 14 08:25:09 2016 -@@ -87,11 +87,11 @@ +$OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/process_singleton_posix.cc.orig.port Thu Sep 1 00:03:27 2016 ++++ chrome/browser/process_singleton_posix.cc Thu Sep 1 11:12:20 2016 +@@ -90,11 +90,11 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -15,7 +15,7 @@ $OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.9 2016/04/27 12:46 #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -315,7 +315,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -318,7 +318,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return false; diff --git a/www/iridium/patches/patch-chrome_browser_profiles_profile_impl_io_data_cc b/www/iridium/patches/patch-chrome_browser_profiles_profile_impl_io_data_cc new file mode 100644 index 00000000000..3bcd6c25d17 --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_profiles_profile_impl_io_data_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_browser_profiles_profile_impl_io_data_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/profiles/profile_impl_io_data.cc.orig.port Tue Oct 25 21:56:43 2016 ++++ chrome/browser/profiles/profile_impl_io_data.cc Tue Oct 25 22:02:52 2016 +@@ -98,7 +98,7 @@ net::BackendType ChooseCacheBackendType() { + } + #endif // #if !defined(OS_ANDROID) + +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + return net::CACHE_BACKEND_SIMPLE; + #else + return net::CACHE_BACKEND_BLOCKFILE; diff --git a/www/iridium/patches/patch-chrome_browser_renderer_preferences_util_cc b/www/iridium/patches/patch-chrome_browser_renderer_preferences_util_cc index 4ad37c3dc04..4f174c61a29 100644 --- a/www/iridium/patches/patch-chrome_browser_renderer_preferences_util_cc +++ b/www/iridium/patches/patch-chrome_browser_renderer_preferences_util_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.7 2016/03/23 20:13:07 robert Exp $ ---- chrome/browser/renderer_preferences_util.cc.orig.port Wed Feb 24 21:01:31 2016 -+++ chrome/browser/renderer_preferences_util.cc Thu Mar 3 09:43:26 2016 -@@ -15,7 +15,7 @@ +$OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.8 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/renderer_preferences_util.cc.orig.port Wed Oct 12 21:02:54 2016 ++++ chrome/browser/renderer_preferences_util.cc Wed Oct 19 12:55:59 2016 +@@ -18,7 +18,7 @@ #include "content/public/common/webrtc_ip_handling_policy.h" #include "third_party/skia/include/core/SkColor.h" @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.7 2016/03/23 20: #include "ui/gfx/font_render_params.h" #endif -@@ -27,7 +27,7 @@ +@@ -26,7 +26,7 @@ #include "ui/views/controls/textfield/textfield.h" #endif @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.7 2016/03/23 20: #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -95,7 +95,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -120,7 +120,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.7 2016/03/23 20: views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -117,7 +117,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -142,7 +142,7 @@ void UpdateFromSystemSettings(content::RendererPrefere } #endif diff --git a/www/iridium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json b/www/iridium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json index eb8d7d1f7db..9e6fce62916 100644 --- a/www/iridium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json +++ b/www/iridium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig.port Mon Feb 15 12:14:39 2016 -+++ chrome/browser/resources/plugin_metadata/plugins_linux.json Mon Feb 15 12:14:46 2016 +$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig.port Wed Oct 19 13:32:48 2016 ++++ chrome/browser/resources/plugin_metadata/plugins_linux.json Wed Oct 19 13:32:59 2016 @@ -70,28 +70,6 @@ "displayurl": true, "group_name_matcher": "Java*" @@ -15,9 +15,9 @@ $OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1. - ], - "versions": [ - { -- "version": "21.0.0.242", +- "version": "23.0.0.185", - "status": "up_to_date", -- "reference": "https://helpx.adobe.com/security/products/flash-player/apsb16-15.html" +- "reference": "https://helpx.adobe.com/security/products/flash-player/apsb16-32.html" - } - ], - "lang": "en-US", diff --git a/www/iridium/patches/patch-chrome_browser_resources_safe_browsing_gen_file_type_proto_py b/www/iridium/patches/patch-chrome_browser_resources_safe_browsing_gen_file_type_proto_py new file mode 100644 index 00000000000..04b899ae9a7 --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_resources_safe_browsing_gen_file_type_proto_py @@ -0,0 +1,20 @@ +$OpenBSD: patch-chrome_browser_resources_safe_browsing_gen_file_type_proto_py,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig.port Thu Sep 1 00:03:28 2016 ++++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py Thu Sep 1 11:12:20 2016 +@@ -41,6 +41,7 @@ def PlatformTypes(): + "android": config_pb2.DownloadFileType.PLATFORM_ANDROID, + "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS, + "linux": config_pb2.DownloadFileType.PLATFORM_LINUX, ++ "openbsd": config_pb2.DownloadFileType.PLATFORM_LINUX, + "mac": config_pb2.DownloadFileType.PLATFORM_MAC, + "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS, + } +@@ -192,7 +193,7 @@ def main(): + 'Outfile must have a %d for version and %s for platform.') + parser.add_option('-t', '--type', + help='The platform type. One of android, chromeos, ' + +- 'linux, mac, win') ++ 'linux, mac, win, openbsd') + parser.add_option('-i', '--infile', + help='The ASCII DownloadFileType-proto file to read.') + parser.add_option('-d', '--outdir', diff --git a/www/iridium/patches/patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc b/www/iridium/patches/patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc index 68c207b1e00..598b7af6861 100644 --- a/www/iridium/patches/patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc +++ b/www/iridium/patches/patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc,v 1.5 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig.port Tue Apr 26 16:20:04 2016 -+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc Wed Apr 27 11:11:16 2016 -@@ -791,7 +791,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +$OpenBSD: patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig.port Sun Oct 23 21:04:55 2016 ++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc Thu Oct 27 11:16:55 2016 +@@ -803,7 +803,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; // CurrentProcessInfo::CreationTime() is missing on some platforms. diff --git a/www/iridium/patches/patch-chrome_browser_safe_browsing_permission_reporter_cc b/www/iridium/patches/patch-chrome_browser_safe_browsing_permission_reporter_cc new file mode 100644 index 00000000000..d2466f70705 --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_safe_browsing_permission_reporter_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_browser_safe_browsing_permission_reporter_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/safe_browsing/permission_reporter.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/safe_browsing/permission_reporter.cc Wed Oct 19 12:56:00 2016 +@@ -190,7 +190,7 @@ bool PermissionReporter::BuildReport(const PermissionR + #if defined(OS_ANDROID) + report.set_platform_type(PermissionReport::ANDROID_PLATFORM); + #elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \ +- defined(OS_LINUX) ++ defined(OS_LINUX) || defined(OS_BSD) + report.set_platform_type(PermissionReport::DESKTOP_PLATFORM); + #else + #error Unsupported platform. diff --git a/www/iridium/patches/patch-chrome_browser_speech_tts_controller_impl_cc b/www/iridium/patches/patch-chrome_browser_speech_tts_controller_impl_cc index 43079eba97c..77e41fba2c6 100644 --- a/www/iridium/patches/patch-chrome_browser_speech_tts_controller_impl_cc +++ b/www/iridium/patches/patch-chrome_browser_speech_tts_controller_impl_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_speech_tts_controller_impl_cc,v 1.5 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-chrome_browser_speech_tts_controller_impl_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/speech/tts_controller_impl.cc.orig.port Fri Apr 8 18:02:07 2016 +++ chrome/browser/speech/tts_controller_impl.cc Thu Apr 14 08:25:09 2016 @@ -369,9 +369,13 @@ int TtsControllerImpl::QueueSize() { diff --git a/www/iridium/patches/patch-chrome_browser_sync_chrome_sync_client_cc b/www/iridium/patches/patch-chrome_browser_sync_chrome_sync_client_cc index 4fdcce51a98..408ba2a3d0d 100644 --- a/www/iridium/patches/patch-chrome_browser_sync_chrome_sync_client_cc +++ b/www/iridium/patches/patch-chrome_browser_sync_chrome_sync_client_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_sync_chrome_sync_client_cc,v 1.3 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/sync/chrome_sync_client.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/sync/chrome_sync_client.cc Thu May 26 08:09:41 2016 -@@ -577,7 +577,7 @@ void ChromeSyncClient::RegisterDesktopDataTypes( +$OpenBSD: patch-chrome_browser_sync_chrome_sync_client_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/sync/chrome_sync_client.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/sync/chrome_sync_client.cc Wed Oct 19 12:56:00 2016 +@@ -573,7 +573,7 @@ void ChromeSyncClient::RegisterDesktopDataTypes( } #endif diff --git a/www/iridium/patches/patch-chrome_browser_task_manager_task_manager_cc b/www/iridium/patches/patch-chrome_browser_task_manager_task_manager_cc deleted file mode 100644 index 085054163c2..00000000000 --- a/www/iridium/patches/patch-chrome_browser_task_manager_task_manager_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_task_manager_task_manager_cc,v 1.5 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/task_manager/task_manager.cc.orig.port Wed Apr 13 22:59:40 2016 -+++ chrome/browser/task_manager/task_manager.cc Thu Apr 14 08:25:09 2016 -@@ -1213,7 +1213,7 @@ void TaskManagerModel::Refresh() { - values.is_cpu_usage_valid = true; - values.cpu_usage = metrics_iter->second->GetCPUUsage(); - } --#if defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - // TODO(port): Implement GetIdleWakeupsPerSecond() on other platforms, - // crbug.com/120488 - if (!values.is_idle_wakeups_valid) { diff --git a/www/iridium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc b/www/iridium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc index 51c5c5da852..3738017f827 100644 --- a/www/iridium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc +++ b/www/iridium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.4 2016/03/23 20:13:07 robert Exp $ ---- chrome/browser/tracing/crash_service_uploader.cc.orig.port Wed Feb 24 00:01:58 2016 -+++ chrome/browser/tracing/crash_service_uploader.cc Thu Mar 3 09:43:26 2016 -@@ -150,6 +150,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread( +$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/tracing/crash_service_uploader.cc.orig.port Thu Sep 1 00:03:28 2016 ++++ chrome/browser/tracing/crash_service_uploader.cc Thu Sep 1 11:12:20 2016 +@@ -155,6 +155,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread( const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; diff --git a/www/iridium/patches/patch-chrome_browser_ui_app_list_app_list_service_cc b/www/iridium/patches/patch-chrome_browser_ui_app_list_app_list_service_cc deleted file mode 100644 index a89732edce4..00000000000 --- a/www/iridium/patches/patch-chrome_browser_ui_app_list_app_list_service_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_app_list_app_list_service_cc,v 1.2 2016/03/23 20:13:07 robert Exp $ ---- chrome/browser/ui/app_list/app_list_service.cc.orig.port Wed Feb 24 21:01:31 2016 -+++ chrome/browser/ui/app_list/app_list_service.cc Thu Mar 3 09:43:26 2016 -@@ -45,7 +45,7 @@ base::Time GetOriginalProcessStartTime(const base::Com - - // base::CurrentProcessInfo::CreationTime() is only defined on some - // platforms. --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - return base::CurrentProcessInfo::CreationTime(); - #else - return base::Time(); diff --git a/www/iridium/patches/patch-chrome_browser_ui_ash_system_tray_delegate_common_cc b/www/iridium/patches/patch-chrome_browser_ui_ash_system_tray_delegate_common_cc deleted file mode 100644 index 163d0f5d38f..00000000000 --- a/www/iridium/patches/patch-chrome_browser_ui_ash_system_tray_delegate_common_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_ash_system_tray_delegate_common_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/ash/system_tray_delegate_common.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/ash/system_tray_delegate_common.cc Thu May 26 08:09:41 2016 -@@ -79,7 +79,7 @@ base::HourClockType SystemTrayDelegateCommon::GetHourC - } - - void SystemTrayDelegateCommon::ShowChromeSlow() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - chrome::ScopedTabbedBrowserDisplayer displayer( - ProfileManager::GetPrimaryUserProfile()); - chrome::ShowSlow(displayer.browser()); diff --git a/www/iridium/patches/patch-chrome_browser_ui_browser_command_controller_cc b/www/iridium/patches/patch-chrome_browser_ui_browser_command_controller_cc index 01b9bfde262..63ee5c06a6b 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_browser_command_controller_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_browser_command_controller_cc @@ -1,16 +1,16 @@ -$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/browser_command_controller.cc.orig.port Fri May 27 10:48:13 2016 -+++ chrome/browser/ui/browser_command_controller.cc Sat May 28 10:25:26 2016 -@@ -77,7 +77,7 @@ +$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.12 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/browser_command_controller.cc.orig.port Sun Oct 23 21:04:55 2016 ++++ chrome/browser/ui/browser_command_controller.cc Thu Oct 27 11:16:55 2016 +@@ -76,7 +76,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -218,7 +218,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -217,7 +217,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.11 2016/05/2 // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -411,7 +411,7 @@ void BrowserCommandController::ExecuteCommandWithDispo +@@ -420,7 +420,7 @@ void BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.11 2016/05/2 case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = browser_->profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -807,7 +807,7 @@ void BrowserCommandController::InitCommandState() { +@@ -813,7 +813,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/iridium/patches/patch-chrome_browser_ui_browser_view_prefs_cc b/www/iridium/patches/patch-chrome_browser_ui_browser_view_prefs_cc index 7cb17a1b9eb..28090cb9aac 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_browser_view_prefs_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_browser_view_prefs_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_ui_browser_view_prefs_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/browser_view_prefs.cc.orig.port Wed May 25 04:54:10 2016 -+++ chrome/browser/ui/browser_view_prefs.cc Thu May 26 08:09:41 2016 +$OpenBSD: patch-chrome_browser_ui_browser_view_prefs_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/browser_view_prefs.cc.orig.port Wed Oct 19 13:39:27 2016 ++++ chrome/browser/ui/browser_view_prefs.cc Wed Oct 19 13:39:41 2016 @@ -10,7 +10,7 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -10,12 +10,12 @@ $OpenBSD: patch-chrome_browser_ui_browser_view_prefs_cc,v 1.5 2016/05/28 14:49:3 #include "ui/base/x/x11_util.h" #endif -@@ -33,7 +33,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* +@@ -32,7 +32,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* + void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { - bool custom_frame_default = false; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - custom_frame_default = ui::GetCustomFramePrefDefault(); + registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, + ui::GetCustomFramePrefDefault()); #endif - diff --git a/www/iridium/patches/patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc b/www/iridium/patches/patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc index b6854ee1e87..77f112a499d 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig.port Wed Feb 24 21:01:31 2016 +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc Thu Mar 3 09:43:26 2016 @@ -19,7 +19,7 @@ diff --git a/www/iridium/patches/patch-chrome_browser_ui_input_method_input_method_engine_base_cc b/www/iridium/patches/patch-chrome_browser_ui_input_method_input_method_engine_base_cc index c099822ec9a..1b8afefa72e 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_input_method_input_method_engine_base_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_input_method_input_method_engine_base_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_ui_input_method_input_method_engine_base_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-chrome_browser_ui_input_method_input_method_engine_base_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/ui/input_method/input_method_engine_base.cc.orig.port Wed May 25 04:54:10 2016 +++ chrome/browser/ui/input_method/input_method_engine_base.cc Thu May 26 08:09:41 2016 @@ -37,7 +37,7 @@ diff --git a/www/iridium/patches/patch-chrome_browser_ui_input_method_input_method_engine_h b/www/iridium/patches/patch-chrome_browser_ui_input_method_input_method_engine_h index 00d416666e8..e6dbb6e97fa 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_input_method_input_method_engine_h +++ b/www/iridium/patches/patch-chrome_browser_ui_input_method_input_method_engine_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_ui_input_method_input_method_engine_h,v 1.2 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-chrome_browser_ui_input_method_input_method_engine_h,v 1.3 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/ui/input_method/input_method_engine.h.orig.port Wed May 25 04:54:10 2016 +++ chrome/browser/ui/input_method/input_method_engine.h Thu May 26 08:09:41 2016 @@ -27,7 +27,7 @@ class InputMethodEngine : public InputMethodEngineBase diff --git a/www/iridium/patches/patch-chrome_browser_ui_panels_panel_manager_cc b/www/iridium/patches/patch-chrome_browser_ui_panels_panel_manager_cc deleted file mode 100644 index 78a65b28bb9..00000000000 --- a/www/iridium/patches/patch-chrome_browser_ui_panels_panel_manager_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_panels_panel_manager_cc,v 1.6 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/panels/panel_manager.cc.orig.port Wed May 25 04:54:10 2016 -+++ chrome/browser/ui/panels/panel_manager.cc Thu May 26 08:09:41 2016 -@@ -143,7 +143,7 @@ bool PanelManager::ShouldUsePanels(const std::string& - // static - bool PanelManager::IsPanelStackingEnabled() { - // Stacked panel mode is not supported in linux-aura. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - return false; - #else - return true; diff --git a/www/iridium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc b/www/iridium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc index 02a9e31d799..16b8080667a 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_startup_bad_flags_prompt_cc,v 1.6 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig.port Wed Apr 13 22:59:41 2016 -+++ chrome/browser/ui/startup/bad_flags_prompt.cc Thu Apr 14 08:25:10 2016 -@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser) { +$OpenBSD: patch-chrome_browser_ui_startup_bad_flags_prompt_cc,v 1.7 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/startup/bad_flags_prompt.cc Wed Oct 19 12:56:00 2016 +@@ -71,7 +71,7 @@ void ShowBadFlagsPrompt(Browser* browser) { // This flag gives extensions more powers. extensions::switches::kExtensionsOnChromeURLs, diff --git a/www/iridium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc b/www/iridium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc index b0d98ecd8bf..373531afc2d 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc @@ -1,14 +1,42 @@ -$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/startup/startup_browser_creator.cc Thu May 26 08:09:41 2016 -@@ -636,8 +636,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig.port Fri Oct 21 00:02:01 2016 ++++ chrome/browser/ui/startup/startup_browser_creator.cc Tue Oct 25 22:04:18 2016 +@@ -90,7 +90,7 @@ + #include "components/user_manager/user_manager.h" + #endif + +-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) ++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) + #include "ui/events/devices/x11/touch_factory_x11.h" + #endif + +@@ -102,7 +102,7 @@ + #include "chrome/browser/metrics/jumplist_metrics_win.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" + #endif + +@@ -627,9 +627,11 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( } #endif // OS_CHROMEOS +#if 0 /* XXX */ #if defined(TOOLKIT_VIEWS) && defined(USE_X11) ui::TouchFactory::SetTouchDeviceListFromCommandLine(); -+#endif #endif ++#endif #if defined(OS_MACOSX) + if (web_app::MaybeRebuildShortcut(command_line)) +@@ -703,7 +705,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( + } + #endif // defined(OS_WIN) + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + // Our request to Activate may be discarded on some linux window + // managers unless given a recent timestamp, so update the timestamp if + // we were given one. diff --git a/www/iridium/patches/patch-chrome_browser_ui_tab_helpers_cc b/www/iridium/patches/patch-chrome_browser_ui_tab_helpers_cc new file mode 100644 index 00000000000..b169411013c --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_ui_tab_helpers_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_browser_ui_tab_helpers_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/tab_helpers.cc.orig.port Tue Oct 25 21:56:43 2016 ++++ chrome/browser/ui/tab_helpers.cc Tue Oct 25 22:04:30 2016 +@@ -226,7 +226,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con + #endif + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + metrics::DesktopEngagementObserver::CreateForWebContents(web_contents); + #endif + // --- Feature tab helpers behind flags --- diff --git a/www/iridium/patches/patch-chrome_browser_ui_toolbar_app_menu_model_cc b/www/iridium/patches/patch-chrome_browser_ui_toolbar_app_menu_model_cc index c68f37d6805..7f356011293 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_toolbar_app_menu_model_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_toolbar_app_menu_model_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_toolbar_app_menu_model_cc,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/toolbar/app_menu_model.cc.orig.port Wed May 25 04:54:10 2016 -+++ chrome/browser/ui/toolbar/app_menu_model.cc Thu May 26 08:09:41 2016 -@@ -711,7 +711,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) +$OpenBSD: patch-chrome_browser_ui_toolbar_app_menu_model_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/toolbar/app_menu_model.cc Wed Oct 19 12:56:00 2016 +@@ -704,7 +704,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) case IDC_UPGRADE_DIALOG: return browser_defaults::kShowUpgradeMenuItem && UpgradeDetector::GetInstance()->notify_upgrade(); diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_accelerator_table_cc b/www/iridium/patches/patch-chrome_browser_ui_views_accelerator_table_cc index 2cabf756991..bc2d7fb7788 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_accelerator_table_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_accelerator_table_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_ui_views_accelerator_table_cc,v 1.5 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-chrome_browser_ui_views_accelerator_table_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/ui/views/accelerator_table.cc.orig.port Wed Feb 24 00:01:59 2016 +++ chrome/browser/ui/views/accelerator_table.cc Thu Mar 3 09:43:26 2016 @@ -71,7 +71,7 @@ const AcceleratorMapping kAcceleratorMap[] = { diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_app_list_linux_app_list_linux_cc b/www/iridium/patches/patch-chrome_browser_ui_views_app_list_linux_app_list_linux_cc index bb6d27c1b20..b61989492a2 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_app_list_linux_app_list_linux_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_app_list_linux_app_list_linux_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_ui_views_app_list_linux_app_list_linux_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-chrome_browser_ui_views_app_list_linux_app_list_linux_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/ui/views/app_list/linux/app_list_linux.cc.orig.port Fri Apr 8 18:02:07 2016 +++ chrome/browser/ui/views/app_list/linux/app_list_linux.cc Thu Apr 14 08:25:10 2016 @@ -91,7 +91,7 @@ void AppListLinux::MoveNearCursor(app_list::AppListVie diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc b/www/iridium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc index 09c6af8d624..5ea0fae58e9 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc,v 1.6 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc,v 1.7 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig.port Wed May 25 04:54:10 2016 +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc Thu May 26 08:09:41 2016 @@ -19,7 +19,7 @@ diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_ash_chrome_browser_main_extra_parts_ash_cc b/www/iridium/patches/patch-chrome_browser_ui_views_ash_chrome_browser_main_extra_parts_ash_cc deleted file mode 100644 index a1cbea6c6a7..00000000000 --- a/www/iridium/patches/patch-chrome_browser_ui_views_ash_chrome_browser_main_extra_parts_ash_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_views_ash_chrome_browser_main_extra_parts_ash_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc.orig.port Fri Apr 8 18:02:07 2016 -+++ chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc Thu Apr 14 08:25:10 2016 -@@ -36,7 +36,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() - if (chrome::ShouldOpenAshOnStartup()) { - chrome::OpenAsh(gfx::kNullAcceleratedWidget); - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - ash::Shell::GetInstance()->CreateShelf(); - ash::Shell::GetInstance()->ShowShelf(); - #endif diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc b/www/iridium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc index c429c6bfea9..3b924aa58e4 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc +++ b/www/iridium/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.9 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/views/chrome_views_delegate.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/views/chrome_views_delegate.cc Thu May 26 08:09:42 2016 -@@ -51,7 +51,7 @@ +$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/views/chrome_views_delegate.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/views/chrome_views_delegate.cc Wed Oct 19 12:56:00 2016 +@@ -56,7 +56,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.9 2016/05/2 #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -294,7 +294,7 @@ HICON ChromeViewsDelegate::GetSmallWindowIcon() const +@@ -305,7 +305,7 @@ HICON ChromeViewsDelegate::GetSmallWindowIcon() const return GetSmallAppIcon(); } @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.9 2016/05/2 gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); -@@ -426,7 +426,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit( +@@ -444,7 +444,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit( #endif } diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h b/www/iridium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h index 71a5e811dfe..a583fbde8b6 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h +++ b/www/iridium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.7 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.8 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/ui/views/chrome_views_delegate.h.orig.port Wed May 25 21:00:58 2016 +++ chrome/browser/ui/views/chrome_views_delegate.h Thu May 26 08:09:42 2016 @@ -37,7 +37,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_exclusive_access_bubble_views_cc b/www/iridium/patches/patch-chrome_browser_ui_views_exclusive_access_bubble_views_cc deleted file mode 100644 index d9a0ba48f38..00000000000 --- a/www/iridium/patches/patch-chrome_browser_ui_views_exclusive_access_bubble_views_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_views_exclusive_access_bubble_views_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ ---- chrome/browser/ui/views/exclusive_access_bubble_views.cc.orig.port Wed Feb 24 21:01:31 2016 -+++ chrome/browser/ui/views/exclusive_access_bubble_views.cc Thu Mar 3 09:43:26 2016 -@@ -233,7 +233,7 @@ ExclusiveAccessBubbleViews::ExclusiveAccessView::Exclu - exit_instruction_(nullptr), - browser_fullscreen_exit_accelerator_(accelerator) { - views::BubbleBorder::Shadow shadow_type = views::BubbleBorder::BIG_SHADOW; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Use a smaller shadow on Linux (including ChromeOS) as the shadow assets can - // overlap each other in a fullscreen notification bubble. - // See http://crbug.com/462983. diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_first_run_dialog_cc b/www/iridium/patches/patch-chrome_browser_ui_views_first_run_dialog_cc index b4ad94305ad..f38b7bd067c 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_first_run_dialog_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_first_run_dialog_cc @@ -1,20 +1,14 @@ -$OpenBSD: patch-chrome_browser_ui_views_first_run_dialog_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/views/first_run_dialog.cc.orig.port Wed May 25 04:54:10 2016 -+++ chrome/browser/ui/views/first_run_dialog.cc Thu May 26 08:09:42 2016 -@@ -116,12 +116,16 @@ views::View* FirstRunDialog::CreateExtraView() { +$OpenBSD: patch-chrome_browser_ui_views_first_run_dialog_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/views/first_run_dialog.cc.orig.port Wed Oct 19 13:41:02 2016 ++++ chrome/browser/ui/views/first_run_dialog.cc Wed Oct 19 13:41:14 2016 +@@ -116,8 +116,10 @@ views::View* FirstRunDialog::CreateExtraView() { bool FirstRunDialog::Accept() { GetWidget()->Hide(); +#if !defined(OS_BSD) - if (report_crashes_ && report_crashes_->checked()) { - if (GoogleUpdateSettings::SetCollectStatsConsent(true)) - breakpad::InitCrashReporter(std::string()); - } else { - GoogleUpdateSettings::SetCollectStatsConsent(false); - } -+#else -+ GoogleUpdateSettings::SetCollectStatsConsent(false); + ChangeMetricsReportingStateWithReply(report_crashes_->checked(), + base::Bind(&InitCrashReporterIfEnabled)); +#endif - if (make_default_ && make_default_->checked()) + if (make_default_->checked()) shell_integration::SetAsDefaultBrowser(); diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc b/www/iridium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc index e9ec918ee11..e8916f633ae 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.3 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig.port Wed Apr 13 22:59:41 2016 -+++ chrome/browser/ui/views/frame/browser_frame.cc Thu Apr 14 08:25:10 2016 -@@ -36,7 +36,7 @@ +$OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/views/frame/browser_frame.cc.orig.port Fri Oct 21 00:02:01 2016 ++++ chrome/browser/ui/views/frame/browser_frame.cc Tue Oct 25 22:05:02 2016 +@@ -38,11 +38,11 @@ #include "ui/native_theme/native_theme_dark_aura.h" #endif @@ -10,7 +10,12 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.3 2016/04/27 #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h" #endif -@@ -88,7 +88,7 @@ void BrowserFrame::InitBrowserFrame() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" + #endif + +@@ -104,7 +104,7 @@ void BrowserFrame::InitBrowserFrame() { non_client_view()->set_context_menu_controller(this); } @@ -19,3 +24,12 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.3 2016/04/27 browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_)); #endif } +@@ -239,7 +239,7 @@ void BrowserFrame::OnNativeWidgetActivationChanged(boo + + void BrowserFrame::OnNativeWidgetWorkspaceChanged() { + chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + BrowserList::MoveBrowsersInWorkspaceToFront( + views::X11DesktopHandler::get()->GetWorkspace()); + #endif diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc b/www/iridium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc index cc883c978f3..4135ccd2636 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/views/frame/browser_view.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/views/frame/browser_view.cc Thu May 26 08:09:42 2016 -@@ -187,7 +187,7 @@ - #include "content/public/common/mojo_shell_connection.h" +$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/views/frame/browser_view.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/views/frame/browser_view.cc Wed Oct 19 12:56:01 2016 +@@ -180,7 +180,7 @@ + #include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h" #endif -#if defined(OS_LINUX) @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.2 2016/05/28 1 #include "ui/native_theme/native_theme_dark_aura.h" #endif -@@ -1977,7 +1977,7 @@ void BrowserView::OnThemeChanged() { +@@ -1990,7 +1990,7 @@ void BrowserView::OnThemeChanged() { #if defined(OS_WIN) ui::NativeThemeDarkWin::instance()->NotifyObservers(); ui::NativeThemeWin::instance()->NotifyObservers(); diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc b/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc index e3bfa0a109a..9756ccc688a 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc Thu May 26 08:09:42 2016 -@@ -53,7 +53,7 @@ +$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc Wed Oct 19 12:56:01 2016 +@@ -38,7 +38,7 @@ #include "ui/views/window/frame_background.h" #include "ui/views/window/window_shape.h" @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.1 #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -309,7 +309,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt +@@ -293,7 +293,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source, const gfx::Point& point, const ui::Event* event) { diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc b/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc index 678c1246912..deee2265430 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig.port Fri Apr 8 18:02:08 2016 -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc Thu Apr 14 08:25:10 2016 -@@ -20,7 +20,7 @@ namespace { +$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc Wed Oct 19 12:56:01 2016 +@@ -21,7 +21,7 @@ namespace { const int kCaptionButtonHeight = 18; diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_platform_specific_cc b/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_platform_specific_cc index a16451b0bcc..59f1b00ec60 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_platform_specific_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_platform_specific_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_platform_specific_cc,v 1.1 2015/05/26 17:37:40 robert Exp $ +$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_platform_specific_cc,v 1.2 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig.port Sat May 23 00:59:48 2015 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc Sat May 23 01:06:09 2015 @@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpecific::IsUsingSy diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc b/www/iridium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc index 5c36844e431..15352dca9c9 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc,v 1.6 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc,v 1.7 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig.port Wed May 25 04:54:10 2016 +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc Thu May 26 08:09:42 2016 @@ -85,7 +85,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_delegate_cc b/www/iridium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_delegate_cc new file mode 100644 index 00000000000..d4b3bc7389d --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_delegate_cc @@ -0,0 +1,21 @@ +$OpenBSD: patch-chrome_browser_ui_views_frame_system_menu_model_delegate_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig.port Tue Oct 25 21:56:43 2016 ++++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc Tue Oct 25 22:05:10 2016 +@@ -13,7 +13,7 @@ + #include "components/sessions/core/tab_restore_service.h" + #include "ui/base/l10n/l10n_util.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + #include "chrome/common/pref_names.h" + #include "components/prefs/pref_service.h" + #endif +@@ -29,7 +29,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() { + } + + bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { + PrefService* prefs = browser_->profile()->GetPrefs(); + return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc b/www/iridium/patches/patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc index 048a089adaf..deefa88850b 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc,v 1.4 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ --- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig.port Wed Feb 24 00:01:59 2016 +++ chrome/browser/ui/views/message_center/message_center_frame_view.cc Thu Mar 3 09:43:26 2016 @@ -15,7 +15,7 @@ diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_panels_panel_frame_view_cc b/www/iridium/patches/patch-chrome_browser_ui_views_panels_panel_frame_view_cc deleted file mode 100644 index d74c6729319..00000000000 --- a/www/iridium/patches/patch-chrome_browser_ui_views_panels_panel_frame_view_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_views_panels_panel_frame_view_cc,v 1.6 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/views/panels/panel_frame_view.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/views/panels/panel_frame_view.cc Thu May 26 08:09:42 2016 -@@ -588,7 +588,7 @@ bool PanelFrameView::OnMousePressed(const ui::MouseEve - } - - bool PanelFrameView::OnMouseDragged(const ui::MouseEvent& event) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // Converting the mouse location to screen coordinates returns an incorrect - // location while the panel is moving. See crbug.com/353393 for more details. - // TODO(pkotwicz): Fix conversion to screen coordinates diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc b/www/iridium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc index 9bdc3d0358d..824528f4140 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc Thu May 26 08:09:42 2016 -@@ -269,7 +269,7 @@ void TabDragController::Init( +$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/views/tabs/tab_drag_controller.cc Wed Oct 19 12:56:01 2016 +@@ -281,7 +281,7 @@ void TabDragController::Init( // synchronous on desktop Linux, so use that. // - Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.9 2016/0 can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); -@@ -627,7 +627,7 @@ TabDragController::DragBrowserToNewTabStrip( +@@ -631,7 +631,7 @@ TabDragController::DragBrowserToNewTabStrip( // that to effect the position of any windows. SetWindowPositionManaged(browser_widget->GetNativeWindow(), false); @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.9 2016/0 // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1817,7 +1817,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -1830,7 +1830,7 @@ TabDragController::Liveness TabDragController::GetLoca if (dragged_window) exclude.insert(dragged_window); } diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc b/www/iridium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc index 955ff5ad15b..6cfc104d152 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc +++ b/www/iridium/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 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/views/tabs/tab_strip.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/views/tabs/tab_strip.cc Thu May 26 08:09:42 2016 -@@ -331,7 +331,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views: +$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_cc,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/views/tabs/tab_strip.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/views/tabs/tab_strip.cc Wed Oct 19 12:56:01 2016 +@@ -323,7 +323,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views: : views::ImageButton(listener), tab_strip_(tab_strip), destroyed_(NULL) { diff --git a/www/iridium/patches/patch-chrome_browser_ui_views_task_manager_view_cc b/www/iridium/patches/patch-chrome_browser_ui_views_task_manager_view_cc deleted file mode 100644 index ec302cbd504..00000000000 --- a/www/iridium/patches/patch-chrome_browser_ui_views_task_manager_view_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_views_task_manager_view_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/views/task_manager_view.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/views/task_manager_view.cc Thu May 26 08:09:42 2016 -@@ -330,7 +330,7 @@ void TaskManagerView::Init() { - columns_.back().sortable = true; - columns_.back().initial_sort_is_ascending = false; - // TODO(port) http://crbug.com/120488 for non-Linux. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, - ui::TableColumn::RIGHT, -1, 0)); - columns_.back().sortable = true; diff --git a/www/iridium/patches/patch-chrome_browser_ui_webui_about_ui_cc b/www/iridium/patches/patch-chrome_browser_ui_webui_about_ui_cc index 498faffef37..55820df99bc 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_webui_about_ui_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_webui_about_ui_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/webui/about_ui.cc.orig.port Wed May 25 04:54:10 2016 -+++ chrome/browser/ui/webui/about_ui.cc Thu May 26 08:09:42 2016 -@@ -73,7 +73,7 @@ +$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/webui/about_ui.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/webui/about_ui.cc Wed Oct 19 12:56:01 2016 +@@ -75,7 +75,7 @@ #include "chrome/browser/ui/webui/theme_source.h" #endif @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.9 2016/05/28 14:49:39 ro #include "content/public/browser/zygote_host_linux.h" #include "content/public/common/sandbox_linux.h" #endif -@@ -642,7 +642,7 @@ class AboutDnsHandler : public base::RefCountedThreadS +@@ -644,7 +644,7 @@ class AboutDnsHandler : public base::RefCountedThreadS DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler); }; @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.9 2016/05/28 14:49:39 ro std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -658,6 +658,7 @@ std::string AboutLinuxProxyConfig() { +@@ -660,6 +660,7 @@ std::string AboutLinuxProxyConfig() { return data; } @@ -27,15 +27,15 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.9 2016/05/28 14:49:39 ro void AboutSandboxRow(std::string* data, int name_id, bool good) { data->append(""); data->append(l10n_util::GetStringUTF8(name_id)); -@@ -759,6 +760,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -761,6 +762,7 @@ void AboutUIHTMLSource::StartDataRequest( else if (path == kKeyboardUtilsPath) idr = IDR_KEYBOARD_UTILS_JS; #endif +#endif - response = ResourceBundle::GetSharedInstance().GetRawDataResource( - idr).as_string(); -@@ -769,7 +771,7 @@ void AboutUIHTMLSource::StartDataRequest( + base::StringPiece raw_response = + ResourceBundle::GetSharedInstance().GetRawDataResource(idr); +@@ -788,7 +790,7 @@ void AboutUIHTMLSource::StartDataRequest( } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; @@ -44,7 +44,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.9 2016/05/28 14:49:39 ro } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif -@@ -778,7 +780,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -797,7 +799,7 @@ void AboutUIHTMLSource::StartDataRequest( ChromeOSCreditsHandler::Start(path, callback); return; #endif diff --git a/www/iridium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc b/www/iridium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc index 321fc443c69..59b2c017a5f 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc +++ b/www/iridium/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.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc Thu May 26 08:09:42 2016 -@@ -510,7 +510,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig.port Thu Sep 1 00:03:28 2016 ++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc Thu Sep 1 11:12:21 2016 +@@ -546,7 +546,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host() == chrome::kChromeUINaClHost) return &NewWebUI; #endif diff --git a/www/iridium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc b/www/iridium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc index ce678fe7920..8df90056798 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc +++ b/www/iridium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/browser/ui/webui/options/browser_options_handler.cc Thu May 26 08:09:42 2016 -@@ -507,7 +507,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D +$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/webui/options/browser_options_handler.cc Wed Oct 19 12:56:01 2016 +@@ -540,7 +540,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, #endif // defined(OS_CHROMEOS) @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.1 { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, -@@ -754,7 +754,7 @@ void BrowserOptionsHandler::RegisterMessages() { +@@ -797,7 +797,7 @@ void BrowserOptionsHandler::RegisterMessages() { "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); @@ -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, -@@ -1391,7 +1391,7 @@ void BrowserOptionsHandler::ObserveThemeChanged() { +@@ -1443,7 +1443,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 && -@@ -1413,7 +1413,7 @@ void BrowserOptionsHandler::ThemesReset(const base::Li +@@ -1465,7 +1465,7 @@ void BrowserOptionsHandler::ThemesReset(const base::Li ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } diff --git a/www/iridium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_h b/www/iridium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_h index 20c37da68e9..824a9f18871 100644 --- a/www/iridium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_h +++ b/www/iridium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_h,v 1.7 2016/05/28 14:49:39 robert Exp $ ---- chrome/browser/ui/webui/options/browser_options_handler.h.orig.port Wed May 25 04:54:10 2016 -+++ chrome/browser/ui/webui/options/browser_options_handler.h Thu May 26 08:09:42 2016 -@@ -203,7 +203,8 @@ class BrowserOptionsHandler +$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_h,v 1.8 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/webui/options/browser_options_handler.h.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/ui/webui/options/browser_options_handler.h Wed Oct 19 12:56:01 2016 +@@ -206,7 +206,8 @@ class BrowserOptionsHandler void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); diff --git a/www/iridium/patches/patch-chrome_browser_ui_webui_settings_md_settings_localized_strings_provider_cc b/www/iridium/patches/patch-chrome_browser_ui_webui_settings_md_settings_localized_strings_provider_cc new file mode 100644 index 00000000000..5a3398bb20f --- /dev/null +++ b/www/iridium/patches/patch-chrome_browser_ui_webui_settings_md_settings_localized_strings_provider_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_browser_ui_webui_settings_md_settings_localized_strings_provider_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig.port Tue Oct 25 21:56:43 2016 ++++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc Tue Oct 25 22:05:34 2016 +@@ -265,7 +265,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, + {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, + #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, + #endif + }; diff --git a/www/iridium/patches/patch-chrome_browser_web_applications_web_app_cc b/www/iridium/patches/patch-chrome_browser_web_applications_web_app_cc index aed085d2b0f..a742e2474f8 100644 --- a/www/iridium/patches/patch-chrome_browser_web_applications_web_app_cc +++ b/www/iridium/patches/patch-chrome_browser_web_applications_web_app_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.7 2016/03/23 20:13:07 robert Exp $ ---- chrome/browser/web_applications/web_app.cc.orig.port Wed Feb 24 21:01:32 2016 -+++ chrome/browser/web_applications/web_app.cc Wed Mar 23 12:37:29 2016 +$OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.8 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/web_applications/web_app.cc.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/web_applications/web_app.cc Wed Oct 19 12:56:01 2016 @@ -58,7 +58,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.7 2016/03/23 20:1 // 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}; -@@ -514,7 +514,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info, +@@ -507,7 +507,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info, } #endif diff --git a/www/iridium/patches/patch-chrome_browser_web_applications_web_app_h b/www/iridium/patches/patch-chrome_browser_web_applications_web_app_h index e6f3f954f18..4133dedb336 100644 --- a/www/iridium/patches/patch-chrome_browser_web_applications_web_app_h +++ b/www/iridium/patches/patch-chrome_browser_web_applications_web_app_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_web_applications_web_app_h,v 1.6 2016/03/23 20:13:07 robert Exp $ ---- chrome/browser/web_applications/web_app.h.orig.port Wed Feb 24 00:01:59 2016 -+++ chrome/browser/web_applications/web_app.h Thu Mar 3 09:43:26 2016 -@@ -227,7 +227,7 @@ typedef std::vector Icon +$OpenBSD: patch-chrome_browser_web_applications_web_app_h,v 1.7 2016/10/27 18:30:41 robert Exp $ +--- chrome/browser/web_applications/web_app.h.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/browser/web_applications/web_app.h Wed Oct 19 12:56:01 2016 +@@ -224,7 +224,7 @@ typedef std::vector Icon void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); #endif diff --git a/www/iridium/patches/patch-chrome_chrome_browser_extensions_gypi b/www/iridium/patches/patch-chrome_chrome_browser_extensions_gypi deleted file mode 100644 index 42595a685f3..00000000000 --- a/www/iridium/patches/patch-chrome_chrome_browser_extensions_gypi +++ /dev/null @@ -1,24 +0,0 @@ -$OpenBSD: patch-chrome_chrome_browser_extensions_gypi,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/chrome_browser_extensions.gypi.orig.port Thu May 26 08:24:00 2016 -+++ chrome/chrome_browser_extensions.gypi Thu May 26 08:25:06 2016 -@@ -1014,6 +1014,11 @@ - '<@(chrome_browser_extensions_enabled_sources)', - ], - 'conditions': [ -+ ['os_bsd==1', { -+ 'sources/': [ -+ ['exclude', '^browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc'], -+ ], -+ }], - ['enable_task_manager==1', { - 'sources': [ - '<@(chrome_browser_extensions_task_manager_enabled_sources)', -@@ -1061,7 +1066,7 @@ - '../ui/views/views.gyp:views', - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['use_aura==1', { - 'dependencies': [ diff --git a/www/iridium/patches/patch-chrome_chrome_browser_gypi b/www/iridium/patches/patch-chrome_chrome_browser_gypi deleted file mode 100644 index 43b179064ba..00000000000 --- a/www/iridium/patches/patch-chrome_chrome_browser_gypi +++ /dev/null @@ -1,52 +0,0 @@ -$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.12 2016/05/28 14:49:39 robert Exp $ ---- chrome/chrome_browser.gypi.orig.port Wed May 25 21:00:58 2016 -+++ chrome/chrome_browser.gypi Thu May 26 08:09:42 2016 -@@ -3590,7 +3590,7 @@ - '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', - ], - }], -- ['OS=="linux" and chromeos==0', { -+ ['OS=="linux" and chromeos==0 or os_bsd==1', { - 'dependencies': [ - '../build/linux/system.gyp:libspeechd', - ], -@@ -3654,7 +3654,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', -@@ -3786,6 +3786,12 @@ - }], - ], - }], -+ ['os_bsd==1', { -+ 'sources/': [ -+ ['exclude', '^browser/media_galleries/linux/'], -+ ['exclude', '^browser/memory/system_memory_stats_recorder_linux.cc'], -+ ], -+ }], - ['OS=="mac"', { - 'dependencies': [ - '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', -@@ -3902,7 +3908,7 @@ - }], - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['use_aura==1', { - 'dependencies': [ -@@ -3921,7 +3927,7 @@ - }], - ], - }], -- ['OS=="linux" or OS=="win"', { -+ ['OS=="linux" or OS=="win" or os_bsd==1', { - 'sources': [ '<@(chrome_browser_non_mac_desktop_sources)' ], - }], - ['desktop_linux==1', { diff --git a/www/iridium/patches/patch-chrome_chrome_browser_ui_gypi b/www/iridium/patches/patch-chrome_chrome_browser_ui_gypi deleted file mode 100644 index 211a6421d96..00000000000 --- a/www/iridium/patches/patch-chrome_chrome_browser_ui_gypi +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/chrome_browser_ui.gypi.orig.port Wed May 25 21:00:58 2016 -+++ chrome/chrome_browser_ui.gypi Thu May 26 08:09:42 2016 -@@ -3097,7 +3097,7 @@ - }], - ], - }], -- ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', { -+ ['use_aura==1 and chromeos==0 and use_ozone==0 and (OS=="linux" or OS=="openbsd")', { - 'dependencies': [ - # gtk2 is the only component that can interact with gtk2 in our new - # world. -@@ -3282,7 +3282,7 @@ - ], - 'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ], - }], -- ['OS=="linux"', { # Both desktop Linux and ChromeOS. -+ ['OS=="linux" or OS=="openbsd"', { # Both desktop Linux and ChromeOS. - 'sources': [ '<@(chrome_browser_ui_linux_sources)' ], - 'conditions': [ - ['use_aura==1', { diff --git a/www/iridium/patches/patch-chrome_chrome_common_gypi b/www/iridium/patches/patch-chrome_chrome_common_gypi deleted file mode 100644 index 57bce9b1d9f..00000000000 --- a/www/iridium/patches/patch-chrome_chrome_common_gypi +++ /dev/null @@ -1,32 +0,0 @@ -$OpenBSD: patch-chrome_chrome_common_gypi,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- chrome/chrome_common.gypi.orig.port Wed May 25 21:00:58 2016 -+++ chrome/chrome_common.gypi Thu May 26 08:09:42 2016 -@@ -382,7 +382,7 @@ - ['chromeos==1', { - 'sources': [ '<@(chrome_common_extensions_chromeos_sources)' ], - }], -- ['OS=="win" or OS=="linux"', { -+ ['OS=="win" or OS=="linux" or os_bsd==1', { - 'sources': [ - 'common/extensions/api/input_ime/input_components_handler.cc', - 'common/extensions/api/input_ime/input_components_handler.h', -@@ -402,6 +402,11 @@ - '../third_party/boringssl/boringssl.gyp:boringssl', - ], - }], -+ ['OS=="openbsd"', { -+ 'sources/': [ -+ ['exclude', '^common/component_flash_hint_file_linux.cc'], -+ ], -+ }], - ['OS != "ios"', { - 'dependencies': [ - 'common_mojo_bindings', -@@ -538,6 +543,7 @@ - }], - ['safe_browsing==1', { - 'sources': [ '<@(chrome_common_full_safe_browsing_sources)', ], -+ 'dependencies': [ 'safe_browsing_proto' ], - }], - ], - 'target_conditions': [ diff --git a/www/iridium/patches/patch-chrome_chrome_exe_gypi b/www/iridium/patches/patch-chrome_chrome_exe_gypi deleted file mode 100644 index 047e3cf950b..00000000000 --- a/www/iridium/patches/patch-chrome_chrome_exe_gypi +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_chrome_exe_gypi,v 1.8 2016/04/27 12:46:16 robert Exp $ ---- chrome/chrome_exe.gypi.orig.port Tue Apr 26 16:20:08 2016 -+++ chrome/chrome_exe.gypi Wed Apr 27 11:11:17 2016 -@@ -190,7 +190,7 @@ - '../build/linux/system.gyp:xext', - ], - }], -- ['OS=="linux" and enable_plugins==1', { -+ ['(OS=="openbsd" or OS=="linux") and enable_plugins==1', { - 'dependencies': [ - '../pdf/pdf.gyp:pdf', - ], diff --git a/www/iridium/patches/patch-chrome_chrome_utility_gypi b/www/iridium/patches/patch-chrome_chrome_utility_gypi deleted file mode 100644 index 7a06ce14657..00000000000 --- a/www/iridium/patches/patch-chrome_chrome_utility_gypi +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-chrome_chrome_utility_gypi,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- chrome/chrome_utility.gypi.orig.port Wed May 25 21:00:58 2016 -+++ chrome/chrome_utility.gypi Thu May 26 08:09:42 2016 -@@ -111,6 +111,7 @@ - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'dependencies': [ - '../base/base.gyp:base', -+ '../chrome/chrome.gyp:safe_browsing_proto', - '../components/components_strings.gyp:components_strings', - '../components/components.gyp:safe_json_parser_message_filter', - '../components/components.gyp:search_engines', diff --git a/www/iridium/patches/patch-chrome_common_BUILD_gn b/www/iridium/patches/patch-chrome_common_BUILD_gn new file mode 100644 index 00000000000..e8281bf0526 --- /dev/null +++ b/www/iridium/patches/patch-chrome_common_BUILD_gn @@ -0,0 +1,14 @@ +$OpenBSD: patch-chrome_common_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/BUILD.gn.orig.port Wed Oct 12 21:02:55 2016 ++++ chrome/common/BUILD.gn Wed Oct 19 12:56:02 2016 +@@ -118,6 +118,10 @@ static_library("common") { + public_deps += [ "//ppapi/shared_impl" ] + } + ++ if (is_openbsd) { ++ sources -= [ "component_flash_hint_file_linux.cc" ] ++ } ++ + if (is_ios) { + sources += [ + # Use this Mac file that was filtered out. diff --git a/www/iridium/patches/patch-chrome_common_chrome_paths_cc b/www/iridium/patches/patch-chrome_common_chrome_paths_cc index 41a3668fb9f..144547cc53f 100644 --- a/www/iridium/patches/patch-chrome_common_chrome_paths_cc +++ b/www/iridium/patches/patch-chrome_common_chrome_paths_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- chrome/common/chrome_paths.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/common/chrome_paths.cc Thu May 26 08:09:42 2016 -@@ -170,7 +170,7 @@ bool PathProvider(int key, base::FilePath* result) { +$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.9 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/chrome_paths.cc.orig.port Thu Sep 1 00:03:28 2016 ++++ chrome/common/chrome_paths.cc Thu Sep 1 11:12:21 2016 +@@ -190,7 +190,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.8 2016/05/28 14:49:39 robert E if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -400,7 +400,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -424,7 +424,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #endif #if defined(ENABLE_SUPERVISED_USERS) @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.8 2016/05/28 14:49:39 robert E case chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS: if (!PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, &cur)) return false; -@@ -448,7 +448,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -472,7 +472,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/iridium/patches/patch-chrome_common_chrome_paths_h b/www/iridium/patches/patch-chrome_common_chrome_paths_h index 7b8bd5d53c0..8ae08e6c7a1 100644 --- a/www/iridium/patches/patch-chrome_common_chrome_paths_h +++ b/www/iridium/patches/patch-chrome_common_chrome_paths_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- chrome/common/chrome_paths.h.orig.port Wed May 25 21:00:58 2016 -+++ chrome/common/chrome_paths.h Thu May 26 08:09:42 2016 -@@ -47,7 +47,7 @@ enum { +$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/chrome_paths.h.orig.port Wed Jul 20 21:03:21 2016 ++++ chrome/common/chrome_paths.h Thu Jul 21 10:25:29 2016 +@@ -49,7 +49,7 @@ enum { // contains subdirectories. #endif #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_chrome_paths_h,v 1.9 2016/05/28 14:49:39 robert Ex DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. // On Chrome OS, this path is used for OEM -@@ -55,7 +55,7 @@ enum { +@@ -57,7 +57,7 @@ enum { // create it. #endif @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_common_chrome_paths_h,v 1.9 2016/05/28 14:49:39 robert Ex DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -109,7 +109,7 @@ enum { +@@ -111,7 +111,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. diff --git a/www/iridium/patches/patch-chrome_common_chrome_paths_internal_h b/www/iridium/patches/patch-chrome_common_chrome_paths_internal_h index 95b02f52769..07c4c1816e2 100644 --- a/www/iridium/patches/patch-chrome_common_chrome_paths_internal_h +++ b/www/iridium/patches/patch-chrome_common_chrome_paths_internal_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_common_chrome_paths_internal_h,v 1.1 2015/05/26 17:37:40 robert Exp $ +$OpenBSD: patch-chrome_common_chrome_paths_internal_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- chrome/common/chrome_paths_internal.h.orig.port Sat May 23 00:59:48 2015 +++ chrome/common/chrome_paths_internal.h Sat May 23 01:07:58 2015 @@ -39,7 +39,7 @@ void GetUserCacheDirectory(const base::FilePath& profi diff --git a/www/iridium/patches/patch-chrome_common_chrome_switches_cc b/www/iridium/patches/patch-chrome_common_chrome_switches_cc index ca1131b372b..99f5b042095 100644 --- a/www/iridium/patches/patch-chrome_common_chrome_switches_cc +++ b/www/iridium/patches/patch-chrome_common_chrome_switches_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- chrome/common/chrome_switches.cc.orig.port Sat May 28 10:27:09 2016 -+++ chrome/common/chrome_switches.cc Sat May 28 10:27:25 2016 -@@ -1298,7 +1298,7 @@ const char kTabManagementExperimentTypeElderberry[] = - "tab-management-experiment-type-elderberry"; - #endif // defined(OS_ANDROID) +$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.12 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/chrome_switches.cc.orig.port Wed Oct 19 13:42:00 2016 ++++ chrome/common/chrome_switches.cc Wed Oct 19 13:42:17 2016 +@@ -1277,7 +1277,7 @@ const char kAllowNaClSocketAPI[] = "allow-n + const char kEnableWaylandServer[] = "enable-wayland-server"; + #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - extern const char kEnableInputImeAPI[] = "enable-input-ime-api"; extern const char kDisableInputImeAPI[] = "disable-input-ime-api"; + extern const char kEnableInputImeAPI[] = "enable-input-ime-api"; #endif diff --git a/www/iridium/patches/patch-chrome_common_chrome_switches_h b/www/iridium/patches/patch-chrome_common_chrome_switches_h index a3b57372fb5..f1520e32905 100644 --- a/www/iridium/patches/patch-chrome_common_chrome_switches_h +++ b/www/iridium/patches/patch-chrome_common_chrome_switches_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- chrome/common/chrome_switches.h.orig.port Sat May 28 10:27:41 2016 -+++ chrome/common/chrome_switches.h Sat May 28 10:27:50 2016 -@@ -387,7 +387,7 @@ extern const char kDisableNewTaskManager[]; +$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.12 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/chrome_switches.h.orig.port Wed Oct 19 13:42:31 2016 ++++ chrome/common/chrome_switches.h Wed Oct 19 13:42:37 2016 +@@ -378,7 +378,7 @@ extern const char kAllowNaClSocketAPI[]; extern const char kEnableWaylandServer[]; #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - extern const char kEnableInputImeAPI[]; extern const char kDisableInputImeAPI[]; + extern const char kEnableInputImeAPI[]; #endif diff --git a/www/iridium/patches/patch-chrome_common_extensions_api_schemas_gypi b/www/iridium/patches/patch-chrome_common_extensions_api_schemas_gypi deleted file mode 100644 index f902c74e772..00000000000 --- a/www/iridium/patches/patch-chrome_common_extensions_api_schemas_gypi +++ /dev/null @@ -1,24 +0,0 @@ -$OpenBSD: patch-chrome_common_extensions_api_schemas_gypi,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/common/extensions/api/schemas.gypi.orig.port Wed May 25 21:00:58 2016 -+++ chrome/common/extensions/api/schemas.gypi Thu May 26 08:09:42 2016 -@@ -184,7 +184,7 @@ - ], - }, { # chromeos==0 - 'conditions': [ -- ['OS=="linux" or OS=="win"', { -+ ['OS=="linux" or OS=="win" or os_bsd==1', { - 'schema_files': [ - '<@(input_ime_schema_file)', - ], -@@ -199,6 +199,11 @@ - ['enable_webrtc==1', { - 'schema_files': [ - '<@(webrtc_schema_files)', -+ ], -+ }], -+ ['enable_webrtc==0', { -+ 'schema_files': [ -+ 'webrtc_logging_private.idl', - ], - }], - ], diff --git a/www/iridium/patches/patch-chrome_common_extensions_chrome_extensions_client_cc b/www/iridium/patches/patch-chrome_common_extensions_chrome_extensions_client_cc new file mode 100644 index 00000000000..6a003fc024d --- /dev/null +++ b/www/iridium/patches/patch-chrome_common_extensions_chrome_extensions_client_cc @@ -0,0 +1,15 @@ +$OpenBSD: patch-chrome_common_extensions_chrome_extensions_client_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/extensions/chrome_extensions_client.cc.orig.port Sat Oct 22 16:33:03 2016 ++++ chrome/common/extensions/chrome_extensions_client.cc Sun Oct 23 11:16:48 2016 +@@ -103,7 +103,10 @@ ChromeChannelForHistogram GetChromeChannelForHistogram + static base::LazyInstance g_client = + LAZY_INSTANCE_INITIALIZER; + +-ChromeExtensionsClient::ChromeExtensionsClient() {} ++ChromeExtensionsClient::ChromeExtensionsClient() ++ : chrome_api_permissions_(ChromeAPIPermissions()), ++ extensions_api_permissions_(ExtensionsAPIPermissions()) { ++} + + ChromeExtensionsClient::~ChromeExtensionsClient() { + } diff --git a/www/iridium/patches/patch-chrome_common_extensions_command_cc b/www/iridium/patches/patch-chrome_common_extensions_command_cc index c86734aa832..b043693c774 100644 --- a/www/iridium/patches/patch-chrome_common_extensions_command_cc +++ b/www/iridium/patches/patch-chrome_common_extensions_command_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_extensions_command_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- chrome/common/extensions/command.cc.orig.port Fri Apr 8 18:02:08 2016 -+++ chrome/common/extensions/command.cc Thu Apr 14 08:25:10 2016 -@@ -306,7 +306,7 @@ std::string Command::CommandPlatform() { +$OpenBSD: patch-chrome_common_extensions_command_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/extensions/command.cc.orig.port Wed Jul 20 21:03:21 2016 ++++ chrome/common/extensions/command.cc Thu Jul 21 10:25:29 2016 +@@ -304,7 +304,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif defined(OS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/iridium/patches/patch-chrome_common_pref_names_cc b/www/iridium/patches/patch-chrome_common_pref_names_cc index 80442bbb1dd..6c1537f453e 100644 --- a/www/iridium/patches/patch-chrome_common_pref_names_cc +++ b/www/iridium/patches/patch-chrome_common_pref_names_cc @@ -1,16 +1,25 @@ -$OpenBSD: patch-chrome_common_pref_names_cc,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/common/pref_names.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/common/pref_names.cc Sat May 28 10:25:27 2016 -@@ -908,7 +908,7 @@ const char kForceYouTubeSafetyMode[] = "settings.force - // supervised users. - const char kRecordHistory[] = "settings.history_recorded"; +$OpenBSD: patch-chrome_common_pref_names_cc,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/pref_names.cc.orig.port Fri Oct 21 00:02:01 2016 ++++ chrome/common/pref_names.cc Sat Oct 22 15:49:46 2016 +@@ -952,7 +952,7 @@ const char kForceSessionSync[] = "settings.history_rec + // only using an account that belongs to one of the domains from this pref. + const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1373,7 +1373,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1035,7 +1035,7 @@ const char kShowUpdatePromotionInfoBar[] = + "browser.show_update_promotion_info_bar"; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + // Boolean that is false if we should show window manager decorations. If + // true, we draw a custom chrome frame (thicker title bar and blue border). + const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; +@@ -1408,7 +1408,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; diff --git a/www/iridium/patches/patch-chrome_common_pref_names_h b/www/iridium/patches/patch-chrome_common_pref_names_h index 61883e2e022..b3c751aec80 100644 --- a/www/iridium/patches/patch-chrome_common_pref_names_h +++ b/www/iridium/patches/patch-chrome_common_pref_names_h @@ -1,16 +1,25 @@ -$OpenBSD: patch-chrome_common_pref_names_h,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- chrome/common/pref_names.h.orig.port Sat May 28 10:27:55 2016 -+++ chrome/common/pref_names.h Sat May 28 10:28:13 2016 -@@ -307,7 +307,7 @@ extern const char kRecordHistory[]; - extern const char kDeleteTimePeriod[]; +$OpenBSD: patch-chrome_common_pref_names_h,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/pref_names.h.orig.port Fri Oct 21 00:02:01 2016 ++++ chrome/common/pref_names.h Sat Oct 22 15:49:33 2016 +@@ -315,7 +315,7 @@ extern const char kForceSessionSync[]; + extern const char kAllowedDomainsForApps[]; extern const char kLastClearBrowsingDataTime[]; extern const char kClearBrowsingDataHistoryNoticeShownTimes[]; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -477,7 +477,7 @@ extern const char kAppWindowPlacement[]; +@@ -347,7 +347,7 @@ extern const char kDefaultBrowserSettingEnabled[]; + #if defined(OS_MACOSX) + extern const char kShowUpdatePromotionInfoBar[]; + #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + extern const char kUseCustomChromeFrame[]; + #endif + extern const char kBackShortcutBubbleShownCount[]; +@@ -496,7 +496,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; diff --git a/www/iridium/patches/patch-chrome_common_url_constants_cc b/www/iridium/patches/patch-chrome_common_url_constants_cc index 98e6466c369..1dce8151c9c 100644 --- a/www/iridium/patches/patch-chrome_common_url_constants_cc +++ b/www/iridium/patches/patch-chrome_common_url_constants_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_url_constants_cc,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- chrome/common/url_constants.cc.orig.port Wed May 25 21:00:58 2016 -+++ chrome/common/url_constants.cc Thu May 26 08:09:43 2016 -@@ -130,7 +130,7 @@ const char kChromeUIUserImageURL[] = "chrome://userima +$OpenBSD: patch-chrome_common_url_constants_cc,v 1.9 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/url_constants.cc.orig.port Wed Oct 12 21:02:56 2016 ++++ chrome/common/url_constants.cc Wed Oct 19 12:56:02 2016 +@@ -131,7 +131,7 @@ const char kChromeUIUserImageURL[] = "chrome://userima const char kChromeUIMetroFlowURL[] = "chrome://make-metro/"; #endif @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_url_constants_cc,v 1.8 2016/05/28 14:49:39 robert const char kChromeUITabModalConfirmDialogURL[] = "chrome://tab-modal-confirm-dialog/"; #endif -@@ -314,7 +314,7 @@ const char kChromeOSAssetPath[] = "/usr/share/chromeos +@@ -316,7 +316,7 @@ const char kChromeOSAssetPath[] = "/usr/share/chromeos const char kChromeUIMetroFlowHost[] = "make-metro"; #endif diff --git a/www/iridium/patches/patch-chrome_common_url_constants_h b/www/iridium/patches/patch-chrome_common_url_constants_h index f511c574a5e..c84b443bf9f 100644 --- a/www/iridium/patches/patch-chrome_common_url_constants_h +++ b/www/iridium/patches/patch-chrome_common_url_constants_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_url_constants_h,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- chrome/common/url_constants.h.orig.port Wed May 25 21:00:58 2016 -+++ chrome/common/url_constants.h Thu May 26 08:09:43 2016 -@@ -120,7 +120,7 @@ extern const char kChromeUIUserImageURL[]; +$OpenBSD: patch-chrome_common_url_constants_h,v 1.9 2016/10/27 18:30:41 robert Exp $ +--- chrome/common/url_constants.h.orig.port Wed Oct 12 21:02:56 2016 ++++ chrome/common/url_constants.h Wed Oct 19 12:56:02 2016 +@@ -121,7 +121,7 @@ extern const char kChromeUIUserImageURL[]; extern const char kChromeUIMetroFlowURL[]; #endif @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_url_constants_h,v 1.8 2016/05/28 14:49:39 robert E extern const char kChromeUITabModalConfirmDialogURL[]; #endif -@@ -295,7 +295,7 @@ extern const char kChromeOSAssetPath[]; +@@ -297,7 +297,7 @@ extern const char kChromeOSAssetPath[]; extern const char kChromeUIMetroFlowHost[]; #endif diff --git a/www/iridium/patches/patch-chrome_common_variations_fieldtrial_testing_config_gyp b/www/iridium/patches/patch-chrome_common_variations_fieldtrial_testing_config_gyp deleted file mode 100644 index 1112bd61640..00000000000 --- a/www/iridium/patches/patch-chrome_common_variations_fieldtrial_testing_config_gyp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_common_variations_fieldtrial_testing_config_gyp,v 1.1 2015/10/24 18:22:21 robert Exp $ ---- chrome/common/variations/fieldtrial_testing_config.gyp.orig.port Wed Oct 14 17:21:45 2015 -+++ chrome/common/variations/fieldtrial_testing_config.gyp Wed Oct 14 17:21:57 2015 -@@ -19,7 +19,7 @@ - 'conditions': [ - ['OS!="android"', {'sources/': [['exclude', '_android\\.json$']]}], - ['OS!="win"', {'sources/': [['exclude', '_win\\.json$']]}], -- ['OS!="linux" or chromeos==1', {'sources/': [['exclude', '_linux\\.json$']]}], -+ ['(OS!="linux" and OS!="openbsd") or chromeos==1', {'sources/': [['exclude', '_linux\\.json$']]}], - ['OS!="mac"', {'sources/': [['exclude', '_mac\\.json$']]}], - ['chromeos!=1', {'sources/': [['exclude', '_chromeos\\.json$']]}], - ['OS!="ios"', {'sources/': [['exclude', '_ios\\.json$']]}], diff --git a/www/iridium/patches/patch-chrome_policy_templates_gypi b/www/iridium/patches/patch-chrome_policy_templates_gypi deleted file mode 100644 index 026725345a3..00000000000 --- a/www/iridium/patches/patch-chrome_policy_templates_gypi +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_policy_templates_gypi,v 1.1 2015/12/17 07:02:48 robert Exp $ ---- chrome/policy_templates.gypi.orig.port Sat Dec 12 13:56:36 2015 -+++ chrome/policy_templates.gypi Sat Dec 12 14:04:08 2015 -@@ -8,7 +8,7 @@ - 'target_name': 'pack_policy_templates', - 'type': 'none', - 'conditions': [ -- ['OS=="win" or OS=="mac" or OS=="linux"', { -+ ['OS=="win" or OS=="mac" or OS=="linux" or os_bsd==1', { - 'dependencies': [ - '../components/components.gyp:policy_templates', - ], diff --git a/www/iridium/patches/patch-chromecast_browser_cast_browser_main_parts_cc b/www/iridium/patches/patch-chromecast_browser_cast_browser_main_parts_cc index 6fc55e96c9d..8b64ce63ef4 100644 --- a/www/iridium/patches/patch-chromecast_browser_cast_browser_main_parts_cc +++ b/www/iridium/patches/patch-chromecast_browser_cast_browser_main_parts_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chromecast_browser_cast_browser_main_parts_cc,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- chromecast/browser/cast_browser_main_parts.cc.orig.port Wed May 25 21:00:59 2016 -+++ chromecast/browser/cast_browser_main_parts.cc Thu May 26 08:09:44 2016 -@@ -60,7 +60,7 @@ +$OpenBSD: patch-chromecast_browser_cast_browser_main_parts_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- chromecast/browser/cast_browser_main_parts.cc.orig.port Wed Oct 12 21:02:57 2016 ++++ chromecast/browser/cast_browser_main_parts.cc Wed Oct 19 12:56:02 2016 +@@ -66,7 +66,7 @@ #include #include #endif @@ -10,16 +10,16 @@ $OpenBSD: patch-chromecast_browser_cast_browser_main_parts_cc,v 1.4 2016/05/28 1 #include #endif -@@ -204,7 +204,7 @@ DefaultCommandLineSwitch g_default_switches[] = { +@@ -225,7 +225,7 @@ DefaultCommandLineSwitch g_default_switches[] = { #if BUILDFLAG(DISABLE_DISPLAY) { switches::kDisableGpu, "" }, #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #if defined(ARCH_CPU_X86_FAMILY) - // This is needed for now to enable the egltest Ozone platform to work with + // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -311,7 +311,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() +@@ -365,7 +365,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() } void CastBrowserMainParts::ToolkitInitialized() { diff --git a/www/iridium/patches/patch-chromecast_browser_cast_content_browser_client_cc b/www/iridium/patches/patch-chromecast_browser_cast_content_browser_client_cc new file mode 100644 index 00000000000..3bad8090d2e --- /dev/null +++ b/www/iridium/patches/patch-chromecast_browser_cast_content_browser_client_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-chromecast_browser_cast_content_browser_client_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- chromecast/browser/cast_content_browser_client.cc.orig.port Tue Oct 25 21:56:44 2016 ++++ chromecast/browser/cast_content_browser_client.cc Tue Oct 25 22:07:25 2016 +@@ -274,7 +274,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS + command_line->AppendSwitch(switches::kAllowHiddenMediaPlayback); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Necessary for accelerated 2d canvas. By default on Linux, Chromium assumes + // GLES2 contexts can be lost to a power-save mode, which breaks GPU canvas + // apps. diff --git a/www/iridium/patches/patch-components_audio_modem_modem_impl_cc b/www/iridium/patches/patch-components_audio_modem_modem_impl_cc deleted file mode 100644 index 7c1c8a7f8b8..00000000000 --- a/www/iridium/patches/patch-components_audio_modem_modem_impl_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-components_audio_modem_modem_impl_cc,v 1.2 2016/03/23 20:13:07 robert Exp $ ---- components/audio_modem/modem_impl.cc.orig.port Wed Feb 24 00:01:59 2016 -+++ components/audio_modem/modem_impl.cc Thu Mar 3 09:43:26 2016 -@@ -10,6 +10,8 @@ - #include - #include - -+#include -+ - #include "base/bind.h" - #include "base/bind_helpers.h" - #include "base/command_line.h" diff --git a/www/iridium/patches/patch-components_autofill_core_browser_autofill_experiments_cc b/www/iridium/patches/patch-components_autofill_core_browser_autofill_experiments_cc new file mode 100644 index 00000000000..5a603918084 --- /dev/null +++ b/www/iridium/patches/patch-components_autofill_core_browser_autofill_experiments_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-components_autofill_core_browser_autofill_experiments_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- components/autofill/core/browser/autofill_experiments.cc.orig.port Tue Oct 25 21:56:44 2016 ++++ components/autofill/core/browser/autofill_experiments.cc Tue Oct 25 22:07:48 2016 +@@ -67,7 +67,7 @@ int GetCreditCardSigninPromoImpressionLimit() { + } + + bool OfferStoreUnmaskedCards() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + // The checkbox can be forced on with a flag, but by default we don't store + // on Linux due to lack of system keychain integration. See crbug.com/162735 + return base::CommandLine::ForCurrentProcess()->HasSwitch( diff --git a/www/iridium/patches/patch-components_content_settings_core_browser_website_settings_registry_cc b/www/iridium/patches/patch-components_content_settings_core_browser_website_settings_registry_cc new file mode 100644 index 00000000000..519626e1dfa --- /dev/null +++ b/www/iridium/patches/patch-components_content_settings_core_browser_website_settings_registry_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-components_content_settings_core_browser_website_settings_registry_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- components/content_settings/core/browser/website_settings_registry.cc.orig.port Thu Sep 1 13:12:36 2016 ++++ components/content_settings/core/browser/website_settings_registry.cc Thu Sep 1 13:12:58 2016 +@@ -65,7 +65,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re + #if defined(OS_WIN) + if (!(platform & PLATFORM_WINDOWS)) + return nullptr; +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + if (!(platform & PLATFORM_LINUX)) + return nullptr; + #elif defined(OS_MACOSX) && !defined(OS_IOS) diff --git a/www/iridium/patches/patch-components_cookie_config_cookie_store_util_cc b/www/iridium/patches/patch-components_cookie_config_cookie_store_util_cc index 27a9d1940ea..670106b6252 100644 --- a/www/iridium/patches/patch-components_cookie_config_cookie_store_util_cc +++ b/www/iridium/patches/patch-components_cookie_config_cookie_store_util_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-components_cookie_config_cookie_store_util_cc,v 1.2 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-components_cookie_config_cookie_store_util_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ --- components/cookie_config/cookie_store_util.cc.orig.port Wed Feb 24 00:01:59 2016 +++ components/cookie_config/cookie_store_util.cc Thu Mar 3 09:43:26 2016 @@ -11,7 +11,7 @@ diff --git a/www/iridium/patches/patch-components_crash_content_app_BUILD_gn b/www/iridium/patches/patch-components_crash_content_app_BUILD_gn new file mode 100644 index 00000000000..62aee9cba17 --- /dev/null +++ b/www/iridium/patches/patch-components_crash_content_app_BUILD_gn @@ -0,0 +1,21 @@ +$OpenBSD: patch-components_crash_content_app_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- components/crash/content/app/BUILD.gn.orig.port Wed Oct 12 21:02:57 2016 ++++ components/crash/content/app/BUILD.gn Wed Oct 19 12:56:02 2016 +@@ -116,7 +116,7 @@ source_set("app_non_mac_win") { + libs = [ "log" ] + } + +- if (is_android || is_linux) { ++ if (is_android || (is_linux && !is_openbsd)) { + # Want these files on both Linux and Android. + set_sources_assignment_filter([]) + sources += [ +@@ -148,7 +148,7 @@ source_set("app_non_mac_win") { + + #'../breakpad/breakpad.gyp:breakpad_sender', TODO(GYP) + ] +- } else if (is_posix && !is_ios) { ++ } else if (is_posix && !is_ios && !is_openbsd) { + deps += [ "//breakpad:client" ] + } + } diff --git a/www/iridium/patches/patch-components_crash_content_browser_BUILD_gn b/www/iridium/patches/patch-components_crash_content_browser_BUILD_gn new file mode 100644 index 00000000000..6671d1a7a85 --- /dev/null +++ b/www/iridium/patches/patch-components_crash_content_browser_BUILD_gn @@ -0,0 +1,27 @@ +$OpenBSD: patch-components_crash_content_browser_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- components/crash/content/browser/BUILD.gn.orig.port Sun Aug 14 18:59:04 2016 ++++ components/crash/content/browser/BUILD.gn Sun Aug 14 19:00:13 2016 +@@ -16,13 +16,12 @@ source_set("browser") { + + deps = [ + "//base", +- "//breakpad:client", + "//components/crash/content/app", + "//content/public/browser", + "//content/public/common", + ] + +- if (is_linux || is_android) { ++ if ((is_linux && !is_openbsd) || is_android) { + set_sources_assignment_filter([]) + + # Want this file on both Linux and Android. +@@ -38,7 +37,7 @@ source_set("browser") { + + # This is not in the GYP build but this target includes breakpad client + # headers, so add the dependency here. +- if (is_posix && !is_ios) { ++ if (is_posix && !is_ios && !is_openbsd) { + configs += [ "//breakpad:client_config" ] + public_configs = [ "//breakpad:client_config" ] + } diff --git a/www/iridium/patches/patch-components_filesystem_file_system_app_cc b/www/iridium/patches/patch-components_filesystem_file_system_app_cc new file mode 100644 index 00000000000..40c26b3127d --- /dev/null +++ b/www/iridium/patches/patch-components_filesystem_file_system_app_cc @@ -0,0 +1,21 @@ +$OpenBSD: patch-components_filesystem_file_system_app_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- components/filesystem/file_system_app.cc.orig.port Tue Oct 25 21:56:44 2016 ++++ components/filesystem/file_system_app.cc Tue Oct 25 22:08:08 2016 +@@ -19,7 +19,7 @@ + #elif defined(OS_ANDROID) + #include "base/base_paths_android.h" + #include "base/path_service.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "base/environment.h" + #include "base/nix/xdg_util.h" + #elif defined(OS_MACOSX) +@@ -70,7 +70,7 @@ base::FilePath FileSystemApp::GetUserDataDir() { + CHECK(PathService::Get(base::DIR_APP_DATA, &path)); + #elif defined(OS_ANDROID) + CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &path)); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + std::unique_ptr env(base::Environment::Create()); + path = base::nix::GetXDGDirectory(env.get(), + base::nix::kXdgConfigHomeEnvVar, diff --git a/www/iridium/patches/patch-components_metrics_BUILD_gn b/www/iridium/patches/patch-components_metrics_BUILD_gn new file mode 100644 index 00000000000..d3d2e7b3786 --- /dev/null +++ b/www/iridium/patches/patch-components_metrics_BUILD_gn @@ -0,0 +1,14 @@ +$OpenBSD: patch-components_metrics_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- components/metrics/BUILD.gn.orig.port Wed Oct 12 21:02:58 2016 ++++ components/metrics/BUILD.gn Wed Oct 19 12:56:02 2016 +@@ -90,6 +90,10 @@ static_library("metrics") { + "//third_party/zlib:compression_utils", + ] + ++ if (is_openbsd) { ++ sources -= [ "system_memory_stats_recorder_linux.cc" ] ++ } ++ + if (is_chromeos) { + deps += [ ":serialization" ] + } diff --git a/www/iridium/patches/patch-components_metrics_drive_metrics_provider_linux_cc b/www/iridium/patches/patch-components_metrics_drive_metrics_provider_linux_cc index 3fc4ec77f9c..77ec53a6778 100644 --- a/www/iridium/patches/patch-components_metrics_drive_metrics_provider_linux_cc +++ b/www/iridium/patches/patch-components_metrics_drive_metrics_provider_linux_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-components_metrics_drive_metrics_provider_linux_cc,v 1.1 2015/10/24 18:22:21 robert Exp $ +$OpenBSD: patch-components_metrics_drive_metrics_provider_linux_cc,v 1.2 2016/10/27 18:30:41 robert Exp $ --- components/metrics/drive_metrics_provider_linux.cc.orig.port Wed Oct 14 07:45:52 2015 +++ components/metrics/drive_metrics_provider_linux.cc Wed Oct 14 07:46:06 2015 @@ -4,7 +4,13 @@ diff --git a/www/iridium/patches/patch-components_metrics_gypi b/www/iridium/patches/patch-components_metrics_gypi deleted file mode 100644 index c78a8441899..00000000000 --- a/www/iridium/patches/patch-components_metrics_gypi +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-components_metrics_gypi,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- components/metrics.gypi.orig.port Wed May 25 21:00:59 2016 -+++ components/metrics.gypi Thu May 26 08:09:45 2016 -@@ -75,7 +75,6 @@ - 'metrics/stability_metrics_helper.cc', - 'metrics/stability_metrics_helper.h', - 'metrics/system_memory_stats_recorder.h', -- 'metrics/system_memory_stats_recorder_linux.cc', - 'metrics/system_memory_stats_recorder_win.cc', - 'metrics/url_constants.cc', - 'metrics/url_constants.h', diff --git a/www/iridium/patches/patch-components_neterror_resources_neterror_js b/www/iridium/patches/patch-components_neterror_resources_neterror_js index 53bdd362330..a79510a016a 100644 --- a/www/iridium/patches/patch-components_neterror_resources_neterror_js +++ b/www/iridium/patches/patch-components_neterror_resources_neterror_js @@ -1,4 +1,4 @@ -$OpenBSD: patch-components_neterror_resources_neterror_js,v 1.2 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-components_neterror_resources_neterror_js,v 1.3 2016/10/27 18:30:41 robert Exp $ --- components/neterror/resources/neterror.js.orig.port Wed May 25 04:54:13 2016 +++ components/neterror/resources/neterror.js Thu May 26 08:09:45 2016 @@ -147,7 +147,7 @@ function setUpCachedButton(buttonStrings) { diff --git a/www/iridium/patches/patch-components_omnibox_browser_omnibox_field_trial_cc b/www/iridium/patches/patch-components_omnibox_browser_omnibox_field_trial_cc index 4bc396d39e4..f02e3ce99b5 100644 --- a/www/iridium/patches/patch-components_omnibox_browser_omnibox_field_trial_cc +++ b/www/iridium/patches/patch-components_omnibox_browser_omnibox_field_trial_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-components_omnibox_browser_omnibox_field_trial_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-components_omnibox_browser_omnibox_field_trial_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ --- components/omnibox/browser/omnibox_field_trial.cc.orig.port Wed Apr 13 22:59:43 2016 +++ components/omnibox/browser/omnibox_field_trial.cc Thu Apr 14 08:25:10 2016 @@ -147,7 +147,7 @@ bool OmniboxFieldTrial::InZeroSuggestFieldTrial() { diff --git a/www/iridium/patches/patch-components_os_crypt_os_crypt_h b/www/iridium/patches/patch-components_os_crypt_os_crypt_h new file mode 100644 index 00000000000..72fbf21f5a0 --- /dev/null +++ b/www/iridium/patches/patch-components_os_crypt_os_crypt_h @@ -0,0 +1,21 @@ +$OpenBSD: patch-components_os_crypt_os_crypt_h,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- components/os_crypt/os_crypt.h.orig.port Wed Oct 12 21:02:58 2016 ++++ components/os_crypt/os_crypt.h Wed Oct 19 12:56:03 2016 +@@ -13,7 +13,7 @@ + #include "base/strings/string16.h" + #include "build/build_config.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #include "components/os_crypt/key_storage_linux.h" + #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) + +@@ -23,7 +23,7 @@ + // true for Linux, if a password management tool is available. + class OSCrypt { + public: +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // If |store_type| is a known password store, we will attempt to use it. + // In any other case, we default to auto-detecting the store. + // This should not be changed after OSCrypt has been used. diff --git a/www/iridium/patches/patch-components_policy_resources_policy_templates_json b/www/iridium/patches/patch-components_policy_resources_policy_templates_json index 995472c4ef7..4f21c662a13 100644 --- a/www/iridium/patches/patch-components_policy_resources_policy_templates_json +++ b/www/iridium/patches/patch-components_policy_resources_policy_templates_json @@ -1,7 +1,7 @@ -$OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- components/policy/resources/policy_templates.json.orig.port Wed May 25 21:01:00 2016 -+++ components/policy/resources/policy_templates.json Thu May 26 08:09:45 2016 -@@ -1924,7 +1924,7 @@ +$OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- components/policy/resources/policy_templates.json.orig.port Wed Oct 12 21:02:58 2016 ++++ components/policy/resources/policy_templates.json Wed Oct 19 12:56:03 2016 +@@ -1930,7 +1930,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -10,7 +10,7 @@ $OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.9 2016/05/ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4587,7 +4587,7 @@ +@@ -4601,7 +4601,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -19,7 +19,7 @@ $OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.9 2016/05/ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5416,7 +5416,7 @@ +@@ -5449,7 +5449,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/iridium/patches/patch-components_policy_tools_generate_policy_source_py b/www/iridium/patches/patch-components_policy_tools_generate_policy_source_py index 70ed71c0d7d..04db24d52b3 100644 --- a/www/iridium/patches/patch-components_policy_tools_generate_policy_source_py +++ b/www/iridium/patches/patch-components_policy_tools_generate_policy_source_py @@ -1,4 +1,4 @@ -$OpenBSD: patch-components_policy_tools_generate_policy_source_py,v 1.6 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-components_policy_tools_generate_policy_source_py,v 1.7 2016/10/27 18:30:41 robert Exp $ --- components/policy/tools/generate_policy_source.py.orig.port Wed May 25 21:01:00 2016 +++ components/policy/tools/generate_policy_source.py Thu May 26 08:09:45 2016 @@ -102,7 +102,7 @@ class PolicyDetails: diff --git a/www/iridium/patches/patch-components_storage_monitor_BUILD_gn b/www/iridium/patches/patch-components_storage_monitor_BUILD_gn new file mode 100644 index 00000000000..84c2b5a7cba --- /dev/null +++ b/www/iridium/patches/patch-components_storage_monitor_BUILD_gn @@ -0,0 +1,36 @@ +$OpenBSD: patch-components_storage_monitor_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- components/storage_monitor/BUILD.gn.orig.port Wed Oct 12 21:02:58 2016 ++++ components/storage_monitor/BUILD.gn Wed Oct 19 12:56:03 2016 +@@ -26,10 +26,10 @@ static_library("storage_monitor") { + "storage_info.h", + "storage_monitor.cc", + "storage_monitor.h", +- "storage_monitor_chromeos.cc", +- "storage_monitor_chromeos.h", + "storage_monitor_linux.cc", + "storage_monitor_linux.h", ++ "storage_monitor_chromeos.cc", ++ "storage_monitor_chromeos.h", + "storage_monitor_mac.h", + "storage_monitor_mac.mm", + "storage_monitor_win.cc", +@@ -53,6 +53,19 @@ static_library("storage_monitor") { + "DiskArbitration.framework", + "Foundation.framework", + "ImageCaptureCore.framework", ++ ] ++ } ++ ++ if (is_openbsd) { ++ sources -= [ ++ "media_transfer_protocol_device_observer_linux.cc", ++ "media_transfer_protocol_device_observer_linux.h", ++ "mtab_watcher_linux.cc", ++ "mtab_watcher_linux.h" ++ ] ++ sources += [ ++ "storage_monitor_openbsd.cc", ++ "storage_monitor_openbsd.h" + ] + } + diff --git a/www/iridium/patches/patch-components_storage_monitor_gypi b/www/iridium/patches/patch-components_storage_monitor_gypi deleted file mode 100644 index 6412d7a9bd8..00000000000 --- a/www/iridium/patches/patch-components_storage_monitor_gypi +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-components_storage_monitor_gypi,v 1.2 2015/05/06 14:27:24 robert Exp $ ---- components/storage_monitor.gypi.orig.port Thu Oct 2 19:18:56 2014 -+++ components/storage_monitor.gypi Fri Oct 10 16:10:30 2014 -@@ -50,6 +50,22 @@ - 'storage_monitor/volume_mount_watcher_win.h', - ], - 'conditions': [ -+ ['os_bsd == 1', { -+ 'sources!': [ -+ 'storage_monitor/media_transfer_protocol_device_observer_linux.cc', -+ 'storage_monitor/media_transfer_protocol_device_observer_linux.h', -+ 'storage_monitor/mtab_watcher_linux.cc', -+ 'storage_monitor/mtab_watcher_linux.h', -+ 'storage_monitor/storage_monitor_linux.cc', -+ 'storage_monitor/storage_monitor_linux.h', -+ 'storage_monitor/udev_util_linux.cc', -+ 'storage_monitor/udev_util_linux.h', -+ ], -+ 'sources': [ -+ 'storage_monitor/storage_monitor_openbsd.cc', -+ 'storage_monitor/storage_monitor_openbsd.h', -+ ], -+ }], - ['OS == "mac"', { - 'link_settings': { - 'libraries': [ diff --git a/www/iridium/patches/patch-components_storage_monitor_storage_monitor_openbsd_cc b/www/iridium/patches/patch-components_storage_monitor_storage_monitor_openbsd_cc index 414ea7b41ba..c0b4e46a309 100644 --- a/www/iridium/patches/patch-components_storage_monitor_storage_monitor_openbsd_cc +++ b/www/iridium/patches/patch-components_storage_monitor_storage_monitor_openbsd_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-components_storage_monitor_storage_monitor_openbsd_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-components_storage_monitor_storage_monitor_openbsd_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- components/storage_monitor/storage_monitor_openbsd.cc.orig.port Sat Mar 5 17:44:02 2016 +++ components/storage_monitor/storage_monitor_openbsd.cc Sat Mar 5 17:49:32 2016 @@ -0,0 +1,54 @@ diff --git a/www/iridium/patches/patch-components_storage_monitor_storage_monitor_openbsd_h b/www/iridium/patches/patch-components_storage_monitor_storage_monitor_openbsd_h index d6941b41a71..67a6a988267 100644 --- a/www/iridium/patches/patch-components_storage_monitor_storage_monitor_openbsd_h +++ b/www/iridium/patches/patch-components_storage_monitor_storage_monitor_openbsd_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-components_storage_monitor_storage_monitor_openbsd_h,v 1.3 2016/03/23 20:13:07 robert Exp $ ---- components/storage_monitor/storage_monitor_openbsd.h.orig.port Sat Mar 5 17:44:02 2016 -+++ components/storage_monitor/storage_monitor_openbsd.h Sat Mar 5 18:15:15 2016 -@@ -0,0 +1,46 @@ +$OpenBSD: patch-components_storage_monitor_storage_monitor_openbsd_h,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- components/storage_monitor/storage_monitor_openbsd.h.orig.port Thu Jul 21 10:25:29 2016 ++++ components/storage_monitor/storage_monitor_openbsd.h Thu Jul 21 11:45:22 2016 +@@ -0,0 +1,45 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -21,7 +21,6 @@ $OpenBSD: patch-components_storage_monitor_storage_monitor_openbsd_h,v 1.3 2016/ +#include "base/compiler_specific.h" +#include "base/files/file_path.h" +#include "base/files/file_path_watcher.h" -+#include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" +#include "components/storage_monitor/storage_monitor.h" +#include "content/public/browser/browser_thread.h" diff --git a/www/iridium/patches/patch-sync_util_get_session_name_cc b/www/iridium/patches/patch-components_sync_base_get_session_name_cc similarity index 57% rename from www/iridium/patches/patch-sync_util_get_session_name_cc rename to www/iridium/patches/patch-components_sync_base_get_session_name_cc index 3c996bf1cbc..b28602f81ea 100644 --- a/www/iridium/patches/patch-sync_util_get_session_name_cc +++ b/www/iridium/patches/patch-components_sync_base_get_session_name_cc @@ -1,15 +1,15 @@ -$OpenBSD: patch-sync_util_get_session_name_cc,v 1.4 2016/03/23 20:13:07 robert Exp $ ---- sync/util/get_session_name.cc.orig.port Wed Feb 24 00:02:02 2016 -+++ sync/util/get_session_name.cc Thu Mar 3 09:43:26 2016 +$OpenBSD: patch-components_sync_base_get_session_name_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- components/sync/base/get_session_name.cc.orig.port Wed Oct 19 13:51:04 2016 ++++ components/sync/base/get_session_name.cc Wed Oct 19 13:51:18 2016 @@ -15,7 +15,7 @@ #if defined(OS_CHROMEOS) #include "chromeos/system/devicetype.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - #include "sync/util/get_session_name_linux.h" + #include "components/sync/base/get_session_name_linux.h" #elif defined(OS_IOS) - #include "sync/util/get_session_name_ios.h" + #include "components/sync/base/get_session_name_ios.h" @@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously() { session_name = "Chromebook"; break; diff --git a/www/iridium/patches/patch-sync_util_get_session_name_linux_cc b/www/iridium/patches/patch-components_sync_base_get_session_name_linux_cc similarity index 57% rename from www/iridium/patches/patch-sync_util_get_session_name_linux_cc rename to www/iridium/patches/patch-components_sync_base_get_session_name_linux_cc index 77f7cb8de4f..c0e64216961 100644 --- a/www/iridium/patches/patch-sync_util_get_session_name_linux_cc +++ b/www/iridium/patches/patch-components_sync_base_get_session_name_linux_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-sync_util_get_session_name_linux_cc,v 1.2 2015/05/06 14:27:24 robert Exp $ ---- sync/util/get_session_name_linux.cc.orig.port Sun Oct 20 19:08:41 2013 -+++ sync/util/get_session_name_linux.cc Sun Oct 20 19:08:51 2013 +$OpenBSD: patch-components_sync_base_get_session_name_linux_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- components/sync/base/get_session_name_linux.cc.orig.port Wed Oct 19 13:52:29 2016 ++++ components/sync/base/get_session_name_linux.cc Wed Oct 19 13:52:42 2016 @@ -13,8 +13,9 @@ namespace syncer { namespace internal { diff --git a/www/iridium/patches/patch-content_app_content_main_runner_cc b/www/iridium/patches/patch-content_app_content_main_runner_cc index c45ef4dfda2..9b2f1dee0af 100644 --- a/www/iridium/patches/patch-content_app_content_main_runner_cc +++ b/www/iridium/patches/patch-content_app_content_main_runner_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_app_content_main_runner_cc,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- content/app/content_main_runner.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/app/content_main_runner.cc Thu May 26 08:09:46 2016 -@@ -96,10 +96,10 @@ +$OpenBSD: patch-content_app_content_main_runner_cc,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- content/app/content_main_runner.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/app/content_main_runner.cc Wed Oct 19 12:56:03 2016 +@@ -97,10 +97,10 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -14,7 +14,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.10 2016/05/28 14:49:39 ro #include "content/zygote/zygote_main.h" #endif -@@ -301,7 +301,7 @@ struct MainFunction { +@@ -297,7 +297,7 @@ struct MainFunction { int (*function)(const MainFunctionParams&); }; @@ -23,7 +23,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.10 2016/05/28 14:49:39 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(). -@@ -423,7 +423,7 @@ int RunNamedProcessTypeMain( +@@ -419,7 +419,7 @@ int RunNamedProcessTypeMain( } } @@ -32,7 +32,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.10 2016/05/28 14:49:39 ro // Zygote startup is special -- see RunZygote comments above // for why we don't use ZygoteMain directly. if (process_type == switches::kZygoteProcess) -@@ -494,10 +494,10 @@ class ContentMainRunnerImpl : public ContentMainRunner +@@ -491,10 +491,10 @@ class ContentMainRunnerImpl : public ContentMainRunner kMojoIPCChannel + base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID diff --git a/www/iridium/patches/patch-content_browser_BUILD_gn b/www/iridium/patches/patch-content_browser_BUILD_gn new file mode 100644 index 00000000000..6f224441e46 --- /dev/null +++ b/www/iridium/patches/patch-content_browser_BUILD_gn @@ -0,0 +1,14 @@ +$OpenBSD: patch-content_browser_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- content/browser/BUILD.gn.orig.port Wed Oct 12 21:02:59 2016 ++++ content/browser/BUILD.gn Wed Oct 19 12:56:03 2016 +@@ -159,6 +159,10 @@ source_set("browser") { + deps += [ "//ui/events" ] + } + ++ if (is_openbsd) { ++ sources -= [ "download/file_metadata_linux.cc" ] ++ } ++ + if (!is_win) { + sources += [ + "file_descriptor_info_impl.cc", diff --git a/www/iridium/patches/patch-content_browser_accessibility_browser_accessibility_h b/www/iridium/patches/patch-content_browser_accessibility_browser_accessibility_h index 40e25867d3f..ff9969abdcb 100644 --- a/www/iridium/patches/patch-content_browser_accessibility_browser_accessibility_h +++ b/www/iridium/patches/patch-content_browser_accessibility_browser_accessibility_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-content_browser_accessibility_browser_accessibility_h,v 1.5 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-content_browser_accessibility_browser_accessibility_h,v 1.6 2016/10/27 18:30:41 robert Exp $ --- content/browser/accessibility/browser_accessibility.h.orig.port Thu May 26 08:28:24 2016 +++ content/browser/accessibility/browser_accessibility.h Thu May 26 13:44:06 2016 @@ -38,7 +38,7 @@ diff --git a/www/iridium/patches/patch-content_browser_accessibility_browser_accessibility_manager_h b/www/iridium/patches/patch-content_browser_accessibility_browser_accessibility_manager_h index d0d5a1f2e56..0c69c3998b0 100644 --- a/www/iridium/patches/patch-content_browser_accessibility_browser_accessibility_manager_h +++ b/www/iridium/patches/patch-content_browser_accessibility_browser_accessibility_manager_h @@ -1,16 +1,16 @@ -$OpenBSD: patch-content_browser_accessibility_browser_accessibility_manager_h,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- content/browser/accessibility/browser_accessibility_manager.h.orig.port Wed May 25 21:01:01 2016 -+++ content/browser/accessibility/browser_accessibility_manager.h Thu May 26 08:09:46 2016 -@@ -32,7 +32,7 @@ class BrowserAccessibilityManager; +$OpenBSD: patch-content_browser_accessibility_browser_accessibility_manager_h,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- content/browser/accessibility/browser_accessibility_manager.h.orig.port Thu Sep 1 00:03:31 2016 ++++ content/browser/accessibility/browser_accessibility_manager.h Thu Sep 1 11:12:22 2016 +@@ -33,7 +33,7 @@ class BrowserAccessibilityManager; class BrowserAccessibilityManagerAndroid; #elif defined(OS_WIN) class BrowserAccessibilityManagerWin; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) +#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && defined(USE_X11) class BrowserAccessibilityManagerAuraLinux; - #endif - -@@ -271,7 +271,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager : pub + #elif defined(OS_MACOSX) + class BrowserAccessibilityManagerMac; +@@ -273,7 +273,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager : pub BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid(); #endif diff --git a/www/iridium/patches/patch-content_browser_browser_main_loop_cc b/www/iridium/patches/patch-content_browser_browser_main_loop_cc index 169de67202c..3c08a9c9bef 100644 --- a/www/iridium/patches/patch-content_browser_browser_main_loop_cc +++ b/www/iridium/patches/patch-content_browser_browser_main_loop_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- content/browser/browser_main_loop.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/browser/browser_main_loop.cc Thu May 26 08:09:46 2016 -@@ -183,6 +183,10 @@ - #include "ui/views/mus/window_manager_connection.h" +$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.12 2016/10/27 18:30:41 robert Exp $ +--- content/browser/browser_main_loop.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/browser/browser_main_loop.cc Wed Oct 19 12:56:03 2016 +@@ -196,6 +196,10 @@ + #include "gpu/vulkan/vulkan_implementation.h" #endif +#if defined(OS_BSD) @@ -12,7 +12,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.11 2016/05/28 14:49:39 // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -191,7 +195,7 @@ +@@ -204,7 +208,7 @@ namespace content { namespace { @@ -20,10 +20,10 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.11 2016/05/28 14:49:39 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); - base::FilePath sandbox_binary; -@@ -438,10 +442,15 @@ void BrowserMainLoop::EarlyInitialization() { + +@@ -432,10 +436,15 @@ void BrowserMainLoop::Init() { + void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); - TRACK_SCOPED_REGION("Startup", "BrowserMainLoop::EarlyInitialization"); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) diff --git a/www/iridium/patches/patch-content_browser_child_process_launcher_cc b/www/iridium/patches/patch-content_browser_child_process_launcher_cc index 4d268b0c899..77422e14e38 100644 --- a/www/iridium/patches/patch-content_browser_child_process_launcher_cc +++ b/www/iridium/patches/patch-content_browser_child_process_launcher_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- content/browser/child_process_launcher.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/browser/child_process_launcher.cc Thu May 26 08:09:46 2016 -@@ -251,7 +251,7 @@ void LaunchOnLauncherThread(const NotifyCallback& call +$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.12 2016/10/27 18:30:41 robert Exp $ +--- content/browser/child_process_launcher.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/browser/child_process_launcher.cc Wed Oct 19 12:56:03 2016 +@@ -258,7 +258,7 @@ void LaunchOnLauncherThread(const NotifyCallback& call // We need to close the client end of the IPC channel to reliably detect // child termination. @@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.11 2016/05/28 14:4 ZygoteHandle* zygote_handle = delegate->GetZygote(); // If |zygote_handle| is null, a zygote should not be used. if (zygote_handle) { -@@ -355,7 +355,7 @@ void TerminateOnLauncherThread(ZygoteHandle zygote, ba +@@ -364,7 +364,7 @@ void TerminateOnLauncherThread(ZygoteHandle zygote, ba process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) @@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.11 2016/05/28 14:4 if (zygote) { // If the renderer was created via a zygote, we have to proxy the reaping // through the zygote process. -@@ -459,7 +459,7 @@ void ChildProcessLauncher::Launch( +@@ -485,7 +485,7 @@ void ChildProcessLauncher::Launch( void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) { DCHECK(CalledOnValidThread()); @@ -28,8 +28,8 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.11 2016/05/28 14:4 if (zygote_) { termination_status_ = zygote_->GetTerminationStatus( process_.Handle(), known_dead, &exit_code_); -@@ -536,7 +536,7 @@ void ChildProcessLauncher::Notify(ZygoteHandle zygote, - mojo_platform_channel_.PassServerHandle()); +@@ -566,7 +566,7 @@ void ChildProcessLauncher::Notify(ZygoteHandle zygote, + mojo_child_token_, process_error_callback_); } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) diff --git a/www/iridium/patches/patch-content_browser_device_sensors_data_fetcher_shared_memory_h b/www/iridium/patches/patch-content_browser_device_sensors_data_fetcher_shared_memory_h new file mode 100644 index 00000000000..a1056919c34 --- /dev/null +++ b/www/iridium/patches/patch-content_browser_device_sensors_data_fetcher_shared_memory_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-content_browser_device_sensors_data_fetcher_shared_memory_h,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- content/browser/device_sensors/data_fetcher_shared_memory.h.orig.port Thu Sep 1 14:41:57 2016 ++++ content/browser/device_sensors/data_fetcher_shared_memory.h Thu Sep 1 14:42:06 2016 +@@ -45,7 +45,7 @@ class CONTENT_EXPORT DataFetcherSharedMemory + bool Start(ConsumerType consumer_type, void* buffer) override; + bool Stop(ConsumerType consumer_type) override; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #if !defined(OS_CHROMEOS) + DeviceMotionHardwareBuffer* motion_buffer_ = nullptr; + DeviceOrientationHardwareBuffer* orientation_buffer_ = nullptr; diff --git a/www/iridium/patches/patch-content_browser_devtools_protocol_color_picker_cc b/www/iridium/patches/patch-content_browser_devtools_protocol_color_picker_cc index e0bc26779d1..39ef6770443 100644 --- a/www/iridium/patches/patch-content_browser_devtools_protocol_color_picker_cc +++ b/www/iridium/patches/patch-content_browser_devtools_protocol_color_picker_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-content_browser_devtools_protocol_color_picker_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-content_browser_devtools_protocol_color_picker_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- content/browser/devtools/protocol/color_picker.cc.orig.port Wed Feb 24 00:02:00 2016 +++ content/browser/devtools/protocol/color_picker.cc Thu Mar 3 09:43:26 2016 @@ -151,7 +151,7 @@ void ColorPicker::UpdateCursor() { diff --git a/www/iridium/patches/patch-content_browser_download_base_file_cc b/www/iridium/patches/patch-content_browser_download_base_file_cc index 283a52a3084..396697d8e7c 100644 --- a/www/iridium/patches/patch-content_browser_download_base_file_cc +++ b/www/iridium/patches/patch-content_browser_download_base_file_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_browser_download_base_file_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- content/browser/download/base_file.cc.orig.port Thu May 26 08:29:17 2016 -+++ content/browser/download/base_file.cc Thu May 26 08:29:24 2016 -@@ -186,7 +186,7 @@ scoped_ptr BaseFile::Finish() { +$OpenBSD: patch-content_browser_download_base_file_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- content/browser/download/base_file.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/browser/download/base_file.cc Wed Oct 19 12:56:03 2016 +@@ -193,7 +193,7 @@ std::unique_ptr BaseFile::Finish() } // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations. diff --git a/www/iridium/patches/patch-content_browser_download_base_file_linux_cc b/www/iridium/patches/patch-content_browser_download_base_file_linux_cc index 487b5f68ea6..633a30b5378 100644 --- a/www/iridium/patches/patch-content_browser_download_base_file_linux_cc +++ b/www/iridium/patches/patch-content_browser_download_base_file_linux_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-content_browser_download_base_file_linux_cc,v 1.4 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-content_browser_download_base_file_linux_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ --- content/browser/download/base_file_linux.cc.orig.port Thu May 26 08:29:35 2016 +++ content/browser/download/base_file_linux.cc Thu May 26 08:29:44 2016 @@ -16,7 +16,9 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn diff --git a/www/iridium/patches/patch-content_browser_gamepad_gamepad_provider_cc b/www/iridium/patches/patch-content_browser_gamepad_gamepad_provider_cc deleted file mode 100644 index c9814dff38d..00000000000 --- a/www/iridium/patches/patch-content_browser_gamepad_gamepad_provider_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-content_browser_gamepad_gamepad_provider_cc,v 1.3 2016/04/27 12:46:16 robert Exp $ ---- content/browser/gamepad/gamepad_provider.cc.orig.port Fri Apr 8 18:02:09 2016 -+++ content/browser/gamepad/gamepad_provider.cc Thu Apr 14 08:25:11 2016 -@@ -136,7 +136,7 @@ void GamepadProvider::Initialize(scoped_ptr #endif #if defined(OS_WIN) -@@ -46,7 +46,7 @@ +@@ -50,7 +50,7 @@ #include "ui/gfx/win/physical_size.h" #endif -#if defined(OS_LINUX) && defined(USE_X11) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) - #include "ui/base/x/x11_util.h" - #include "ui/gfx/x/x11_atom_cache.h" + #include "ui/base/x/x11_util.h" // nogncheck + #include "ui/gfx/x/x11_atom_cache.h" // nogncheck #endif -@@ -199,7 +199,7 @@ base::DictionaryValue* GpuInfoAsDictionaryValue() { +@@ -204,7 +204,7 @@ base::DictionaryValue* GpuInfoAsDictionaryValue() { gpu_info.gl_ws_version)); basic_info->Append(NewDescriptionValuePair("Window system binding extensions", gpu_info.gl_ws_extensions)); diff --git a/www/iridium/patches/patch-content_browser_media_media_internals_cc b/www/iridium/patches/patch-content_browser_media_media_internals_cc index d2a8bb03c78..7a162b54098 100644 --- a/www/iridium/patches/patch-content_browser_media_media_internals_cc +++ b/www/iridium/patches/patch-content_browser_media_media_internals_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-content_browser_media_media_internals_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- content/browser/media/media_internals.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/browser/media/media_internals.cc Thu May 26 08:09:46 2016 -@@ -611,7 +611,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit - "name", video_capture_device_info.name.GetNameAndModel()); +$OpenBSD: patch-content_browser_media_media_internals_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- content/browser/media/media_internals.cc.orig.port Wed Oct 19 13:46:27 2016 ++++ content/browser/media/media_internals.cc Wed Oct 19 13:46:43 2016 +@@ -724,7 +724,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit + device_dict->SetString("name", descriptor.GetNameAndModel()); device_dict->Set("formats", format_list); #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ - defined(OS_ANDROID) + defined(OS_ANDROID) || defined(OS_BSD) - device_dict->SetString( - "captureApi", video_capture_device_info.name.GetCaptureApiTypeString()); + device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString()); #endif + video_capture_capabilities_cached_data_.Append(std::move(device_dict)); diff --git a/www/iridium/patches/patch-content_browser_power_usage_monitor_impl_cc b/www/iridium/patches/patch-content_browser_power_usage_monitor_impl_cc index b441d473489..1cd16936550 100644 --- a/www/iridium/patches/patch-content_browser_power_usage_monitor_impl_cc +++ b/www/iridium/patches/patch-content_browser_power_usage_monitor_impl_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-content_browser_power_usage_monitor_impl_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-content_browser_power_usage_monitor_impl_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- content/browser/power_usage_monitor_impl.cc.orig.port Wed Feb 24 00:02:00 2016 +++ content/browser/power_usage_monitor_impl.cc Thu Mar 3 09:43:26 2016 @@ -21,6 +21,8 @@ diff --git a/www/iridium/patches/patch-content_browser_ppapi_plugin_process_host_cc b/www/iridium/patches/patch-content_browser_ppapi_plugin_process_host_cc index c4cb4c63445..fd03e9d760c 100644 --- a/www/iridium/patches/patch-content_browser_ppapi_plugin_process_host_cc +++ b/www/iridium/patches/patch-content_browser_ppapi_plugin_process_host_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_browser_ppapi_plugin_process_host_cc,v 1.1 2016/04/27 12:46:16 robert Exp $ ---- content/browser/ppapi_plugin_process_host.cc.orig.port Sat Apr 16 11:10:56 2016 -+++ content/browser/ppapi_plugin_process_host.cc Sat Apr 16 11:11:15 2016 -@@ -49,7 +49,7 @@ +$OpenBSD: patch-content_browser_ppapi_plugin_process_host_cc,v 1.2 2016/10/27 18:30:41 robert Exp $ +--- content/browser/ppapi_plugin_process_host.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/browser/ppapi_plugin_process_host.cc Wed Oct 19 12:56:04 2016 +@@ -52,7 +52,7 @@ namespace content { @@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_ppapi_plugin_process_host_cc,v 1.1 2016/04/27 12 ZygoteHandle g_ppapi_zygote; #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -@@ -113,7 +113,7 @@ class PpapiPluginSandboxedProcessLauncherDelegate +@@ -119,7 +119,7 @@ class PpapiPluginSandboxedProcessLauncherDelegate } #elif defined(OS_POSIX) @@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_ppapi_plugin_process_host_cc,v 1.1 2016/04/27 12 ZygoteHandle* GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -213,7 +213,7 @@ PpapiPluginProcessHost* PpapiPluginProcessHost::Create +@@ -222,7 +222,7 @@ PpapiPluginProcessHost* PpapiPluginProcessHost::Create return NULL; } diff --git a/www/iridium/patches/patch-content_browser_renderer_host_media_video_capture_device_client_cc b/www/iridium/patches/patch-content_browser_renderer_host_media_video_capture_device_client_cc index 64d283b8b08..1eb4b008121 100644 --- a/www/iridium/patches/patch-content_browser_renderer_host_media_video_capture_device_client_cc +++ b/www/iridium/patches/patch-content_browser_renderer_host_media_video_capture_device_client_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_browser_renderer_host_media_video_capture_device_client_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- content/browser/renderer_host/media/video_capture_device_client.cc.orig.port Wed May 25 04:54:15 2016 -+++ content/browser/renderer_host/media/video_capture_device_client.cc Thu May 26 08:09:46 2016 -@@ -181,7 +181,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +$OpenBSD: patch-content_browser_renderer_host_media_video_capture_device_client_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- content/browser/renderer_host/media/video_capture_device_client.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/browser/renderer_host/media/video_capture_device_client.cc Wed Oct 19 12:56:04 2016 +@@ -186,7 +186,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/iridium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc b/www/iridium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc index 44f767166fd..a01f7ef7991 100644 --- a/www/iridium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc +++ b/www/iridium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_browser_renderer_host_render_process_host_impl_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- content/browser/renderer_host/render_process_host_impl.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/browser/renderer_host/render_process_host_impl.cc Thu May 26 08:09:46 2016 -@@ -359,7 +359,7 @@ SiteProcessMap* GetSiteProcessMapForBrowserContext(Bro +$OpenBSD: patch-content_browser_renderer_host_render_process_host_impl_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- content/browser/renderer_host/render_process_host_impl.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/browser/renderer_host/render_process_host_impl.cc Wed Oct 19 12:56:04 2016 +@@ -369,7 +369,7 @@ SiteProcessMap* GetSiteProcessMapForBrowserContext(Bro return map; } @@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_renderer_host_render_process_host_impl_cc,v 1.2 // This static member variable holds the zygote communication information for // the renderer. ZygoteHandle g_render_zygote; -@@ -392,7 +392,7 @@ class RendererSandboxedProcessLauncherDelegate +@@ -402,7 +402,7 @@ class RendererSandboxedProcessLauncherDelegate } #elif defined(OS_POSIX) @@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_renderer_host_render_process_host_impl_cc,v 1.2 ZygoteHandle* GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -514,7 +514,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(siz +@@ -639,7 +639,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(siz g_max_renderer_count_override = count; } diff --git a/www/iridium/patches/patch-content_browser_renderer_host_render_widget_host_impl_cc b/www/iridium/patches/patch-content_browser_renderer_host_render_widget_host_impl_cc deleted file mode 100644 index b1a64f82fda..00000000000 --- a/www/iridium/patches/patch-content_browser_renderer_host_render_widget_host_impl_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-content_browser_renderer_host_render_widget_host_impl_cc,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- content/browser/renderer_host/render_widget_host_impl.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/browser/renderer_host/render_widget_host_impl.cc Thu May 26 08:09:46 2016 -@@ -648,7 +648,7 @@ void RenderWidgetHostImpl::WasResized() { - } - - void RenderWidgetHostImpl::DispatchColorProfile() { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - static bool image_profiles = base::CommandLine::ForCurrentProcess()-> - HasSwitch(switches::kEnableImageColorProfiles); - if (!image_profiles) diff --git a/www/iridium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc b/www/iridium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc index 0bc5eddb7e9..8544999edd2 100644 --- a/www/iridium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc +++ b/www/iridium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc @@ -1,16 +1,16 @@ -$OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/browser/renderer_host/render_widget_host_view_aura.cc Sat May 28 10:25:28 2016 +$OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig.port Wed Oct 19 13:46:49 2016 ++++ content/browser/renderer_host/render_widget_host_view_aura.cc Wed Oct 19 13:47:19 2016 @@ -106,7 +106,7 @@ - #include "ui/gfx/win/dpi.h" + #include "ui/gfx/gdi_util.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #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" -@@ -2463,7 +2463,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { + #include "ui/base/ime/linux/text_edit_command_auralinux.h" + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" + #endif +@@ -2479,7 +2479,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; -@@ -2691,7 +2691,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEvent( +@@ -2711,7 +2711,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEvent( if (!target_host) return; diff --git a/www/iridium/patches/patch-content_browser_time_zone_monitor_cc b/www/iridium/patches/patch-content_browser_time_zone_monitor_cc index 72e23cf4d32..509eef3904c 100644 --- a/www/iridium/patches/patch-content_browser_time_zone_monitor_cc +++ b/www/iridium/patches/patch-content_browser_time_zone_monitor_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-content_browser_time_zone_monitor_cc,v 1.2 2016/03/23 20:13:07 robert Exp $ ---- content/browser/time_zone_monitor.cc.orig.port Wed Feb 24 00:02:00 2016 -+++ content/browser/time_zone_monitor.cc Thu Mar 3 09:43:26 2016 +$OpenBSD: patch-content_browser_time_zone_monitor_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- content/browser/time_zone_monitor.cc.orig.port Wed Jul 20 21:03:24 2016 ++++ content/browser/time_zone_monitor.cc Thu Jul 21 10:25:30 2016 @@ -29,7 +29,7 @@ void TimeZoneMonitor::NotifyRenderers() { - scoped_ptr new_zone(icu::TimeZone::createDefault()); + std::unique_ptr new_zone(icu::TimeZone::createDefault()); #else icu::TimeZone* new_zone = icu::TimeZone::detectHostTimeZone(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // We get here multiple times on Linux per a single tz change, but // want to update the ICU default zone and notify renderer only once. - scoped_ptr current_zone(icu::TimeZone::createDefault()); + std::unique_ptr current_zone(icu::TimeZone::createDefault()); diff --git a/www/iridium/patches/patch-content_browser_utility_process_host_impl_cc b/www/iridium/patches/patch-content_browser_utility_process_host_impl_cc index fa6ca5bcc9f..ed9284ab4e1 100644 --- a/www/iridium/patches/patch-content_browser_utility_process_host_impl_cc +++ b/www/iridium/patches/patch-content_browser_utility_process_host_impl_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-content_browser_utility_process_host_impl_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- content/browser/utility_process_host_impl.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/browser/utility_process_host_impl.cc Thu May 26 08:09:46 2016 -@@ -37,7 +37,7 @@ - #include "ipc/ipc_switches.h" +$OpenBSD: patch-content_browser_utility_process_host_impl_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- content/browser/utility_process_host_impl.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/browser/utility_process_host_impl.cc Wed Oct 19 12:56:04 2016 +@@ -44,7 +44,7 @@ + #include "services/shell/public/cpp/interface_provider.h" #include "ui/base/ui_base_switches.h" -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) @@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_utility_process_host_impl_cc,v 1.2 2016/05/28 14 #include "content/public/browser/zygote_handle_linux.h" #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -@@ -48,7 +48,7 @@ +@@ -55,7 +55,7 @@ namespace content { @@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_utility_process_host_impl_cc,v 1.2 2016/05/28 14 namespace { ZygoteHandle g_utility_zygote; } // namespace -@@ -68,7 +68,7 @@ class UtilitySandboxedProcessLauncherDelegate +@@ -75,7 +75,7 @@ class UtilitySandboxedProcessLauncherDelegate launch_elevated_(launch_elevated) #elif defined(OS_POSIX) env_(env), @@ -28,7 +28,7 @@ $OpenBSD: patch-content_browser_utility_process_host_impl_cc,v 1.2 2016/05/28 14 no_sandbox_(no_sandbox), #endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) ipc_fd_(host->TakeClientFileDescriptor()) -@@ -100,7 +100,7 @@ class UtilitySandboxedProcessLauncherDelegate +@@ -107,7 +107,7 @@ class UtilitySandboxedProcessLauncherDelegate #elif defined(OS_POSIX) @@ -37,7 +37,7 @@ $OpenBSD: patch-content_browser_utility_process_host_impl_cc,v 1.2 2016/05/28 14 ZygoteHandle* GetZygote() override { if (no_sandbox_ || !exposed_dir_.empty()) return nullptr; -@@ -122,7 +122,7 @@ class UtilitySandboxedProcessLauncherDelegate +@@ -129,7 +129,7 @@ class UtilitySandboxedProcessLauncherDelegate bool launch_elevated_; #elif defined(OS_POSIX) base::EnvironmentMap env_; @@ -46,7 +46,7 @@ $OpenBSD: patch-content_browser_utility_process_host_impl_cc,v 1.2 2016/05/28 14 bool no_sandbox_; #endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) base::ScopedFD ipc_fd_; -@@ -231,7 +231,7 @@ void UtilityProcessHostImpl::SetName(const base::strin +@@ -238,7 +238,7 @@ void UtilityProcessHostImpl::SetName(const base::strin name_ = name; } diff --git a/www/iridium/patches/patch-content_common_BUILD_gn b/www/iridium/patches/patch-content_common_BUILD_gn new file mode 100644 index 00000000000..5c8bddc331f --- /dev/null +++ b/www/iridium/patches/patch-content_common_BUILD_gn @@ -0,0 +1,21 @@ +$OpenBSD: patch-content_common_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- content/common/BUILD.gn.orig.port Wed Oct 12 21:02:59 2016 ++++ content/common/BUILD.gn Wed Oct 19 12:56:04 2016 +@@ -133,6 +133,17 @@ source_set("common") { + libs += [ "android" ] + } + ++ if (is_openbsd) { ++ sources -= [ ++ "sandbox_linux/sandbox_linux.cc", ++ "sandbox_linux/sandbox_seccomp_bpf_linux.cc", ++ "sandbox_linux/sandbox_debug_handling_linux.cc" ++ ] ++ sources += [ ++ "sandbox_init_openbsd.cc" ++ ] ++ } ++ + if (is_debug && !is_component_build && enable_plugins) { + # Content depends on the PPAPI message logging stuff; if this isn't here, + # some unit test binaries won't compile. This only worked in release mode diff --git a/www/iridium/patches/patch-content_common_sandbox_init_openbsd_cc b/www/iridium/patches/patch-content_common_sandbox_init_openbsd_cc index bb8e137c808..d3be210ec61 100644 --- a/www/iridium/patches/patch-content_common_sandbox_init_openbsd_cc +++ b/www/iridium/patches/patch-content_common_sandbox_init_openbsd_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-content_common_sandbox_init_openbsd_cc,v 1.6 2016/07/12 06:05:32 robert Exp $ ---- content/common/sandbox_init_openbsd.cc.orig.port Thu May 26 08:09:46 2016 -+++ content/common/sandbox_init_openbsd.cc Thu May 26 14:18:22 2016 +$OpenBSD: patch-content_common_sandbox_init_openbsd_cc,v 1.7 2016/10/27 18:30:41 robert Exp $ +--- content/common/sandbox_init_openbsd.cc.orig.port Mon Jul 11 19:28:28 2016 ++++ content/common/sandbox_init_openbsd.cc Tue Jul 12 07:50:19 2016 @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2016 Robert Nagy diff --git a/www/iridium/patches/patch-content_common_sandbox_init_openbsd_h b/www/iridium/patches/patch-content_common_sandbox_init_openbsd_h index 093deaf2351..b454dcb26ae 100644 --- a/www/iridium/patches/patch-content_common_sandbox_init_openbsd_h +++ b/www/iridium/patches/patch-content_common_sandbox_init_openbsd_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-content_common_sandbox_init_openbsd_h,v 1.1 2016/01/07 07:26:40 robert Exp $ +$OpenBSD: patch-content_common_sandbox_init_openbsd_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- content/common/sandbox_init_openbsd.h.orig.port Sun Jan 3 21:05:04 2016 +++ content/common/sandbox_init_openbsd.h Mon Jan 4 08:17:09 2016 @@ -0,0 +1,28 @@ diff --git a/www/iridium/patches/patch-content_common_set_process_title_linux_cc b/www/iridium/patches/patch-content_common_set_process_title_linux_cc index 245c3350829..c099652ce86 100644 --- a/www/iridium/patches/patch-content_common_set_process_title_linux_cc +++ b/www/iridium/patches/patch-content_common_set_process_title_linux_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-content_common_set_process_title_linux_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-content_common_set_process_title_linux_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- content/common/set_process_title_linux.cc.orig.port Wed Feb 24 00:02:00 2016 +++ content/common/set_process_title_linux.cc Thu Mar 3 09:43:26 2016 @@ -49,6 +49,8 @@ diff --git a/www/iridium/patches/patch-content_common_set_process_title_linux_h b/www/iridium/patches/patch-content_common_set_process_title_linux_h index 48dc5217446..b08c07cb6b1 100644 --- a/www/iridium/patches/patch-content_common_set_process_title_linux_h +++ b/www/iridium/patches/patch-content_common_set_process_title_linux_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-content_common_set_process_title_linux_h,v 1.2 2015/05/06 14:27:24 robert Exp $ +$OpenBSD: patch-content_common_set_process_title_linux_h,v 1.3 2016/10/27 18:30:41 robert Exp $ --- content/common/set_process_title_linux.h.orig.port Sun Oct 20 19:00:29 2013 +++ content/common/set_process_title_linux.h Sun Oct 20 19:00:48 2013 @@ -5,6 +5,9 @@ diff --git a/www/iridium/patches/patch-content_content_browser_gypi b/www/iridium/patches/patch-content_content_browser_gypi deleted file mode 100644 index 821af43186d..00000000000 --- a/www/iridium/patches/patch-content_content_browser_gypi +++ /dev/null @@ -1,70 +0,0 @@ -$OpenBSD: patch-content_content_browser_gypi,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- content/content_browser.gypi.orig.port Wed May 25 21:01:01 2016 -+++ content/content_browser.gypi Thu May 26 08:09:46 2016 -@@ -2013,7 +2013,7 @@ - }, - }, - }], -- ['OS=="linux" and chromeos==0 and use_x11==1', { -+ ['(os_bsd==1 or OS=="linux") and chromeos==0 and use_x11==1', { - 'dependencies': [ - '../build/linux/system.gyp:atk', - '../build/linux/system.gyp:gconf', -@@ -2040,7 +2040,7 @@ - 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', - ], - }], -- ['OS=="linux" and use_aura==1', { -+ ['(os_bsd==1 or OS=="linux") and use_aura==1', { - 'dependencies': [ - '../build/linux/system.gyp:fontconfig', - ], -@@ -2131,9 +2131,25 @@ - ], - }], - ['os_bsd==1', { -- 'sources/': [ -- ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'], -+ 'sources!': [ -+ 'public/browser/zygote_host_linux.h', -+ 'browser/zygote_host/zygote_communication_linux.cc', -+ 'browser/zygote_host/zygote_communication_linux.h', -+ 'browser/zygote_host/zygote_handle_linux.cc', -+ 'browser/zygote_host/zygote_host_impl_linux.cc', -+ 'browser/zygote_host/zygote_host_impl_linux.h', -+ 'zygote/zygote_linux.cc', -+ 'zygote/zygote_linux.h', -+ 'zygote/zygote_main_linux.cc', -+ 'browser/device_monitor_linux.cc', -+ 'browser/download/file_metadata_linux.cc', -+ 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', -+ 'browser/geolocation/wifi_data_provider_linux.cc', -+ 'browser/udev_linux.cc', - ], -+ 'dependencies': [ -+ '../build/linux/system.gyp:dbus', -+ ], - }], - ['use_aura==1', { - 'dependencies': [ -@@ -2181,10 +2197,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', { - 'dependencies': [ - '../build/linux/system.gyp:dbus', - '../dbus/dbus.gyp:dbus', -@@ -2200,7 +2213,7 @@ - 'browser/media/cdm/browser_cdm_manager.h', - ], - }], -- ['OS == "linux"', { -+ ['(os_bsd==1 or OS == "linux")', { - 'dependencies': [ - '../third_party/boringssl/boringssl.gyp:boringssl', - ], diff --git a/www/iridium/patches/patch-content_content_common_gypi b/www/iridium/patches/patch-content_content_common_gypi deleted file mode 100644 index 21236edb9d0..00000000000 --- a/www/iridium/patches/patch-content_content_common_gypi +++ /dev/null @@ -1,47 +0,0 @@ -$OpenBSD: patch-content_content_common_gypi,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- content/content_common.gypi.orig.port Wed May 25 21:01:01 2016 -+++ content/content_common.gypi Thu May 26 08:09:46 2016 -@@ -515,6 +515,8 @@ - 'common/resource_request_body.h', - 'common/sandbox_init_mac.cc', - 'common/sandbox_init_mac.h', -+ 'common/sandbox_init_openbsd.cc', -+ 'common/sandbox_init_openbsd.h', - 'common/sandbox_init_win.cc', - 'common/sandbox_linux/android/sandbox_bpf_base_policy_android.cc', - 'common/sandbox_linux/android/sandbox_bpf_base_policy_android.h', -@@ -671,6 +673,34 @@ - 'dependencies': [ - 'content.gyp:content_jni_headers', - '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', - ], - }], - ['use_pango == 1', { diff --git a/www/iridium/patches/patch-content_content_renderer_gypi b/www/iridium/patches/patch-content_content_renderer_gypi deleted file mode 100644 index 3c09d1c9a30..00000000000 --- a/www/iridium/patches/patch-content_content_renderer_gypi +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-content_content_renderer_gypi,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- content/content_renderer.gypi.orig.port Wed May 25 21:01:01 2016 -+++ content/content_renderer.gypi Thu May 26 08:09:46 2016 -@@ -26,6 +26,7 @@ - '../mojo/mojo_base.gyp:mojo_geometry_lib', - '../mojo/mojo_base.gyp:mojo_url_type_converters', - '../mojo/mojo_edk.gyp:mojo_js_lib', -+ '../third_party/libyuv/libyuv.gyp:libyuv', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../skia/skia.gyp:skia_mojo', diff --git a/www/iridium/patches/patch-content_gpu_gpu_main_cc b/www/iridium/patches/patch-content_gpu_gpu_main_cc index 9564e894f9e..bbad63742b4 100644 --- a/www/iridium/patches/patch-content_gpu_gpu_main_cc +++ b/www/iridium/patches/patch-content_gpu_gpu_main_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_gpu_gpu_main_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- content/gpu/gpu_main.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/gpu/gpu_main.cc Thu May 26 08:09:46 2016 -@@ -74,6 +74,10 @@ +$OpenBSD: patch-content_gpu_gpu_main_cc,v 1.12 2016/10/27 18:30:41 robert Exp $ +--- content/gpu/gpu_main.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/gpu/gpu_main.cc Wed Oct 19 12:56:04 2016 +@@ -77,6 +77,10 @@ #include "content/common/sandbox_mac.h" #endif @@ -10,9 +10,9 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ +#endif + #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) - #include "content/common/gpu/media/vaapi_wrapper.h" + #include "media/gpu/vaapi_wrapper.h" #endif -@@ -101,8 +105,8 @@ bool WarmUpSandbox(const base::CommandLine& command_li +@@ -108,8 +112,8 @@ bool WarmUpSandbox(const base::CommandLine& command_li bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); #endif @@ -23,23 +23,23 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ bool CanAccessNvidiaDeviceFile(); #endif bool StartSandboxLinux(const gpu::GPUInfo&, GpuWatchdogThread*, bool); -@@ -185,13 +189,13 @@ int GpuMain(const MainFunctionParams& parameters) { - // Use a UI message loop because ANGLE and the desktop GL platform can +@@ -195,13 +199,13 @@ int GpuMain(const MainFunctionParams& parameters) { // create child windows to render to. + base::MessagePumpForGpu::InitFactory(); base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); -#elif defined(OS_LINUX) && defined(USE_X11) +#elif (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX // and https://crbug.com/326995. base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); - scoped_ptr event_source = + std::unique_ptr event_source = ui::PlatformEventSource::CreateDefault(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) 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 -@@ -256,7 +260,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -266,7 +270,7 @@ int GpuMain(const MainFunctionParams& parameters) { // Warm up resources that don't need access to GPUInfo. if (WarmUpSandbox(command_line)) { @@ -48,9 +48,9 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ bool initialized_sandbox = false; bool initialized_gl_context = false; bool should_initialize_gl_context = false; -@@ -321,9 +325,9 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -329,9 +333,9 @@ int GpuMain(const MainFunctionParams& parameters) { + gpu_info, const_cast(&command_line)); } - #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) @@ -60,7 +60,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ if (gpu_info.gpu.vendor_id == 0x10de && // NVIDIA gpu_info.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) -@@ -360,7 +364,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -368,7 +372,7 @@ int GpuMain(const MainFunctionParams& parameters) { watchdog_thread = NULL; } @@ -69,7 +69,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ should_initialize_gl_context = !initialized_gl_context && !dead_on_arrival; -@@ -368,6 +372,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -376,6 +380,7 @@ int GpuMain(const MainFunctionParams& parameters) { gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(), should_initialize_gl_context); } @@ -77,7 +77,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ #elif defined(OS_WIN) gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info); #elif defined(OS_MACOSX) -@@ -483,8 +488,8 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { +@@ -520,8 +525,8 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { } #endif @@ -88,7 +88,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ bool CanAccessNvidiaDeviceFile() { bool res = true; base::ThreadRestrictions::AssertIOAllowed(); -@@ -542,6 +547,7 @@ bool StartSandboxLinux(const gpu::GPUInfo& gpu_info, +@@ -579,6 +584,7 @@ bool StartSandboxLinux(const gpu::GPUInfo& gpu_info, WarmUpSandboxNvidia(gpu_info, should_initialize_gl_context); @@ -96,7 +96,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ if (watchdog_thread) { // LinuxSandbox needs to be able to ensure that the thread // has really been stopped. -@@ -561,11 +567,15 @@ bool StartSandboxLinux(const gpu::GPUInfo& gpu_info, +@@ -598,11 +604,15 @@ bool StartSandboxLinux(const gpu::GPUInfo& gpu_info, // LinuxSandbox::InitializeSandbox() must always be called // with only one thread. res = LinuxSandbox::InitializeSandbox(); diff --git a/www/iridium/patches/patch-content_ppapi_plugin_ppapi_plugin_main_cc b/www/iridium/patches/patch-content_ppapi_plugin_ppapi_plugin_main_cc index bd311352533..7e856a6ebfb 100644 --- a/www/iridium/patches/patch-content_ppapi_plugin_ppapi_plugin_main_cc +++ b/www/iridium/patches/patch-content_ppapi_plugin_ppapi_plugin_main_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_ppapi_plugin_ppapi_plugin_main_cc,v 1.3 2016/05/28 14:49:39 robert Exp $ ---- content/ppapi_plugin/ppapi_plugin_main.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/ppapi_plugin/ppapi_plugin_main.cc Thu May 26 08:09:46 2016 -@@ -47,6 +47,10 @@ +$OpenBSD: patch-content_ppapi_plugin_ppapi_plugin_main_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- content/ppapi_plugin/ppapi_plugin_main.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/ppapi_plugin/ppapi_plugin_main.cc Wed Oct 19 12:56:04 2016 +@@ -49,6 +49,10 @@ #include "gin/v8_initializer.h" #endif @@ -12,7 +12,7 @@ $OpenBSD: patch-content_ppapi_plugin_ppapi_plugin_main_cc,v 1.3 2016/05/28 14:49 #if defined(OS_POSIX) && !defined(OS_ANDROID) #include #endif -@@ -132,6 +136,8 @@ int PpapiPluginMain(const MainFunctionParams& paramete +@@ -122,6 +126,8 @@ int PpapiPluginMain(const MainFunctionParams& paramete #if defined(OS_LINUX) LinuxSandbox::InitializeSandbox(); diff --git a/www/iridium/patches/patch-content_public_common_content_switches_cc b/www/iridium/patches/patch-content_public_common_content_switches_cc index b237abc1983..7b28a4d932c 100644 --- a/www/iridium/patches/patch-content_public_common_content_switches_cc +++ b/www/iridium/patches/patch-content_public_common_content_switches_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_public_common_content_switches_cc,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- content/public/common/content_switches.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/public/common/content_switches.cc Sat May 28 10:25:28 2016 -@@ -633,6 +633,8 @@ const char kNoReferrers[] = "no-refe +$OpenBSD: patch-content_public_common_content_switches_cc,v 1.12 2016/10/27 18:30:41 robert Exp $ +--- content/public/common/content_switches.cc.orig.port Fri Oct 21 00:02:04 2016 ++++ content/public/common/content_switches.cc Thu Oct 27 14:47:33 2016 +@@ -681,6 +681,8 @@ const char kNoReferrers[] = "no-refe // Disables the sandbox for all process types that are normally sandboxed. const char kNoSandbox[] = "no-sandbox"; @@ -10,7 +10,7 @@ $OpenBSD: patch-content_public_common_content_switches_cc,v 1.11 2016/05/28 14:4 // Enable or disable appcontainer/lowbox for renderer on Win8+ platforms. const char kEnableAppContainer[] = "enable-appcontainer"; const char kDisableAppContainer[] = "disable-appcontainer"; -@@ -963,7 +965,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] = +@@ -1007,7 +1009,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] = "disable-vaapi-accelerated-video-encode"; #endif diff --git a/www/iridium/patches/patch-content_public_common_content_switches_h b/www/iridium/patches/patch-content_public_common_content_switches_h index 8a88348a243..98a980f53f0 100644 --- a/www/iridium/patches/patch-content_public_common_content_switches_h +++ b/www/iridium/patches/patch-content_public_common_content_switches_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_public_common_content_switches_h,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- content/public/common/content_switches.h.orig.port Wed May 25 21:01:01 2016 -+++ content/public/common/content_switches.h Sat May 28 10:25:28 2016 -@@ -186,6 +186,7 @@ extern const char kMojoLocalStorage[]; +$OpenBSD: patch-content_public_common_content_switches_h,v 1.12 2016/10/27 18:30:41 robert Exp $ +--- content/public/common/content_switches.h.orig.port Fri Oct 21 00:02:04 2016 ++++ content/public/common/content_switches.h Thu Oct 27 14:47:59 2016 +@@ -205,6 +205,7 @@ CONTENT_EXPORT extern const char kMojoLocalStorage[]; CONTENT_EXPORT extern const char kMuteAudio[]; CONTENT_EXPORT extern const char kNoReferrers[]; CONTENT_EXPORT extern const char kNoSandbox[]; @@ -9,7 +9,7 @@ $OpenBSD: patch-content_public_common_content_switches_h,v 1.11 2016/05/28 14:49 CONTENT_EXPORT extern const char kEnableAppContainer[]; CONTENT_EXPORT extern const char kDisableAppContainer[]; CONTENT_EXPORT extern const char kNumRasterThreads[]; -@@ -277,7 +278,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[ +@@ -296,7 +297,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[ CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; #endif diff --git a/www/iridium/patches/patch-content_renderer_devtools_v8_sampling_profiler_cc b/www/iridium/patches/patch-content_renderer_devtools_v8_sampling_profiler_cc index b5c4e5385d2..381318b121d 100644 --- a/www/iridium/patches/patch-content_renderer_devtools_v8_sampling_profiler_cc +++ b/www/iridium/patches/patch-content_renderer_devtools_v8_sampling_profiler_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_renderer_devtools_v8_sampling_profiler_cc,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- content/renderer/devtools/v8_sampling_profiler.cc.orig.port Wed May 25 21:01:01 2016 -+++ content/renderer/devtools/v8_sampling_profiler.cc Thu May 26 08:09:46 2016 -@@ -21,7 +21,7 @@ +$OpenBSD: patch-content_renderer_devtools_v8_sampling_profiler_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- content/renderer/devtools/v8_sampling_profiler.cc.orig.port Wed Jul 20 21:03:24 2016 ++++ content/renderer/devtools/v8_sampling_profiler.cc Thu Jul 21 10:25:30 2016 +@@ -20,7 +20,7 @@ #include "content/renderer/render_thread_impl.h" #include "v8/include/v8.h" @@ -10,7 +10,7 @@ $OpenBSD: patch-content_renderer_devtools_v8_sampling_profiler_cc,v 1.4 2016/05/ #include #define USE_SIGNALS #endif -@@ -205,7 +205,10 @@ class Sampler { +@@ -204,7 +204,10 @@ class Sampler { static const unsigned kNumberOfSamples = 10; typedef LockFreeCircularQueue SamplingQueue; @@ -19,9 +19,9 @@ $OpenBSD: patch-content_renderer_devtools_v8_sampling_profiler_cc,v 1.4 2016/05/ +#endif + Isolate* isolate_; - scoped_ptr samples_data_; + std::unique_ptr samples_data_; base::subtle::Atomic32 code_added_events_count_; -@@ -299,6 +302,7 @@ void Sampler::DoSample(const v8::RegisterState& state) +@@ -298,6 +301,7 @@ void Sampler::DoSample(const v8::RegisterState& state) } void Sampler::InjectPendingEvents() { @@ -29,7 +29,7 @@ $OpenBSD: patch-content_renderer_devtools_v8_sampling_profiler_cc,v 1.4 2016/05/ SampleRecord* record = samples_data_->Peek(); while (record) { TRACE_EVENT_SAMPLE_WITH_TID_AND_TIMESTAMP1( -@@ -310,6 +314,7 @@ void Sampler::InjectPendingEvents() { +@@ -309,6 +313,7 @@ void Sampler::InjectPendingEvents() { record = samples_data_->Peek(); base::subtle::NoBarrier_AtomicIncrement(&samples_count_, 1); } diff --git a/www/iridium/patches/patch-content_renderer_media_webrtc_audio_renderer_cc b/www/iridium/patches/patch-content_renderer_media_webrtc_audio_renderer_cc deleted file mode 100644 index b6e148ca001..00000000000 --- a/www/iridium/patches/patch-content_renderer_media_webrtc_audio_renderer_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-content_renderer_media_webrtc_audio_renderer_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- content/renderer/media/webrtc_audio_renderer.cc.orig.port Wed May 25 21:01:02 2016 -+++ content/renderer/media/webrtc_audio_renderer.cc Thu May 26 08:09:46 2016 -@@ -162,7 +162,7 @@ int WebRtcAudioRenderer::GetOptimalBufferSize(int samp - // Windows below. - int frames_per_buffer = hardware_buffer_size; - --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - // On Linux and MacOS, the low level IO implementations on the browser side - // supports all buffer size the clients want. We use the native peer - // connection buffer size (10ms) to achieve best possible performance. diff --git a/www/iridium/patches/patch-content_renderer_render_thread_impl_cc b/www/iridium/patches/patch-content_renderer_render_thread_impl_cc index ae49d46a84b..5642b4a9674 100644 --- a/www/iridium/patches/patch-content_renderer_render_thread_impl_cc +++ b/www/iridium/patches/patch-content_renderer_render_thread_impl_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-content_renderer_render_thread_impl_cc,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- content/renderer/render_thread_impl.cc.orig.port Thu May 26 08:29:50 2016 -+++ content/renderer/render_thread_impl.cc Thu May 26 08:29:56 2016 -@@ -1468,7 +1468,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: - const bool enable_video_accelerator = - !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); - const bool enable_gpu_memory_buffer_video_frames = +$OpenBSD: patch-content_renderer_render_thread_impl_cc,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- content/renderer/render_thread_impl.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/renderer/render_thread_impl.cc Wed Oct 19 12:56:05 2016 +@@ -1455,7 +1455,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + const bool enable_video_accelerator = + !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); + const bool enable_gpu_memory_buffer_video_frames = -#if defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && - !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && - !gpu_channel_host->gpu_info().software_rendering; + !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && + !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && + !gpu_channel_host->gpu_info().software_rendering; diff --git a/www/iridium/patches/patch-content_renderer_renderer_main_cc b/www/iridium/patches/patch-content_renderer_renderer_main_cc index 55aa0c1f729..6e313b5a993 100644 --- a/www/iridium/patches/patch-content_renderer_renderer_main_cc +++ b/www/iridium/patches/patch-content_renderer_renderer_main_cc @@ -1,15 +1,15 @@ -$OpenBSD: patch-content_renderer_renderer_main_cc,v 1.6 2016/05/28 14:49:39 robert Exp $ ---- content/renderer/renderer_main.cc.orig.port Wed May 25 21:01:02 2016 -+++ content/renderer/renderer_main.cc Thu May 26 08:09:46 2016 -@@ -31,6 +31,7 @@ - #include "content/renderer/render_thread_impl.h" +$OpenBSD: patch-content_renderer_renderer_main_cc,v 1.7 2016/10/27 18:30:41 robert Exp $ +--- content/renderer/renderer_main.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/renderer/renderer_main.cc Wed Oct 19 12:56:05 2016 +@@ -32,6 +32,7 @@ #include "content/renderer/renderer_main_platform_delegate.h" + #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h" #include "third_party/skia/include/core/SkGraphics.h" +#include "third_party/skia/include/ports/SkFontConfigInterface.h" #include "ui/base/ui_base_switches.h" #if defined(OS_ANDROID) -@@ -59,6 +60,11 @@ +@@ -60,6 +61,11 @@ #include "ui/ozone/public/client_native_pixmap_factory.h" #endif @@ -21,7 +21,7 @@ $OpenBSD: patch-content_renderer_renderer_main_cc,v 1.6 2016/05/28 14:49:39 robe namespace content { namespace { // This function provides some ways to test crash and assertion handling -@@ -170,9 +176,13 @@ int RendererMain(const MainFunctionParams& parameters) +@@ -169,9 +175,13 @@ int RendererMain(const MainFunctionParams& parameters) // is OK. InitializeWebRtcModule(); #endif @@ -36,7 +36,7 @@ $OpenBSD: patch-content_renderer_renderer_main_cc,v 1.6 2016/05/28 14:49:39 robe // TODO(markus): Check if it is OK to unconditionally move this // instruction down. RenderProcessImpl render_process; -@@ -182,7 +192,7 @@ int RendererMain(const MainFunctionParams& parameters) +@@ -181,7 +191,7 @@ int RendererMain(const MainFunctionParams& parameters) bool run_loop = true; if (!no_sandbox) run_loop = platform.EnableSandbox(); diff --git a/www/iridium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc b/www/iridium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc index 650449cf210..6bf4378db28 100644 --- a/www/iridium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc +++ b/www/iridium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-content_renderer_renderer_main_platform_delegate_linux_cc,v 1.5 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-content_renderer_renderer_main_platform_delegate_linux_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ --- content/renderer/renderer_main_platform_delegate_linux.cc.orig.port Fri Apr 8 18:02:09 2016 +++ content/renderer/renderer_main_platform_delegate_linux.cc Thu Apr 14 08:25:12 2016 @@ -10,7 +10,11 @@ diff --git a/www/iridium/patches/patch-content_renderer_webscrollbarbehavior_impl_gtkoraura_cc b/www/iridium/patches/patch-content_renderer_webscrollbarbehavior_impl_gtkoraura_cc index 8c2dab1b9db..e603c95ec6b 100644 --- a/www/iridium/patches/patch-content_renderer_webscrollbarbehavior_impl_gtkoraura_cc +++ b/www/iridium/patches/patch-content_renderer_webscrollbarbehavior_impl_gtkoraura_cc @@ -1,13 +1,13 @@ -$OpenBSD: patch-content_renderer_webscrollbarbehavior_impl_gtkoraura_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ ---- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig.port Wed Feb 24 00:02:00 2016 -+++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc Thu Mar 3 09:43:26 2016 +$OpenBSD: patch-content_renderer_webscrollbarbehavior_impl_gtkoraura_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig.port Wed Oct 19 13:47:24 2016 ++++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc Wed Oct 19 13:47:45 2016 @@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::shouldCenterOnThumb( - blink::WebScrollbarBehavior::Button mouseButton, + blink::WebPointerProperties::Button mouseButton, bool shiftKeyPressed, bool altKeyPressed) { -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - if (mouseButton == blink::WebScrollbarBehavior::ButtonMiddle) + if (mouseButton == blink::WebPointerProperties::Button::Middle) return true; #endif @@ -50,7 +50,7 @@ bool WebScrollbarBehaviorImpl::shouldSnapBackToDragOri diff --git a/www/iridium/patches/patch-content_shell_browser_shell_browser_context_cc b/www/iridium/patches/patch-content_shell_browser_shell_browser_context_cc new file mode 100644 index 00000000000..624c07a93d2 --- /dev/null +++ b/www/iridium/patches/patch-content_shell_browser_shell_browser_context_cc @@ -0,0 +1,21 @@ +$OpenBSD: patch-content_shell_browser_shell_browser_context_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- content/shell/browser/shell_browser_context.cc.orig.port Tue Oct 25 21:56:44 2016 ++++ content/shell/browser/shell_browser_context.cc Tue Oct 25 22:11:34 2016 +@@ -24,7 +24,7 @@ + + #if defined(OS_WIN) + #include "base/base_paths_win.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "base/nix/xdg_util.h" + #elif defined(OS_MACOSX) + #include "base/base_paths_mac.h" +@@ -81,7 +81,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { + #if defined(OS_WIN) + CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); + path_ = path_.Append(std::wstring(L"content_shell")); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + std::unique_ptr env(base::Environment::Create()); + base::FilePath config_dir( + base::nix::GetXDGDirectory(env.get(), diff --git a/www/iridium/patches/patch-content_shell_browser_shell_browser_main_parts_cc b/www/iridium/patches/patch-content_shell_browser_shell_browser_main_parts_cc new file mode 100644 index 00000000000..7f0bba7a9bd --- /dev/null +++ b/www/iridium/patches/patch-content_shell_browser_shell_browser_main_parts_cc @@ -0,0 +1,21 @@ +$OpenBSD: patch-content_shell_browser_shell_browser_main_parts_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- content/shell/browser/shell_browser_main_parts.cc.orig.port Tue Oct 25 21:56:44 2016 ++++ content/shell/browser/shell_browser_main_parts.cc Tue Oct 25 22:12:06 2016 +@@ -44,7 +44,7 @@ + #if defined(USE_AURA) && defined(USE_X11) + #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck + #endif +-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) ++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) + #include "ui/base/ime/input_method_initializer.h" + #endif + #if defined(OS_CHROMEOS) +@@ -143,7 +143,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() + } + + void ShellBrowserMainParts::PreEarlyInitialization() { +-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) ++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) + ui::InitializeInputMethodForTesting(); + #endif + #if defined(OS_ANDROID) diff --git a/www/iridium/patches/patch-content_utility_utility_main_cc b/www/iridium/patches/patch-content_utility_utility_main_cc index 26ebea5e80d..0a312572fb6 100644 --- a/www/iridium/patches/patch-content_utility_utility_main_cc +++ b/www/iridium/patches/patch-content_utility_utility_main_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_utility_utility_main_cc,v 1.2 2016/03/23 20:13:07 robert Exp $ ---- content/utility/utility_main.cc.orig.port Wed Feb 24 00:02:00 2016 -+++ content/utility/utility_main.cc Thu Mar 3 09:43:26 2016 -@@ -10,6 +10,7 @@ +$OpenBSD: patch-content_utility_utility_main_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- content/utility/utility_main.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ content/utility/utility_main.cc Wed Oct 19 12:56:05 2016 +@@ -11,6 +11,7 @@ #include "build/build_config.h" #include "content/child/child_process.h" #include "content/common/sandbox_linux/sandbox_linux.h" @@ -9,7 +9,7 @@ $OpenBSD: patch-content_utility_utility_main_cc,v 1.2 2016/03/23 20:13:07 robert #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" #include "content/public/common/sandbox_init.h" -@@ -34,6 +35,8 @@ int UtilityMain(const MainFunctionParams& parameters) +@@ -35,6 +36,8 @@ int UtilityMain(const MainFunctionParams& parameters) // Seccomp-BPF policy. if (parameters.zygote_child) LinuxSandbox::InitializeSandbox(); diff --git a/www/iridium/patches/patch-content_zygote_zygote_main_linux_cc b/www/iridium/patches/patch-content_zygote_zygote_main_linux_cc new file mode 100644 index 00000000000..9a618c009a4 --- /dev/null +++ b/www/iridium/patches/patch-content_zygote_zygote_main_linux_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-content_zygote_zygote_main_linux_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- content/zygote/zygote_main_linux.cc.orig.port Sat Oct 22 16:24:09 2016 ++++ content/zygote/zygote_main_linux.cc Sat Oct 22 16:24:23 2016 +@@ -134,7 +134,7 @@ static void ProxyLocaltimeCallToBrowser(time_t input, + } else { + base::AutoLock lock(g_timezones_lock.Get()); + auto ret_pair = g_timezones.Get().insert(timezone); +- output->tm_zone = ret_pair.first->c_str(); ++//XXX output->tm_zone = ret_pair.first->c_str(); + } + } + diff --git a/www/iridium/patches/patch-dbus_property_cc b/www/iridium/patches/patch-dbus_property_cc index 7bb8a4d069d..cae0356b27c 100644 --- a/www/iridium/patches/patch-dbus_property_cc +++ b/www/iridium/patches/patch-dbus_property_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-dbus_property_cc,v 1.6 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-dbus_property_cc,v 1.7 2016/10/27 18:30:41 robert Exp $ --- dbus/property.cc.orig.port Wed May 25 04:54:16 2016 +++ dbus/property.cc Thu May 26 08:09:46 2016 @@ -562,6 +562,7 @@ void Property>::AppendSetValueToW diff --git a/www/iridium/patches/patch-device_battery_battery_gyp b/www/iridium/patches/patch-device_battery_battery_gyp deleted file mode 100644 index bd27c3524df..00000000000 --- a/www/iridium/patches/patch-device_battery_battery_gyp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-device_battery_battery_gyp,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- device/battery/battery.gyp.orig.port Wed May 25 21:01:02 2016 -+++ device/battery/battery.gyp Thu May 26 08:09:46 2016 -@@ -122,7 +122,7 @@ - 'battery_status_manager_linux.cc', - ], - }], -- ['OS == "linux" and use_dbus==1', { -+ ['(os_bsd==1 or OS == "linux") and use_dbus==1', { - 'sources!': [ - 'battery_status_manager_default.cc', - ], diff --git a/www/iridium/patches/patch-device_bluetooth_BUILD_gn b/www/iridium/patches/patch-device_bluetooth_BUILD_gn new file mode 100644 index 00000000000..ab8833c91a1 --- /dev/null +++ b/www/iridium/patches/patch-device_bluetooth_BUILD_gn @@ -0,0 +1,12 @@ +$OpenBSD: patch-device_bluetooth_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- device/bluetooth/BUILD.gn.orig.port Wed Oct 12 21:02:59 2016 ++++ device/bluetooth/BUILD.gn Wed Oct 19 12:56:05 2016 +@@ -179,7 +179,7 @@ component("bluetooth") { + ] + } + +- if (is_chromeos || is_linux) { ++ if (is_chromeos || (is_linux && !is_openbsd)) { + if (use_dbus) { + sources += [ + "bluez/bluetooth_adapter_bluez.cc", diff --git a/www/iridium/patches/patch-device_gamepad_gamepad_provider_cc b/www/iridium/patches/patch-device_gamepad_gamepad_provider_cc new file mode 100644 index 00000000000..54a3120becf --- /dev/null +++ b/www/iridium/patches/patch-device_gamepad_gamepad_provider_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-device_gamepad_gamepad_provider_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- device/gamepad/gamepad_provider.cc.orig.port Wed Oct 12 21:02:59 2016 ++++ device/gamepad/gamepad_provider.cc Wed Oct 19 12:56:05 2016 +@@ -136,7 +136,7 @@ void GamepadProvider::Initialize(std::unique_ptrAddDevicesChangedObserver(this); + + polling_thread_.reset(new base::Thread("Gamepad polling thread")); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux, the data fetcher needs to watch file descriptors, so the message + // loop needs to be a libevent loop. + const base::MessageLoop::Type kMessageLoopType = base::MessageLoop::TYPE_IO; diff --git a/www/iridium/patches/patch-device_geolocation_location_arbitrator_impl_cc b/www/iridium/patches/patch-device_geolocation_location_arbitrator_impl_cc new file mode 100644 index 00000000000..b80e69f6bf4 --- /dev/null +++ b/www/iridium/patches/patch-device_geolocation_location_arbitrator_impl_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-device_geolocation_location_arbitrator_impl_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- device/geolocation/location_arbitrator_impl.cc.orig.port Wed Oct 19 13:43:55 2016 ++++ device/geolocation/location_arbitrator_impl.cc Wed Oct 19 13:44:05 2016 +@@ -167,7 +167,7 @@ LocationArbitratorImpl::NewNetworkLocationProvider( + + std::unique_ptr + LocationArbitratorImpl::NewSystemLocationProvider() { +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + return nullptr; + #else + return device::NewSystemLocationProvider(); diff --git a/www/iridium/patches/patch-device_hid_BUILD_gn b/www/iridium/patches/patch-device_hid_BUILD_gn new file mode 100644 index 00000000000..2ece67be430 --- /dev/null +++ b/www/iridium/patches/patch-device_hid_BUILD_gn @@ -0,0 +1,17 @@ +$OpenBSD: patch-device_hid_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- device/hid/BUILD.gn.orig.port Thu Sep 1 00:03:32 2016 ++++ device/hid/BUILD.gn Thu Sep 1 11:12:23 2016 +@@ -44,6 +44,13 @@ source_set("hid") { + "//net", + ] + ++ if (is_openbsd) { ++ sources -= [ ++ "hid_connection_linux.cc", ++ "hid_connection_linux.h", ++ ] ++ } ++ + if (is_linux && use_udev) { + sources += [ + "fake_input_service_linux.cc", diff --git a/www/iridium/patches/patch-device_hid_hid_gyp b/www/iridium/patches/patch-device_hid_hid_gyp deleted file mode 100644 index c9fedb18bc3..00000000000 --- a/www/iridium/patches/patch-device_hid_hid_gyp +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-device_hid_hid_gyp,v 1.6 2016/05/28 14:49:39 robert Exp $ ---- device/hid/hid.gyp.orig.port Wed May 25 04:54:16 2016 -+++ device/hid/hid.gyp Thu May 26 08:09:47 2016 -@@ -84,6 +84,18 @@ - }, - }, - }], -+ ['OS=="openbsd"', { -+ 'sources!': [ -+ 'device_monitor_linux.cc', -+ 'device_monitor_linux.h', -+ 'hid_connection_linux.cc', -+ 'hid_connection_linux.h', -+ 'hid_service_linux.cc', -+ 'hid_service_linux.h', -+ 'input_service_linux.cc', -+ 'input_service_linux.h', -+ ], -+ }], - ], - }, - { diff --git a/www/iridium/patches/patch-device_media_transfer_protocol_media_transfer_protocol_daemon_client_h b/www/iridium/patches/patch-device_media_transfer_protocol_media_transfer_protocol_daemon_client_h new file mode 100644 index 00000000000..a29bfbee0e3 --- /dev/null +++ b/www/iridium/patches/patch-device_media_transfer_protocol_media_transfer_protocol_daemon_client_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-device_media_transfer_protocol_media_transfer_protocol_daemon_client_h,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- device/media_transfer_protocol/media_transfer_protocol_daemon_client.h.orig.port Sun Aug 14 22:49:26 2016 ++++ device/media_transfer_protocol/media_transfer_protocol_daemon_client.h Sun Aug 14 22:49:33 2016 +@@ -19,7 +19,7 @@ + #include "base/macros.h" + #include "build/build_config.h" + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + #error "Only used on Linux and ChromeOS" + #endif + diff --git a/www/iridium/patches/patch-device_media_transfer_protocol_media_transfer_protocol_manager_h b/www/iridium/patches/patch-device_media_transfer_protocol_media_transfer_protocol_manager_h new file mode 100644 index 00000000000..db503981e71 --- /dev/null +++ b/www/iridium/patches/patch-device_media_transfer_protocol_media_transfer_protocol_manager_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-device_media_transfer_protocol_media_transfer_protocol_manager_h,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig.port Sun Aug 14 23:38:26 2016 ++++ device/media_transfer_protocol/media_transfer_protocol_manager.h Sun Aug 14 23:38:31 2016 +@@ -15,7 +15,7 @@ + #include "base/memory/ref_counted.h" + #include "build/build_config.h" + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + #error "Only used on Linux and ChromeOS" + #endif + diff --git a/www/iridium/patches/patch-device_serial_BUILD_gn b/www/iridium/patches/patch-device_serial_BUILD_gn new file mode 100644 index 00000000000..3d523eb8de3 --- /dev/null +++ b/www/iridium/patches/patch-device_serial_BUILD_gn @@ -0,0 +1,17 @@ +$OpenBSD: patch-device_serial_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- device/serial/BUILD.gn.orig.port Sun Aug 14 22:32:10 2016 ++++ device/serial/BUILD.gn Sun Aug 14 22:32:51 2016 +@@ -67,6 +67,13 @@ static_library("serial") { + "//third_party/re2", + ] + ++ if (is_openbsd) { ++ sources -= [ ++ "serial_device_enumerator_linux.cc", ++ "serial_device_enumerator_linux.h" ++ ] ++ } ++ + if (use_udev) { + deps += [ "//device/udev_linux" ] + } diff --git a/www/iridium/patches/patch-device_serial_serial_gyp b/www/iridium/patches/patch-device_serial_serial_gyp deleted file mode 100644 index 49aa506db53..00000000000 --- a/www/iridium/patches/patch-device_serial_serial_gyp +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-device_serial_serial_gyp,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- device/serial/serial.gyp.orig.port Fri Apr 8 18:02:09 2016 -+++ device/serial/serial.gyp Thu Apr 14 08:25:13 2016 -@@ -71,6 +71,12 @@ - }, - }, - }], -+ ['os_bsd==1', { -+ 'sources!': [ -+ 'serial_device_enumerator_linux.cc', -+ 'serial_device_enumerator_linux.h', -+ ], -+ }], - ], - 'dependencies': [ - 'device_serial_mojo', diff --git a/www/iridium/patches/patch-device_serial_serial_io_handler_posix_cc b/www/iridium/patches/patch-device_serial_serial_io_handler_posix_cc index 900feb1d1bc..30cb91ea60f 100644 --- a/www/iridium/patches/patch-device_serial_serial_io_handler_posix_cc +++ b/www/iridium/patches/patch-device_serial_serial_io_handler_posix_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-device_serial_serial_io_handler_posix_cc,v 1.5 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-device_serial_serial_io_handler_posix_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ --- device/serial/serial_io_handler_posix.cc.orig.port Wed Feb 24 21:01:32 2016 +++ device/serial/serial_io_handler_posix.cc Thu Mar 3 09:43:26 2016 @@ -60,7 +60,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee diff --git a/www/iridium/patches/patch-device_serial_serial_service_impl_cc b/www/iridium/patches/patch-device_serial_serial_service_impl_cc index 7b782d1b659..1edc4315989 100644 --- a/www/iridium/patches/patch-device_serial_serial_service_impl_cc +++ b/www/iridium/patches/patch-device_serial_serial_service_impl_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-device_serial_serial_service_impl_cc,v 1.5 2016/03/23 20:13:07 robert Exp $ ---- device/serial/serial_service_impl.cc.orig.port Wed Feb 24 00:02:00 2016 -+++ device/serial/serial_service_impl.cc Thu Mar 3 09:43:26 2016 -@@ -74,9 +74,14 @@ void SerialServiceImpl::Connect( +$OpenBSD: patch-device_serial_serial_service_impl_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- device/serial/serial_service_impl.cc.orig.port Thu Sep 1 00:03:32 2016 ++++ device/serial/serial_service_impl.cc Thu Sep 1 11:12:23 2016 +@@ -75,9 +75,14 @@ void SerialServiceImpl::Connect( } SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() { diff --git a/www/iridium/patches/patch-device_usb_BUILD_gn b/www/iridium/patches/patch-device_usb_BUILD_gn new file mode 100644 index 00000000000..ac359418276 --- /dev/null +++ b/www/iridium/patches/patch-device_usb_BUILD_gn @@ -0,0 +1,12 @@ +$OpenBSD: patch-device_usb_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- device/usb/BUILD.gn.orig.port Wed Oct 12 21:02:59 2016 ++++ device/usb/BUILD.gn Wed Oct 19 12:56:05 2016 +@@ -87,7 +87,7 @@ static_library("usb") { + deps += [ "//third_party/libusb" ] + } + +- if (is_android || is_chromeos || is_linux) { ++ if (is_android || is_chromeos || (is_linux && !is_openbsd)) { + sources += [ + "usb_device_handle_usbfs.cc", + "usb_device_handle_usbfs.h", diff --git a/www/iridium/patches/patch-extensions_browser_api_serial_serial_api_cc b/www/iridium/patches/patch-extensions_browser_api_serial_serial_api_cc index 7c225168b9e..b64b92a61b5 100644 --- a/www/iridium/patches/patch-extensions_browser_api_serial_serial_api_cc +++ b/www/iridium/patches/patch-extensions_browser_api_serial_serial_api_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-extensions_browser_api_serial_serial_api_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- extensions/browser/api/serial/serial_api.cc.orig.port Thu May 26 08:30:01 2016 -+++ extensions/browser/api/serial/serial_api.cc Thu May 26 08:30:12 2016 +$OpenBSD: patch-extensions_browser_api_serial_serial_api_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- extensions/browser/api/serial/serial_api.cc.orig.port Thu Jul 21 10:39:40 2016 ++++ extensions/browser/api/serial/serial_api.cc Thu Jul 21 10:39:53 2016 @@ -86,11 +86,13 @@ bool SerialGetDevicesFunction::Prepare() { void SerialGetDevicesFunction::Work() { DCHECK_CURRENTLY_ON(BrowserThread::FILE); +#if !defined(OS_BSD) - scoped_ptr enumerator = + std::unique_ptr enumerator = device::SerialDeviceEnumerator::Create(); mojo::Array devices = enumerator->GetDevices(); results_ = serial::GetDevices::Results::Create( diff --git a/www/iridium/patches/patch-gpu_config_gpu_info_collector_linux_cc b/www/iridium/patches/patch-gpu_config_gpu_info_collector_linux_cc index f1a79b5e0a7..8f752617345 100644 --- a/www/iridium/patches/patch-gpu_config_gpu_info_collector_linux_cc +++ b/www/iridium/patches/patch-gpu_config_gpu_info_collector_linux_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-gpu_config_gpu_info_collector_linux_cc,v 1.4 2016/03/23 20:13:07 robert Exp $ ---- gpu/config/gpu_info_collector_linux.cc.orig.port Wed Feb 24 00:02:01 2016 -+++ gpu/config/gpu_info_collector_linux.cc Thu Mar 3 09:43:26 2016 -@@ -81,6 +81,10 @@ const uint32_t kVendorIDAMD = 0x1002; +$OpenBSD: patch-gpu_config_gpu_info_collector_linux_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- gpu/config/gpu_info_collector_linux.cc.orig.port Wed Oct 12 21:03:00 2016 ++++ gpu/config/gpu_info_collector_linux.cc Wed Oct 19 12:56:05 2016 +@@ -100,6 +100,10 @@ const uint32_t kVendorIDAMD = 0x1002; CollectInfoResult CollectPCIVideoCardInfo(GPUInfo* gpu_info) { DCHECK(gpu_info); diff --git a/www/iridium/patches/patch-gpu_config_gpu_info_collector_linux_h b/www/iridium/patches/patch-gpu_config_gpu_info_collector_linux_h index 239259f5f41..d60e5fee3e3 100644 --- a/www/iridium/patches/patch-gpu_config_gpu_info_collector_linux_h +++ b/www/iridium/patches/patch-gpu_config_gpu_info_collector_linux_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-gpu_config_gpu_info_collector_linux_h,v 1.2 2015/05/06 14:27:24 robert Exp $ +$OpenBSD: patch-gpu_config_gpu_info_collector_linux_h,v 1.3 2016/10/27 18:30:41 robert Exp $ --- gpu/config/gpu_info_collector_linux.h.orig.port Wed Feb 18 17:58:41 2015 +++ gpu/config/gpu_info_collector_linux.h Wed Feb 18 17:59:22 2015 @@ -6,11 +6,14 @@ diff --git a/www/iridium/patches/patch-gpu_config_gpu_info_collector_x11_cc b/www/iridium/patches/patch-gpu_config_gpu_info_collector_x11_cc index d6aaebfa58a..72693deba24 100644 --- a/www/iridium/patches/patch-gpu_config_gpu_info_collector_x11_cc +++ b/www/iridium/patches/patch-gpu_config_gpu_info_collector_x11_cc @@ -1,14 +1,16 @@ -$OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.2 2015/05/06 14:27:24 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 @@ +$OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- gpu/config/gpu_info_collector_x11.cc.orig.port Fri Oct 21 00:02:04 2016 ++++ gpu/config/gpu_info_collector_x11.cc Sun Oct 23 11:19:20 2016 +@@ -8,8 +8,19 @@ #include "gpu/config/gpu_info_collector_linux.h" #include "third_party/libXNVCtrl/NVCtrl.h" #include "third_party/libXNVCtrl/NVCtrlLib.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" ++#include "ui/gl/gl_gl_api_implementation.h" +#include "ui/gl/gl_surface.h" ++#include "ui/gl/init/gl_initializer.h" #include "ui/gfx/x/x11_types.h" +typedef bool (*PFNGLXQUERYRENDERERINTEGERMESAPROC) (Display *dpy, int screen, int renderer, int attribute, unsigned int *value); @@ -19,7 +21,7 @@ $OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.2 2015/05/06 14:27:24 r namespace gpu { // Use NVCtrl extention to query NV driver version. -@@ -39,5 +48,42 @@ std::string CollectDriverVersionNVidia() { +@@ -39,5 +50,42 @@ std::string CollectDriverVersionNVidia() { } return std::string(); } @@ -34,7 +36,7 @@ $OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.2 2015/05/06 14:27:24 r + } + + bool initialized = -+ gfx::InitializeStaticGLBindings(gfx::kGLImplementationDesktopGL); ++ gl::init::InitializeStaticGLBindings(gl::kGLImplementationDesktopGL); + + if (!initialized) + return kCollectInfoNonFatalFailure; @@ -56,7 +58,7 @@ $OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.2 2015/05/06 14:27:24 r + } + + if (initialized) -+ gfx::ClearGLBindings(); ++ gl::ClearGLBindingsGL(); + + return kCollectInfoSuccess; + } diff --git a/www/iridium/patches/patch-gpu_gles2_conform_support_gles2_conform_support_gyp b/www/iridium/patches/patch-gpu_gles2_conform_support_gles2_conform_support_gyp deleted file mode 100644 index a8f537bc3a2..00000000000 --- a/www/iridium/patches/patch-gpu_gles2_conform_support_gles2_conform_support_gyp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-gpu_gles2_conform_support_gles2_conform_support_gyp,v 1.2 2016/04/27 12:46:16 robert Exp $ ---- gpu/gles2_conform_support/gles2_conform_support.gyp.orig.port Thu Apr 14 14:03:26 2016 -+++ gpu/gles2_conform_support/gles2_conform_support.gyp Thu Apr 14 14:03:40 2016 -@@ -12,7 +12,7 @@ - 'native/main.cc', - ], - 'conditions': [ -- ['OS=="linux" or OS=="win"', { -+ ['OS=="linux" or OS=="win" or os_bsd==1', { - 'bootstrap_sources_native': [ - 'native/egl_native.cc', - ], diff --git a/www/iridium/patches/patch-gpu_gpu_config_gypi b/www/iridium/patches/patch-gpu_gpu_config_gypi deleted file mode 100644 index 9c5c207c7b6..00000000000 --- a/www/iridium/patches/patch-gpu_gpu_config_gypi +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-gpu_gpu_config_gypi,v 1.4 2015/08/12 10:56:13 robert Exp $ ---- gpu/gpu_config.gypi.orig.port Wed Jul 15 22:30:04 2015 -+++ gpu/gpu_config.gypi Wed Jul 22 08:37:30 2015 -@@ -66,12 +66,12 @@ - '../third_party/amd/amd_videocard_info_win.cc', - ], - }], -- ['OS=="linux" and use_libpci==1 and (use_x11==1 or use_ozone==1)', { -+ ['(OS=="linux" or os_bsd==1) and use_libpci==1 and (use_x11==1 or use_ozone==1)', { - 'dependencies': [ - '../build/linux/system.gyp:libpci', - ], - }], -- ['OS=="linux" and use_x11==1', { -+ ['(OS=="linux" or os_bsd==1) and use_x11==1', { - 'dependencies': [ - '../build/linux/system.gyp:x11', - '../build/linux/system.gyp:xext', diff --git a/www/iridium/patches/patch-gpu_gpu_ipc_service_gypi b/www/iridium/patches/patch-gpu_gpu_ipc_service_gypi deleted file mode 100644 index e0e7c441170..00000000000 --- a/www/iridium/patches/patch-gpu_gpu_ipc_service_gypi +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-gpu_gpu_ipc_service_gypi,v 1.1 2016/05/28 14:49:39 robert Exp $ ---- gpu/gpu_ipc_service.gypi.orig.port Thu May 26 14:22:29 2016 -+++ gpu/gpu_ipc_service.gypi Thu May 26 14:22:40 2016 -@@ -82,7 +82,7 @@ - ], - }, - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'sources': [ 'ipc/service/image_transport_surface_linux.cc' ], - }], - ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', { diff --git a/www/iridium/patches/patch-gpu_tools_tools_gyp b/www/iridium/patches/patch-gpu_tools_tools_gyp deleted file mode 100644 index 6c999c82dc2..00000000000 --- a/www/iridium/patches/patch-gpu_tools_tools_gyp +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-gpu_tools_tools_gyp,v 1.3 2015/05/26 17:37:40 robert Exp $ ---- gpu/tools/tools.gyp.orig.port Thu May 14 00:23:07 2015 -+++ gpu/tools/tools.gyp Wed May 20 08:34:56 2015 -@@ -9,7 +9,7 @@ - 'targets': [ - ], - 'conditions': [ -- ['OS == "linux" and target_arch != "arm" and use_x11==1', { -+ ['(OS == "linux" or os_bsd==1) and target_arch != "arm" and use_x11==1', { - 'targets': [ - { - # GN version: //gpu/tools/compositor_model_bench -@@ -22,7 +22,6 @@ - ], - 'libraries': [ - '-lGL', -- '-ldl', - ], - 'sources': [ - 'compositor_model_bench/compositor_model_bench.cc', diff --git a/www/iridium/patches/patch-ipc_ipc_message_utils_cc b/www/iridium/patches/patch-ipc_ipc_message_utils_cc index f514568ca3d..6716217f7d3 100644 --- a/www/iridium/patches/patch-ipc_ipc_message_utils_cc +++ b/www/iridium/patches/patch-ipc_ipc_message_utils_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-ipc_ipc_message_utils_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- ipc/ipc_message_utils.cc.orig.port Wed May 25 21:01:03 2016 -+++ ipc/ipc_message_utils.cc Thu May 26 08:09:47 2016 +$OpenBSD: patch-ipc_ipc_message_utils_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- ipc/ipc_message_utils.cc.orig.port Thu Sep 1 00:03:32 2016 ++++ ipc/ipc_message_utils.cc Thu Sep 1 11:12:23 2016 @@ -423,7 +423,7 @@ void ParamTraits::Log(const param_type& l->append(base::UintToString(p)); } diff --git a/www/iridium/patches/patch-ipc_ipc_message_utils_h b/www/iridium/patches/patch-ipc_ipc_message_utils_h index 8ae8df276eb..59dc2dced92 100644 --- a/www/iridium/patches/patch-ipc_ipc_message_utils_h +++ b/www/iridium/patches/patch-ipc_ipc_message_utils_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-ipc_ipc_message_utils_h,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- ipc/ipc_message_utils.h.orig.port Wed May 25 21:01:03 2016 -+++ ipc/ipc_message_utils.h Thu May 26 08:09:47 2016 -@@ -208,7 +208,7 @@ struct ParamTraits { +$OpenBSD: patch-ipc_ipc_message_utils_h,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- ipc/ipc_message_utils.h.orig.port Wed Oct 12 21:03:00 2016 ++++ ipc/ipc_message_utils.h Wed Oct 19 12:56:06 2016 +@@ -209,7 +209,7 @@ struct ParamTraits { // 3) Android 64 bit also has int64_t typedef'd to long. // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. diff --git a/www/iridium/patches/patch-iridium_trknotify_cpp b/www/iridium/patches/patch-iridium_trknotify_cpp index f2307e026e9..107da8f7e3e 100644 --- a/www/iridium/patches/patch-iridium_trknotify_cpp +++ b/www/iridium/patches/patch-iridium_trknotify_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-iridium_trknotify_cpp,v 1.1 2015/12/30 19:13:33 robert Exp $ ---- iridium/trknotify.cpp.orig.port Wed Dec 30 15:41:59 2015 -+++ iridium/trknotify.cpp Wed Dec 30 15:42:11 2015 +$OpenBSD: patch-iridium_trknotify_cpp,v 1.2 2016/10/27 18:30:41 robert Exp $ +--- iridium/trknotify.cpp.orig.port Thu Oct 27 14:44:27 2016 ++++ iridium/trknotify.cpp Thu Oct 27 14:44:37 2016 @@ -5,7 +5,7 @@ * found in the LICENSE file. */ diff --git a/www/iridium/patches/patch-media_audio_BUILD_gn b/www/iridium/patches/patch-media_audio_BUILD_gn new file mode 100644 index 00000000000..e7458f6aa6b --- /dev/null +++ b/www/iridium/patches/patch-media_audio_BUILD_gn @@ -0,0 +1,23 @@ +$OpenBSD: patch-media_audio_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- media/audio/BUILD.gn.orig.port Fri Oct 21 00:02:05 2016 ++++ media/audio/BUILD.gn Fri Oct 21 16:41:46 2016 +@@ -206,8 +206,18 @@ source_set("audio") { + deps += [ "//media/base/android:media_jni_headers" ] + } + +- if (is_linux) { ++ if (is_linux && !is_openbsd) { + sources += [ "linux/audio_manager_linux.cc" ] ++ } ++ if (is_openbsd) { ++ libs += [ "sndio" ] ++ sources += [ ++ "openbsd/audio_manager_openbsd.cc", ++ "sndio/sndio_input.cc", ++ "sndio/sndio_input.h", ++ "sndio/sndio_output.cc", ++ "sndio/sndio_output.h" ++ ] + } + + if (use_alsa) { diff --git a/www/iridium/patches/patch-media_audio_audio_input_controller_cc b/www/iridium/patches/patch-media_audio_audio_input_controller_cc deleted file mode 100644 index 5f20852299c..00000000000 --- a/www/iridium/patches/patch-media_audio_audio_input_controller_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-media_audio_audio_input_controller_cc,v 1.5 2016/03/23 20:13:07 robert Exp $ ---- media/audio/audio_input_controller.cc.orig.port Wed Feb 24 00:02:01 2016 -+++ media/audio/audio_input_controller.cc Thu Mar 3 09:43:26 2016 -@@ -17,6 +17,8 @@ - #include "media/audio/audio_input_writer.h" - #include "media/base/user_input_monitor.h" - -+#include -+ - using base::TimeDelta; - - namespace { diff --git a/www/iridium/patches/patch-media_audio_audio_manager_cc b/www/iridium/patches/patch-media_audio_audio_manager_cc index 85c5fd50f56..ecf40fca0b2 100644 --- a/www/iridium/patches/patch-media_audio_audio_manager_cc +++ b/www/iridium/patches/patch-media_audio_audio_manager_cc @@ -1,17 +1,17 @@ -$OpenBSD: patch-media_audio_audio_manager_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ ---- media/audio/audio_manager.cc.orig.port Wed Feb 24 21:01:33 2016 -+++ media/audio/audio_manager.cc Thu Mar 3 09:43:26 2016 -@@ -193,7 +193,7 @@ class AudioManagerHelper : public base::PowerObserver +$OpenBSD: patch-media_audio_audio_manager_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- media/audio/audio_manager.cc.orig.port Wed Oct 12 21:03:00 2016 ++++ media/audio/audio_manager.cc Wed Oct 19 12:56:06 2016 +@@ -95,7 +95,7 @@ class AudioManagerHelper : public base::PowerObserver } #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - void set_app_name(const std::string& app_name) { - app_name_ = app_name; - } -@@ -243,7 +243,7 @@ class AudioManagerHelper : public base::PowerObserver - scoped_ptr com_initializer_for_testing_; + void set_app_name(const std::string& app_name) { app_name_ = app_name; } + const std::string& app_name() const { return app_name_; } + #endif +@@ -253,7 +253,7 @@ class AudioManagerHelper : public base::PowerObserver + std::unique_ptr com_initializer_for_testing_; #endif -#if defined(OS_LINUX) @@ -19,7 +19,7 @@ $OpenBSD: patch-media_audio_audio_manager_cc,v 1.3 2016/03/23 20:13:07 robert Ex std::string app_name_; #endif -@@ -321,7 +321,7 @@ void AudioManager::EnableCrashKeyLoggingForAudioThread +@@ -365,7 +365,7 @@ void AudioManager::EnableCrashKeyLoggingForAudioThread g_helper.Pointer()->enable_crash_key_logging(); } diff --git a/www/iridium/patches/patch-media_audio_audio_manager_h b/www/iridium/patches/patch-media_audio_audio_manager_h index d998ed1e4c8..df96c4a1d2d 100644 --- a/www/iridium/patches/patch-media_audio_audio_manager_h +++ b/www/iridium/patches/patch-media_audio_audio_manager_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-media_audio_audio_manager_h,v 1.3 2016/03/23 20:13:07 robert Exp $ ---- media/audio/audio_manager.h.orig.port Wed Feb 24 00:02:01 2016 -+++ media/audio/audio_manager.h Thu Mar 3 09:43:26 2016 -@@ -68,7 +68,7 @@ class MEDIA_EXPORT AudioManager { +$OpenBSD: patch-media_audio_audio_manager_h,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- media/audio/audio_manager.h.orig.port Thu Sep 1 00:03:32 2016 ++++ media/audio/audio_manager.h Thu Sep 1 11:12:23 2016 +@@ -84,7 +84,7 @@ class MEDIA_EXPORT AudioManager { // See http://crbug.com/422522 static void EnableCrashKeyLoggingForAudioThreadHangs(); diff --git a/www/iridium/patches/patch-media_base_video_frame_cc b/www/iridium/patches/patch-media_base_video_frame_cc index c706d5289ec..3949219f075 100644 --- a/www/iridium/patches/patch-media_base_video_frame_cc +++ b/www/iridium/patches/patch-media_base_video_frame_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-media_base_video_frame_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- media/base/video_frame.cc.orig.port Wed May 25 21:01:03 2016 -+++ media/base/video_frame.cc Thu May 26 08:09:47 2016 -@@ -49,7 +49,7 @@ static std::string StorageTypeToString( +$OpenBSD: patch-media_base_video_frame_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- media/base/video_frame.cc.orig.port Wed Oct 12 21:03:00 2016 ++++ media/base/video_frame.cc Wed Oct 19 12:56:06 2016 +@@ -53,7 +53,7 @@ static std::string StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -10,7 +10,7 @@ $OpenBSD: patch-media_base_video_frame_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -71,7 +71,7 @@ static std::string StorageTypeToString( +@@ -75,7 +75,7 @@ static std::string StorageTypeToString( // static static bool IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -19,7 +19,7 @@ $OpenBSD: patch-media_base_video_frame_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -311,7 +311,7 @@ scoped_refptr VideoFrame::WrapExternalYuvG +@@ -329,7 +329,7 @@ scoped_refptr VideoFrame::WrapExternalYuva return frame; } @@ -28,7 +28,7 @@ $OpenBSD: patch-media_base_video_frame_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ // static scoped_refptr VideoFrame::WrapExternalDmabufs( VideoPixelFormat format, -@@ -427,7 +427,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( +@@ -441,7 +441,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( wrapping_frame->data_[i] = frame->data(i); } @@ -37,7 +37,7 @@ $OpenBSD: patch-media_base_video_frame_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ // If there are any |dmabuf_fds_| plugged in, we should duplicate them. if (frame->storage_type() == STORAGE_DMABUFS) { std::vector original_fds; -@@ -712,7 +712,7 @@ VideoFrame::gpu_memory_buffer_handles() const { +@@ -750,7 +750,7 @@ VideoFrame::gpu_memory_buffer_handles() const { return gpu_memory_buffer_handles_; } diff --git a/www/iridium/patches/patch-media_base_video_frame_h b/www/iridium/patches/patch-media_base_video_frame_h index e8155c8cc77..23e68451da1 100644 --- a/www/iridium/patches/patch-media_base_video_frame_h +++ b/www/iridium/patches/patch-media_base_video_frame_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-media_base_video_frame_h,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- media/base/video_frame.h.orig.port Wed May 25 21:01:03 2016 -+++ media/base/video_frame.h Thu May 26 08:09:47 2016 -@@ -61,7 +61,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +$OpenBSD: patch-media_base_video_frame_h,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- media/base/video_frame.h.orig.port Wed Oct 12 21:03:00 2016 ++++ media/base/video_frame.h Wed Oct 19 12:56:06 2016 +@@ -63,7 +63,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Pixels are backed by Shared Memory. @@ -10,8 +10,8 @@ $OpenBSD: patch-media_base_video_frame_h,v 1.2 2016/05/28 14:49:39 robert Exp $ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE or another // meaningful name and handle it appropriately in all cases. STORAGE_DMABUFS = 5, // Each plane is stored into a DmaBuf. -@@ -207,7 +207,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - const gfx::GpuMemoryBufferHandle& v_handle, +@@ -212,7 +212,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + uint8_t* a_data, base::TimeDelta timestamp); -#if defined(OS_LINUX) @@ -19,7 +19,7 @@ $OpenBSD: patch-media_base_video_frame_h,v 1.2 2016/05/28 14:49:39 robert Exp $ // Wraps provided dmabufs // (https://www.kernel.org/doc/Documentation/dma-buf-sharing.txt) with a // VideoFrame. The dmabuf fds are dup()ed on creation, so that the VideoFrame -@@ -362,7 +362,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -371,7 +371,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte const std::vector& gpu_memory_buffer_handles() const; @@ -28,7 +28,7 @@ $OpenBSD: patch-media_base_video_frame_h,v 1.2 2016/05/28 14:49:39 robert Exp $ // Returns backing DmaBuf file descriptor for given |plane|, if present, or // -1 if not. // TODO(mcasas): Rename to DmabufFd() to comply with Style Guide. -@@ -543,7 +543,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -557,7 +557,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GpuMemoryBuffer handles attached to the video_frame. std::vector gpu_memory_buffer_handles_; diff --git a/www/iridium/patches/patch-media_capture_video_fake_video_capture_device_factory_cc b/www/iridium/patches/patch-media_capture_video_fake_video_capture_device_factory_cc index e14e3d8a71a..f5089f2ad47 100644 --- a/www/iridium/patches/patch-media_capture_video_fake_video_capture_device_factory_cc +++ b/www/iridium/patches/patch-media_capture_video_fake_video_capture_device_factory_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-media_capture_video_fake_video_capture_device_factory_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- media/capture/video/fake_video_capture_device_factory.cc.orig.port Fri Apr 8 18:02:09 2016 -+++ media/capture/video/fake_video_capture_device_factory.cc Thu Apr 14 08:25:13 2016 -@@ -49,7 +49,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceNames( +$OpenBSD: patch-media_capture_video_fake_video_capture_device_factory_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- media/capture/video/fake_video_capture_device_factory.cc.orig.port Wed Oct 19 13:48:04 2016 ++++ media/capture/video/fake_video_capture_device_factory.cc Wed Oct 19 13:48:10 2016 +@@ -49,7 +49,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto for (int n = 0; n < number_of_devices_; ++n) { - VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n), - base::StringPrintf("/dev/video%d", n) + device_descriptors->emplace_back(base::StringPrintf("fake_device_%d", n), + base::StringPrintf("/dev/video%d", n), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - , - VideoCaptureDevice::Name::V4L2_SINGLE_PLANE + VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE #elif defined(OS_MACOSX) + VideoCaptureApi::MACOSX_AVFOUNDATION diff --git a/www/iridium/patches/patch-media_capture_video_file_video_capture_device_factory_cc b/www/iridium/patches/patch-media_capture_video_file_video_capture_device_factory_cc index 5aaea23d68f..d8ad1a6b33f 100644 --- a/www/iridium/patches/patch-media_capture_video_file_video_capture_device_factory_cc +++ b/www/iridium/patches/patch-media_capture_video_file_video_capture_device_factory_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-media_capture_video_file_video_capture_device_factory_cc,v 1.2 2016/03/23 20:13:07 robert Exp $ ---- media/capture/video/file_video_capture_device_factory.cc.orig.port Wed Feb 24 00:02:01 2016 -+++ media/capture/video/file_video_capture_device_factory.cc Thu Mar 3 09:43:26 2016 -@@ -50,7 +50,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceNames( - device_names->push_back(VideoCaptureDevice::Name( +$OpenBSD: patch-media_capture_video_file_video_capture_device_factory_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- media/capture/video/file_video_capture_device_factory.cc.orig.port Wed Oct 19 13:48:17 2016 ++++ media/capture/video/file_video_capture_device_factory.cc Wed Oct 19 13:48:23 2016 +@@ -49,7 +49,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto + #elif defined(OS_MACOSX) command_line_file_path.value(), kFileVideoCaptureDeviceName, - VideoCaptureDevice::Name::AVFOUNDATION)); + VideoCaptureApi::MACOSX_AVFOUNDATION -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - device_names->push_back(VideoCaptureDevice::Name( command_line_file_path.value(), kFileVideoCaptureDeviceName, - VideoCaptureDevice::Name::V4L2_SINGLE_PLANE)); + VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE + #else diff --git a/www/iridium/patches/patch-media_capture_video_video_capture_device_cc b/www/iridium/patches/patch-media_capture_video_video_capture_device_cc deleted file mode 100644 index 4c2a58fa497..00000000000 --- a/www/iridium/patches/patch-media_capture_video_video_capture_device_cc +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-media_capture_video_video_capture_device_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- media/capture/video/video_capture_device.cc.orig.port Wed May 25 21:01:03 2016 -+++ media/capture/video/video_capture_device.cc Thu May 26 08:09:47 2016 -@@ -35,7 +35,7 @@ VideoCaptureDevice::Name::Name(const std::string& name - : device_name_(name), unique_id_(id) { - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - VideoCaptureDevice::Name::Name(const std::string& name, - const std::string& id, - const CaptureApiType api_type) -@@ -78,7 +78,7 @@ VideoCaptureDevice::Name::Name(const std::string& name - VideoCaptureDevice::Name::~Name() { - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const { - switch (capture_api_type()) { - case V4L2_SINGLE_PLANE: diff --git a/www/iridium/patches/patch-media_capture_video_video_capture_device_factory_cc b/www/iridium/patches/patch-media_capture_video_video_capture_device_factory_cc index 57b64d4f0e6..2f3f2ff17c7 100644 --- a/www/iridium/patches/patch-media_capture_video_video_capture_device_factory_cc +++ b/www/iridium/patches/patch-media_capture_video_video_capture_device_factory_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-media_capture_video_video_capture_device_factory_cc,v 1.2 2016/03/23 20:13:07 robert Exp $ ---- media/capture/video/video_capture_device_factory.cc.orig.port Sun Mar 6 11:32:49 2016 -+++ media/capture/video/video_capture_device_factory.cc Sun Mar 6 11:32:56 2016 -@@ -55,7 +55,7 @@ void VideoCaptureDeviceFactory::EnumerateDeviceNames(c +$OpenBSD: patch-media_capture_video_video_capture_device_factory_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- media/capture/video/video_capture_device_factory.cc.orig.port Wed Oct 12 21:03:00 2016 ++++ media/capture/video/video_capture_device_factory.cc Wed Oct 19 12:56:06 2016 +@@ -56,7 +56,7 @@ void VideoCaptureDeviceFactory::EnumerateDeviceDescrip } #if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \ diff --git a/www/iridium/patches/patch-media_capture_video_video_capture_device_h b/www/iridium/patches/patch-media_capture_video_video_capture_device_h deleted file mode 100644 index 75580773bbd..00000000000 --- a/www/iridium/patches/patch-media_capture_video_video_capture_device_h +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-media_capture_video_video_capture_device_h,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- media/capture/video/video_capture_device.h.orig.port Wed May 25 21:01:03 2016 -+++ media/capture/video/video_capture_device.h Thu May 26 08:09:47 2016 -@@ -51,7 +51,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - Name(); - Name(const std::string& name, const std::string& id); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Linux/CrOS targets Capture Api type: it can only be set on construction. - enum CaptureApiType { - V4L2_SINGLE_PLANE, -@@ -82,7 +82,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - #endif - - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) - Name(const std::string& name, - const std::string& id, - const CaptureApiType api_type); -@@ -119,7 +119,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - bool operator<(const Name& other) const { return unique_id_ < other.id(); } - - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) - CaptureApiType capture_api_type() const { - return capture_api_class_.capture_api_type(); - } -@@ -139,7 +139,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - std::string device_name_; - std::string unique_id_; - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) - // This class wraps the CaptureApiType to give it a by default value if not - // initialized. - class CaptureApiClass { diff --git a/www/iridium/patches/patch-media_media_gyp b/www/iridium/patches/patch-media_media_gyp deleted file mode 100644 index a83b2cbde3b..00000000000 --- a/www/iridium/patches/patch-media_media_gyp +++ /dev/null @@ -1,95 +0,0 @@ -$OpenBSD: patch-media_media_gyp,v 1.11 2016/05/28 14:49:39 robert Exp $ ---- media/media.gyp.orig.port Wed May 25 21:01:03 2016 -+++ media/media.gyp Thu May 26 08:09:47 2016 -@@ -13,7 +13,7 @@ - 'linux_link_pulseaudio%': 0, - 'conditions': [ - # Enable ALSA and Pulse for runtime selection. -- ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and (embedded==0 or chromecast==1)', { -+ ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and (embedded==0 or chromecast==1) and os_bsd!=1', { - # ALSA is always needed for Web MIDI even if the cras is enabled. - 'use_alsa%': 1, - 'conditions': [ -@@ -27,6 +27,10 @@ - 'use_alsa%': 0, - 'use_pulseaudio%': 0, - }], -+ # Override to dynamically link the sndio library. -+ ['OS=="openbsd"', { -+ 'use_sndioaudio%': 0, -+ }], - # low memory buffer is used in non-Android based chromecast build due to hardware limitation. - ['chromecast==1 and OS!="android"', { - 'use_low_memory_buffer%': 1, -@@ -191,6 +195,8 @@ - 'audio/mac/audio_manager_mac.h', - 'audio/null_audio_sink.cc', - 'audio/null_audio_sink.h', -+ 'audio/openbsd/audio_manager_openbsd.cc', -+ 'audio/openbsd/audio_manager_openbsd.h', - 'audio/pulse/audio_manager_pulse.cc', - 'audio/pulse/audio_manager_pulse.h', - 'audio/pulse/pulse_input.cc', -@@ -199,6 +205,10 @@ - 'audio/pulse/pulse_output.h', - 'audio/pulse/pulse_util.cc', - 'audio/pulse/pulse_util.h', -+ 'audio/sndio/sndio_input.cc', -+ 'audio/sndio/sndio_input.h', -+ 'audio/sndio/sndio_output.cc', -+ 'audio/sndio/sndio_output.h', - 'audio/sample_rates.cc', - 'audio/sample_rates.h', - 'audio/scoped_task_runner_observer.cc', -@@ -745,6 +755,24 @@ - 'filters/h264_bitstream_buffer.h', - ], - }], -+ ['use_sndio == 1', { -+ 'link_settings': { -+ 'libraries': [ -+ '-lsndio', -+ ], -+ }, -+ 'defines': [ -+ 'USE_SNDIO', -+ ], -+ 'sources!': [ -+ 'audio/linux/audio_manager_linux.cc', -+ ], -+ }, { # else: use_sndio == 0 -+ 'sources!': [ -+ 'audio/sndio/sndio_output.cc', -+ 'audio/sndio/sndio_output.h', -+ ], -+ }], - ['use_alsa==1', { - 'link_settings': { - 'libraries': [ -@@ -760,7 +788,7 @@ - ['exclude', '_alsa\\.(h|cc)$'], - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['use_x11==1', { - 'dependencies': [ -@@ -812,7 +840,7 @@ - }], - ], - }], -- ['OS!="linux"', { -+ ['OS!="linux" and os_bsd!=1', { - 'sources!': [ - 'audio/cras/audio_manager_cras.cc', - 'audio/cras/audio_manager_cras.h', -@@ -1059,7 +1087,7 @@ - 'base/simd/filter_yuv_sse2.cc', - ], - }], -- ['OS!="linux" and OS!="win"', { -+ ['OS!="linux" and OS!="win" and os_bsd!=1', { - 'sources!': [ - 'base/keyboard_event_counter.cc', - 'base/keyboard_event_counter.h', diff --git a/www/iridium/patches/patch-media_media_options_gni b/www/iridium/patches/patch-media_media_options_gni new file mode 100644 index 00000000000..f6a021b113d --- /dev/null +++ b/www/iridium/patches/patch-media_media_options_gni @@ -0,0 +1,27 @@ +$OpenBSD: patch-media_media_options_gni,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- media/media_options.gni.orig.port Thu Sep 1 11:31:19 2016 ++++ media/media_options.gni Thu Sep 1 11:32:21 2016 +@@ -54,9 +54,12 @@ declare_args() { + # Enables runtime selection of ALSA library for audio. + use_alsa = false + ++ # Enable runtime selection of sndio(7) ++ use_sndio = false ++ + # Alsa should be used on non-Android, non-Mac POSIX systems. + # Alsa should be used on desktop Chromecast and audio-only Chromecast builds. +- if (is_posix && !is_android && !is_mac && ++ if (is_posix && !is_android && !is_mac && !is_openbsd && + (!is_chromecast || is_cast_desktop_build || disable_display)) { + use_alsa = true + +@@ -64,6 +67,9 @@ declare_args() { + if (!use_cras && !is_chromecast) { + use_pulseaudio = true + } ++ } ++ if (is_openbsd) { ++ use_sndio = true + } + } + diff --git a/www/iridium/patches/patch-native_client_build_compiler_version_py b/www/iridium/patches/patch-native_client_build_compiler_version_py index cd0b986f448..c2abe80c794 100644 --- a/www/iridium/patches/patch-native_client_build_compiler_version_py +++ b/www/iridium/patches/patch-native_client_build_compiler_version_py @@ -1,4 +1,4 @@ -$OpenBSD: patch-native_client_build_compiler_version_py,v 1.2 2015/05/06 14:27:24 robert Exp $ +$OpenBSD: patch-native_client_build_compiler_version_py,v 1.3 2016/10/27 18:30:41 robert Exp $ --- native_client/build/compiler_version.py.orig.port Sat Oct 11 11:50:40 2014 +++ native_client/build/compiler_version.py Sat Oct 11 11:50:50 2014 @@ -62,7 +62,7 @@ def GetVersion(compiler, tool): diff --git a/www/iridium/patches/patch-net_BUILD_gn b/www/iridium/patches/patch-net_BUILD_gn new file mode 100644 index 00000000000..6a6e25cf0d3 --- /dev/null +++ b/www/iridium/patches/patch-net_BUILD_gn @@ -0,0 +1,28 @@ +$OpenBSD: patch-net_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- net/BUILD.gn.orig.port Wed Oct 12 21:03:01 2016 ++++ net/BUILD.gn Wed Oct 19 12:56:06 2016 +@@ -104,7 +104,7 @@ if (use_glib && use_gconf && !is_chromeos) { + net_configs += [ "//build/config/linux/gconf" ] + } + +-if (is_linux) { ++if (is_linux && !is_openbsd) { + net_configs += [ "//build/config/linux:libresolv" ] + } + +@@ -276,6 +276,15 @@ component("net") { + "base/winsock_util.h", + "proxy/proxy_resolver_winhttp.cc", + "proxy/proxy_resolver_winhttp.h", ++ ] ++ } ++ ++ if (is_openbsd) { ++ sources -= [ ++ "base/address_tracker_linux.cc", ++ "base/address_tracker_linux.h", ++ "base/network_interfaces_linux.cc", ++ "base/network_change_notifier_linux.cc" + ] + } + diff --git a/www/iridium/patches/patch-net_base_address_tracker_linux_h b/www/iridium/patches/patch-net_base_address_tracker_linux_h index 9b690b96154..4b245a39650 100644 --- a/www/iridium/patches/patch-net_base_address_tracker_linux_h +++ b/www/iridium/patches/patch-net_base_address_tracker_linux_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-net_base_address_tracker_linux_h,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-net_base_address_tracker_linux_h,v 1.4 2016/10/27 18:30:41 robert Exp $ --- net/base/address_tracker_linux.h.orig.port Thu Mar 3 10:10:38 2016 +++ net/base/address_tracker_linux.h Thu Mar 3 10:10:45 2016 @@ -7,9 +7,6 @@ diff --git a/www/iridium/patches/patch-net_base_network_change_notifier_cc b/www/iridium/patches/patch-net_base_network_change_notifier_cc index f685d36170f..fa7b7a0c095 100644 --- a/www/iridium/patches/patch-net_base_network_change_notifier_cc +++ b/www/iridium/patches/patch-net_base_network_change_notifier_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_base_network_change_notifier_cc,v 1.6 2016/03/23 20:13:07 robert Exp $ ---- net/base/network_change_notifier.cc.orig.port Wed Feb 24 00:02:01 2016 -+++ net/base/network_change_notifier.cc Thu Mar 3 09:43:26 2016 -@@ -532,7 +532,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() +$OpenBSD: patch-net_base_network_change_notifier_cc,v 1.7 2016/10/27 18:30:41 robert Exp $ +--- net/base/network_change_notifier.cc.orig.port Wed Jul 20 21:03:26 2016 ++++ net/base/network_change_notifier.cc Thu Jul 21 10:25:30 2016 +@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() #elif defined(OS_MACOSX) return new NetworkChangeNotifierMac(); #else diff --git a/www/iridium/patches/patch-net_base_network_interfaces_posix_cc b/www/iridium/patches/patch-net_base_network_interfaces_posix_cc index 04017345c30..c1c12f94cb0 100644 --- a/www/iridium/patches/patch-net_base_network_interfaces_posix_cc +++ b/www/iridium/patches/patch-net_base_network_interfaces_posix_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-net_base_network_interfaces_posix_cc,v 1.1 2015/10/24 18:22:21 robert Exp $ ---- net/base/network_interfaces_posix.cc.orig.port Fri Sep 4 09:33:24 2015 -+++ net/base/network_interfaces_posix.cc Fri Sep 4 09:33:09 2015 +$OpenBSD: patch-net_base_network_interfaces_posix_cc,v 1.2 2016/10/27 18:30:41 robert Exp $ +--- net/base/network_interfaces_posix.cc.orig.port Wed Jul 20 21:03:26 2016 ++++ net/base/network_interfaces_posix.cc Thu Jul 21 10:25:30 2016 @@ -9,7 +9,7 @@ - - #include "base/memory/scoped_ptr.h" + #include + #include -#if !defined(OS_NACL) +#if !defined(OS_NACL) && !defined(OS_BSD) diff --git a/www/iridium/patches/patch-net_disk_cache_blockfile_disk_format_h b/www/iridium/patches/patch-net_disk_cache_blockfile_disk_format_h index ca376809d6d..e327bfcb324 100644 --- a/www/iridium/patches/patch-net_disk_cache_blockfile_disk_format_h +++ b/www/iridium/patches/patch-net_disk_cache_blockfile_disk_format_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-net_disk_cache_blockfile_disk_format_h,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-net_disk_cache_blockfile_disk_format_h,v 1.4 2016/10/27 18:30:41 robert Exp $ --- net/disk_cache/blockfile/disk_format.h.orig.port Wed Feb 24 00:02:01 2016 +++ net/disk_cache/blockfile/disk_format.h Thu Mar 3 09:43:26 2016 @@ -149,7 +149,9 @@ struct RankingsNode { diff --git a/www/iridium/patches/patch-net_dns_address_sorter_posix_cc b/www/iridium/patches/patch-net_dns_address_sorter_posix_cc index 6b426aa130a..a58f5d24d14 100644 --- a/www/iridium/patches/patch-net_dns_address_sorter_posix_cc +++ b/www/iridium/patches/patch-net_dns_address_sorter_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_dns_address_sorter_posix_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ ---- net/dns/address_sorter_posix.cc.orig.port Wed Feb 24 21:01:33 2016 -+++ net/dns/address_sorter_posix.cc Thu Mar 3 09:43:26 2016 -@@ -12,6 +12,7 @@ +$OpenBSD: patch-net_dns_address_sorter_posix_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- net/dns/address_sorter_posix.cc.orig.port Wed Jul 20 21:03:27 2016 ++++ net/dns/address_sorter_posix.cc Thu Jul 21 10:25:30 2016 +@@ -14,6 +14,7 @@ #include #include #include diff --git a/www/iridium/patches/patch-net_dns_dns_util_cc b/www/iridium/patches/patch-net_dns_dns_util_cc index 9fea8a6da83..c29fac0c625 100644 --- a/www/iridium/patches/patch-net_dns_dns_util_cc +++ b/www/iridium/patches/patch-net_dns_dns_util_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-net_dns_dns_util_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- net/dns/dns_util.cc.orig.port Wed May 25 21:01:03 2016 -+++ net/dns/dns_util.cc Thu May 26 08:09:47 2016 -@@ -14,6 +14,8 @@ - #include "base/strings/string_split.h" +$OpenBSD: patch-net_dns_dns_util_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- net/dns/dns_util.cc.orig.port Wed Jul 20 21:03:27 2016 ++++ net/dns/dns_util.cc Thu Jul 21 10:25:30 2016 +@@ -15,6 +15,8 @@ #include "build/build_config.h" + #include "net/base/address_list.h" +#include + diff --git a/www/iridium/patches/patch-net_dns_host_resolver_proc_cc b/www/iridium/patches/patch-net_dns_host_resolver_proc_cc index ee26587c593..04def369ed4 100644 --- a/www/iridium/patches/patch-net_dns_host_resolver_proc_cc +++ b/www/iridium/patches/patch-net_dns_host_resolver_proc_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-net_dns_host_resolver_proc_cc,v 1.4 2016/02/15 18:07:53 robert Exp $ +$OpenBSD: patch-net_dns_host_resolver_proc_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ --- net/dns/host_resolver_proc.cc.orig.port Thu Jan 14 02:49:24 2016 +++ net/dns/host_resolver_proc.cc Fri Jan 22 19:58:58 2016 @@ -14,10 +14,6 @@ diff --git a/www/iridium/patches/patch-net_http_http_network_session_cc b/www/iridium/patches/patch-net_http_http_network_session_cc index 2b1ce750a13..67d5c8e9b00 100644 --- a/www/iridium/patches/patch-net_http_http_network_session_cc +++ b/www/iridium/patches/patch-net_http_http_network_session_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-net_http_http_network_session_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-net_http_http_network_session_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- net/http/http_network_session.cc.orig.port Wed Feb 24 21:01:33 2016 +++ net/http/http_network_session.cc Thu Mar 3 09:43:26 2016 @@ -15,7 +15,9 @@ diff --git a/www/iridium/patches/patch-net_net_common_gypi b/www/iridium/patches/patch-net_net_common_gypi deleted file mode 100644 index bfabaef06e5..00000000000 --- a/www/iridium/patches/patch-net_net_common_gypi +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-net_net_common_gypi,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- net/net_common.gypi.orig.port Wed May 25 21:01:04 2016 -+++ net/net_common.gypi Thu May 26 08:09:47 2016 -@@ -237,7 +237,6 @@ - 'sources!': [ - 'base/network_change_notifier_linux.cc', - 'base/network_change_notifier_netlink_linux.cc', -- 'proxy/proxy_config_service_linux.cc', - ], - },{ - 'dependencies': [ diff --git a/www/iridium/patches/patch-net_net_gypi b/www/iridium/patches/patch-net_net_gypi deleted file mode 100644 index ad71fd39927..00000000000 --- a/www/iridium/patches/patch-net_net_gypi +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-net_net_gypi,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- net/net.gypi.orig.port Wed May 25 21:01:04 2016 -+++ net/net.gypi Thu May 26 08:09:47 2016 -@@ -440,8 +440,6 @@ - 'android/network_library.h', - 'android/traffic_stats.cc', - 'android/traffic_stats.h', -- 'base/address_tracker_linux.cc', -- 'base/address_tracker_linux.h', - 'base/backoff_entry.cc', - 'base/backoff_entry.h', - 'base/backoff_entry_serializer.cc', -@@ -514,7 +512,6 @@ - 'base/network_delegate.h', - 'base/network_delegate_impl.cc', - 'base/network_delegate_impl.h', -- 'base/network_interfaces_linux.cc', - 'base/network_interfaces_mac.cc', - 'base/network_interfaces_win.cc', - 'base/network_quality_estimator.cc', diff --git a/www/iridium/patches/patch-net_proxy_proxy_config_service_linux_cc b/www/iridium/patches/patch-net_proxy_proxy_config_service_linux_cc index f1612df959a..19c6bea2d08 100644 --- a/www/iridium/patches/patch-net_proxy_proxy_config_service_linux_cc +++ b/www/iridium/patches/patch-net_proxy_proxy_config_service_linux_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.2 2016/03/23 20:13:07 robert Exp $ ---- net/proxy/proxy_config_service_linux.cc.orig.port Wed Feb 24 21:01:33 2016 -+++ net/proxy/proxy_config_service_linux.cc Thu Mar 3 09:43:26 2016 +$OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- net/proxy/proxy_config_service_linux.cc.orig.port Thu Sep 1 11:33:23 2016 ++++ net/proxy/proxy_config_service_linux.cc Thu Sep 1 11:34:49 2016 @@ -11,7 +11,9 @@ #include #include @@ -11,7 +11,7 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.2 2016/03/23 20:13:0 #include #include -@@ -851,6 +853,7 @@ bool SettingGetterImplGSettings::LoadAndCheckVersion( +@@ -855,6 +857,7 @@ bool SettingGetterImplGSettings::LoadAndCheckVersion( } #endif // defined(USE_GIO) @@ -19,7 +19,7 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.2 2016/03/23 20:13:0 // This is the KDE version that reads kioslaverc and simulates gconf. // Doing this allows the main Delegate code, as well as the unit tests // for it, to stay the same - and the settings map fairly well besides. -@@ -1355,6 +1358,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1359,6 +1362,7 @@ class SettingGetterImplKDE : public ProxyConfigService DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE); }; @@ -27,12 +27,12 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.2 2016/03/23 20:13:0 } // namespace -@@ -1555,8 +1559,10 @@ ProxyConfigServiceLinux::Delegate::Delegate(base::Envi +@@ -1560,8 +1564,10 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: +#if !defined(OS_BSD) - setting_getter_.reset(new SettingGetterImplKDE(env_var_getter)); + setting_getter_.reset(new SettingGetterImplKDE(env_var_getter_.get())); break; +#endif case base::nix::DESKTOP_ENVIRONMENT_XFCE: diff --git a/www/iridium/patches/patch-net_proxy_proxy_service_cc b/www/iridium/patches/patch-net_proxy_proxy_service_cc index 17070b8f9cf..171ba9b6718 100644 --- a/www/iridium/patches/patch-net_proxy_proxy_service_cc +++ b/www/iridium/patches/patch-net_proxy_proxy_service_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-net_proxy_proxy_service_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- net/proxy/proxy_service.cc.orig.port Wed May 25 21:01:04 2016 -+++ net/proxy/proxy_service.cc Thu May 26 08:09:47 2016 +$OpenBSD: patch-net_proxy_proxy_service_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- net/proxy/proxy_service.cc.orig.port Wed Oct 12 21:03:01 2016 ++++ net/proxy/proxy_service.cc Wed Oct 19 12:56:07 2016 @@ -47,7 +47,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" @@ -10,12 +10,12 @@ $OpenBSD: patch-net_proxy_proxy_service_cc,v 1.5 2016/05/28 14:49:39 robert Exp #include "net/proxy/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy/proxy_config_service_android.h" -@@ -1513,7 +1513,7 @@ scoped_ptr ProxyService::CreateSys +@@ -1531,7 +1531,7 @@ ProxyService::CreateSystemProxyConfigService( << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; - return make_scoped_ptr(new UnsetProxyConfigService); + return base::WrapUnique(new UnsetProxyConfigService); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - scoped_ptr linux_config_service( + std::unique_ptr linux_config_service( new ProxyConfigServiceLinux()); diff --git a/www/iridium/patches/patch-net_socket_socks5_client_socket_cc b/www/iridium/patches/patch-net_socket_socks5_client_socket_cc index 081ef322a22..a84fb34f5f9 100644 --- a/www/iridium/patches/patch-net_socket_socks5_client_socket_cc +++ b/www/iridium/patches/patch-net_socket_socks5_client_socket_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-net_socket_socks5_client_socket_cc,v 1.5 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-net_socket_socks5_client_socket_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ --- net/socket/socks5_client_socket.cc.orig.port Wed Apr 13 22:59:49 2016 +++ net/socket/socks5_client_socket.cc Thu Apr 14 08:25:13 2016 @@ -16,6 +16,9 @@ diff --git a/www/iridium/patches/patch-net_tools_get_server_time_get_server_time_cc b/www/iridium/patches/patch-net_tools_get_server_time_get_server_time_cc index 5c4631a78ac..ce831c4646f 100644 --- a/www/iridium/patches/patch-net_tools_get_server_time_get_server_time_cc +++ b/www/iridium/patches/patch-net_tools_get_server_time_get_server_time_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_tools_get_server_time_get_server_time_cc,v 1.1 2015/05/26 17:37:40 robert Exp $ ---- net/tools/get_server_time/get_server_time.cc.orig.port Sat May 23 00:59:48 2015 -+++ net/tools/get_server_time/get_server_time.cc Sat May 23 01:15:24 2015 -@@ -43,7 +43,7 @@ +$OpenBSD: patch-net_tools_get_server_time_get_server_time_cc,v 1.2 2016/10/27 18:30:41 robert Exp $ +--- net/tools/get_server_time/get_server_time.cc.orig.port Wed Oct 12 21:03:01 2016 ++++ net/tools/get_server_time/get_server_time.cc Wed Oct 19 12:56:07 2016 +@@ -45,7 +45,7 @@ #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" @@ -10,9 +10,9 @@ $OpenBSD: patch-net_tools_get_server_time_get_server_time_cc,v 1.1 2015/05/26 17 #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #endif -@@ -138,7 +138,7 @@ class PrintingLogObserver : public net::NetLog::Thread - scoped_ptr - BuildURLRequestContext(net::NetLog* net_log) { +@@ -141,7 +141,7 @@ class PrintingLogObserver : public net::NetLog::Thread + std::unique_ptr BuildURLRequestContext( + net::NetLog* net_log) { net::URLRequestContextBuilder builder; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/iridium/patches/patch-net_udp_udp_socket_posix_cc b/www/iridium/patches/patch-net_udp_udp_socket_posix_cc index d7fd04f571e..d31a07f1423 100644 --- a/www/iridium/patches/patch-net_udp_udp_socket_posix_cc +++ b/www/iridium/patches/patch-net_udp_udp_socket_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_udp_udp_socket_posix_cc,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- net/udp/udp_socket_posix.cc.orig.port Wed May 25 21:01:04 2016 -+++ net/udp/udp_socket_posix.cc Thu May 26 08:09:47 2016 -@@ -45,7 +45,7 @@ const int kBindRetries = 10; +$OpenBSD: patch-net_udp_udp_socket_posix_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- net/udp/udp_socket_posix.cc.orig.port Wed Oct 12 21:03:01 2016 ++++ net/udp/udp_socket_posix.cc Wed Oct 19 12:56:07 2016 +@@ -48,7 +48,7 @@ const int kBindRetries = 10; const int kPortStart = 1024; const int kPortEnd = 65535; @@ -10,7 +10,7 @@ $OpenBSD: patch-net_udp_udp_socket_posix_cc,v 1.4 2016/05/28 14:49:39 robert Exp // Returns IPv4 address in network order. int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) { -@@ -603,7 +603,7 @@ int UDPSocketPosix::SetMulticastOptions() { +@@ -672,7 +672,7 @@ int UDPSocketPosix::SetMulticastOptions() { if (multicast_interface_ != 0) { switch (addr_family_) { case AF_INET: { @@ -19,7 +19,7 @@ $OpenBSD: patch-net_udp_udp_socket_posix_cc,v 1.4 2016/05/28 14:49:39 robert Exp ip_mreqn mreq; mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = htonl(INADDR_ANY); -@@ -678,7 +678,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a +@@ -747,7 +747,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; diff --git a/www/iridium/patches/patch-net_url_request_url_request_context_builder_cc b/www/iridium/patches/patch-net_url_request_url_request_context_builder_cc index 65755474464..a3daf2f5648 100644 --- a/www/iridium/patches/patch-net_url_request_url_request_context_builder_cc +++ b/www/iridium/patches/patch-net_url_request_url_request_context_builder_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_url_request_url_request_context_builder_cc,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- net/url_request/url_request_context_builder.cc.orig.port Wed May 25 21:01:04 2016 -+++ net/url_request/url_request_context_builder.cc Thu May 26 08:09:47 2016 -@@ -317,7 +317,7 @@ scoped_ptr URLRequestContextBuilder +$OpenBSD: patch-net_url_request_url_request_context_builder_cc,v 1.9 2016/10/27 18:30:41 robert Exp $ +--- net/url_request/url_request_context_builder.cc.orig.port Wed Oct 12 21:03:01 2016 ++++ net/url_request/url_request_context_builder.cc Wed Oct 19 12:56:07 2016 +@@ -327,7 +327,7 @@ std::unique_ptr URLRequestContextBu if (!proxy_service_) { // TODO(willchan): Switch to using this code when // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck. diff --git a/www/iridium/patches/patch-pdf_pdfium_pdfium_engine_cc b/www/iridium/patches/patch-pdf_pdfium_pdfium_engine_cc index 6b1fd31b28f..d81de726293 100644 --- a/www/iridium/patches/patch-pdf_pdfium_pdfium_engine_cc +++ b/www/iridium/patches/patch-pdf_pdfium_pdfium_engine_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- pdf/pdfium/pdfium_engine.cc.orig.port Wed May 25 21:01:04 2016 -+++ pdf/pdfium/pdfium_engine.cc Thu May 26 08:09:47 2016 -@@ -121,7 +121,7 @@ std::vector GetPageNumbersFromPrintPageNumbe +$OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- pdf/pdfium/pdfium_engine.cc.orig.port Wed Oct 12 21:03:01 2016 ++++ pdf/pdfium/pdfium_engine.cc Wed Oct 19 12:56:07 2016 +@@ -123,7 +123,7 @@ std::vector GetPageNumbersFromPrintPageNumbe return page_numbers; } @@ -10,7 +10,7 @@ $OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.10 2016/05/28 14:49:39 robert Ex PP_Instance g_last_instance_id; -@@ -507,7 +507,7 @@ bool InitializeSDK() { +@@ -509,7 +509,7 @@ bool InitializeSDK() { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); @@ -19,7 +19,7 @@ $OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.10 2016/05/28 14:49:39 robert Ex // Font loading doesn't work in the renderer sandbox in Linux. FPDF_SetSystemFontInfo(&g_font_info); #endif -@@ -620,7 +620,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client) +@@ -622,7 +622,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client) IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; @@ -28,7 +28,7 @@ $OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.10 2016/05/28 14:49:39 robert Ex // PreviewModeClient does not know its pp::Instance. pp::Instance* instance = client_->GetPluginInstance(); if (instance) -@@ -1330,7 +1330,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPDF( +@@ -1331,7 +1331,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPDF( FPDF_ClosePage(pdf_page); } @@ -37,7 +37,7 @@ $OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.10 2016/05/28 14:49:39 robert Ex g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -2692,7 +2692,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -2736,7 +2736,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK_LT(static_cast(progressive_index), progressive_paints_.size()); DCHECK(image_data); @@ -46,7 +46,7 @@ $OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.10 2016/05/28 14:49:39 robert Ex g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -3146,7 +3146,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3191,7 +3191,7 @@ void PDFiumEngine::SetCurrentPage(int index) { FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; diff --git a/www/iridium/patches/patch-ppapi_shared_impl_private_net_address_private_impl_cc b/www/iridium/patches/patch-ppapi_shared_impl_private_net_address_private_impl_cc index 640feb038f0..f0e4768b6df 100644 --- a/www/iridium/patches/patch-ppapi_shared_impl_private_net_address_private_impl_cc +++ b/www/iridium/patches/patch-ppapi_shared_impl_private_net_address_private_impl_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-ppapi_shared_impl_private_net_address_private_impl_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ppapi_shared_impl_private_net_address_private_impl_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- ppapi/shared_impl/private/net_address_private_impl.cc.orig.port Wed Feb 24 00:02:01 2016 +++ ppapi/shared_impl/private/net_address_private_impl.cc Thu Mar 3 09:43:26 2016 @@ -28,7 +28,10 @@ diff --git a/www/iridium/patches/patch-printing_backend_print_backend_cups_cc b/www/iridium/patches/patch-printing_backend_print_backend_cups_cc deleted file mode 100644 index f6d90fd87f3..00000000000 --- a/www/iridium/patches/patch-printing_backend_print_backend_cups_cc +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-printing_backend_print_backend_cups_cc,v 1.1 2016/09/19 09:17:45 ajacoutot Exp $ - -Fix build with cups>=2.2.0 - ---- printing/backend/print_backend_cups.cc.orig.port Mon Sep 19 09:44:55 2016 -+++ printing/backend/print_backend_cups.cc Mon Sep 19 09:45:16 2016 -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "printing/backend/print_backend.h" - - #include diff --git a/www/iridium/patches/patch-printing_backend_print_backend_cups_h b/www/iridium/patches/patch-printing_backend_print_backend_cups_h new file mode 100644 index 00000000000..a6fa673b294 --- /dev/null +++ b/www/iridium/patches/patch-printing_backend_print_backend_cups_h @@ -0,0 +1,15 @@ +$OpenBSD: patch-printing_backend_print_backend_cups_h,v 1.1 2016/10/27 18:30:41 robert Exp $ + +Fix build with cups>=2.2.0 + +--- printing/backend/print_backend_cups.h.orig.port Mon Sep 19 09:35:11 2016 ++++ printing/backend/print_backend_cups.h Mon Sep 19 09:35:19 2016 +@@ -5,6 +5,8 @@ + #ifndef PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_ + #define PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_ + ++#include ++ + #include + + #include "base/files/file_util.h" diff --git a/www/iridium/patches/patch-printing_printing_gyp b/www/iridium/patches/patch-printing_printing_gyp deleted file mode 100644 index dc1e02a27f1..00000000000 --- a/www/iridium/patches/patch-printing_printing_gyp +++ /dev/null @@ -1,25 +0,0 @@ -$OpenBSD: patch-printing_printing_gyp,v 1.5 2016/04/27 12:46:16 robert Exp $ ---- printing/printing.gyp.orig.port Fri Apr 8 18:02:10 2016 -+++ printing/printing.gyp Thu Apr 14 08:25:13 2016 -@@ -187,7 +187,7 @@ - 'backend/print_backend_chromeos.cc', - ], - }], -- ['OS=="linux" and chromeos==0', { -+ ['(OS=="linux" or os_bsd ==1) and chromeos==0', { - 'sources': [ - 'printing_context_linux.cc', - 'printing_context_linux.h', -@@ -279,6 +279,12 @@ - ['os_bsd==1', { - 'cflags': [ - 'Initialize(default_limits.command_buffer_size)) + return false; diff --git a/www/iridium/patches/patch-services_ui_surfaces_surfaces_context_provider_cc b/www/iridium/patches/patch-services_ui_surfaces_surfaces_context_provider_cc new file mode 100644 index 00000000000..be0b614a955 --- /dev/null +++ b/www/iridium/patches/patch-services_ui_surfaces_surfaces_context_provider_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-services_ui_surfaces_surfaces_context_provider_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- services/ui/surfaces/surfaces_context_provider.cc.orig.port Wed Oct 19 13:45:47 2016 ++++ services/ui/surfaces/surfaces_context_provider.cc Wed Oct 19 13:46:11 2016 +@@ -73,7 +73,7 @@ bool SurfacesContextProvider::BindToCurrentThread() { + gpu::CommandBuffer* command_buffer = command_buffer_proxy_impl_.get(); + + gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer)); +- constexpr gpu::SharedMemoryLimits default_limits; ++ constexpr gpu::SharedMemoryLimits default_limits = gpu::SharedMemoryLimits(); + if (!gles2_helper_->Initialize(default_limits.command_buffer_size)) + return false; + gles2_helper_->SetAutomaticFlushes(false); diff --git a/www/iridium/patches/patch-skia_ext_SkMemory_new_handler_cpp b/www/iridium/patches/patch-skia_ext_SkMemory_new_handler_cpp index 41c1c713b7a..b7c2f8e7f34 100644 --- a/www/iridium/patches/patch-skia_ext_SkMemory_new_handler_cpp +++ b/www/iridium/patches/patch-skia_ext_SkMemory_new_handler_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-skia_ext_SkMemory_new_handler_cpp,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- skia/ext/SkMemory_new_handler.cpp.orig.port Fri Apr 8 18:02:10 2016 -+++ skia/ext/SkMemory_new_handler.cpp Thu Apr 14 08:25:13 2016 -@@ -62,7 +62,7 @@ static void* sk_malloc_nothrow(size_t size) { +$OpenBSD: patch-skia_ext_SkMemory_new_handler_cpp,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- skia/ext/SkMemory_new_handler.cpp.orig.port Wed Oct 12 21:03:02 2016 ++++ skia/ext/SkMemory_new_handler.cpp Wed Oct 19 12:56:08 2016 +@@ -68,7 +68,7 @@ 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. void* result; diff --git a/www/iridium/patches/patch-skia_skia_chrome_gypi b/www/iridium/patches/patch-skia_skia_chrome_gypi deleted file mode 100644 index d7f8bc21ef8..00000000000 --- a/www/iridium/patches/patch-skia_skia_chrome_gypi +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-skia_skia_chrome_gypi,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- skia/skia_chrome.gypi.orig.port Fri Apr 8 18:02:10 2016 -+++ skia/skia_chrome.gypi Thu Apr 14 08:25:13 2016 -@@ -56,6 +56,11 @@ - 'ext/skia_utils_win.cc', - ], - 'conditions': [ -+ [ 'use_cairo == 1', { -+ 'dependencies': [ -+ '../build/linux/system.gyp:pangocairo', -+ ], -+ }], - [ 'OS == "ios"', { - 'sources!': [ - 'ext/platform_canvas.cc', diff --git a/www/iridium/patches/patch-skia_skia_common_gypi b/www/iridium/patches/patch-skia_skia_common_gypi deleted file mode 100644 index b1dca2b2b9c..00000000000 --- a/www/iridium/patches/patch-skia_skia_common_gypi +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-skia_skia_common_gypi,v 1.3 2015/10/24 18:22:21 robert Exp $ ---- skia/skia_common.gypi.orig.port Wed Oct 7 04:42:14 2015 -+++ skia/skia_common.gypi Wed Oct 14 07:41:13 2015 -@@ -65,7 +65,7 @@ - }], - - #Settings for text blitting, chosen to approximate the system browser. -- [ 'OS == "linux"', { -+ [ 'OS == "linux" or os_bsd == 1', { - 'defines': [ - 'SK_GAMMA_EXPONENT=1.2', - 'SK_GAMMA_CONTRAST=0.2', diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp b/www/iridium/patches/patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp index 368c3599648..5bd44c35d0d 100644 --- a/www/iridium/patches/patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp +++ b/www/iridium/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.6 2016/05/28 14:49:39 robert Exp $ ---- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig.port Wed May 25 21:01:10 2016 -+++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp Thu May 26 08:09:48 2016 -@@ -43,7 +43,7 @@ +$OpenBSD: patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp,v 1.7 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig.port Wed Oct 12 21:03:12 2016 ++++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp Wed Oct 19 12:56:08 2016 +@@ -46,7 +46,7 @@ #if OS(WIN) #include diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_core_core_gyp b/www/iridium/patches/patch-third_party_WebKit_Source_core_core_gyp deleted file mode 100644 index 2f8482de77b..00000000000 --- a/www/iridium/patches/patch-third_party_WebKit_Source_core_core_gyp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-third_party_WebKit_Source_core_core_gyp,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- third_party/WebKit/Source/core/core.gyp.orig.port Wed May 25 21:01:10 2016 -+++ third_party/WebKit/Source/core/core.gyp Thu May 26 08:09:48 2016 -@@ -372,7 +372,7 @@ - 'layout/LayoutThemeMac.mm', - ], - }], -- ['OS != "linux"', { -+ ['OS != "linux" and OS != "openbsd"', { - 'sources!': [ - 'layout/LayoutThemeLinux.cpp', - 'layout/LayoutThemeLinux.h', -@@ -644,7 +644,7 @@ - 'layout/LayoutThemeMac.mm', - ], - }], -- ['OS != "linux"', { -+ ['OS != "linux" and OS != "openbsd"', { - 'sources!': [ - 'layout/LayoutThemeLinux.cpp', - 'layout/LayoutThemeLinux.h', diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp b/www/iridium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp deleted file mode 100644 index daa18e135a1..00000000000 --- a/www/iridium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.7 2016/05/28 14:49:39 robert Exp $ ---- third_party/WebKit/Source/platform/blink_platform.gyp.orig.port Thu May 26 08:30:19 2016 -+++ third_party/WebKit/Source/platform/blink_platform.gyp Thu May 26 08:30:43 2016 -@@ -222,7 +222,7 @@ - ['include', 'graphics/cpu/x86/WebGLImageConversionSSE\\.h$'], - ], - }], -- ['OS=="linux" or OS=="android"', { -+ ['OS=="linux" or OS=="android" or os_bsd==1', { - 'sources/': [ - ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'], - ] -@@ -301,7 +301,7 @@ - ['exclude', 'scroll/ScrollbarThemeMac'], - ], - }], -- ['OS != "linux" and OS != "mac" and OS != "win"', { -+ ['OS != "linux" and OS != "mac" and OS != "win" and os_bsd != 1', { - 'sources/': [ - ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], - ], diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontCache_cpp b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontCache_cpp index 057a63992ff..874e4f8c2db 100644 --- a/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontCache_cpp +++ b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontCache_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_FontCache_cpp,v 1.1 2016/05/28 14:49:39 robert Exp $ ---- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig.port Thu May 26 14:23:38 2016 -+++ third_party/WebKit/Source/platform/fonts/FontCache.cpp Thu May 26 14:23:45 2016 -@@ -59,7 +59,7 @@ using namespace WTF; +$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_FontCache_cpp,v 1.2 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig.port Thu Sep 1 00:03:48 2016 ++++ third_party/WebKit/Source/platform/fonts/FontCache.cpp Thu Sep 1 11:12:24 2016 +@@ -61,7 +61,7 @@ using namespace WTF; namespace blink { diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontCache_h b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontCache_h index 139c8d2e831..06ab062c662 100644 --- a/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontCache_h +++ b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontCache_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_FontCache_h,v 1.1 2016/05/28 14:49:39 robert Exp $ ---- third_party/WebKit/Source/platform/fonts/FontCache.h.orig.port Thu May 26 10:46:03 2016 -+++ third_party/WebKit/Source/platform/fonts/FontCache.h Thu May 26 10:46:12 2016 -@@ -174,7 +174,7 @@ class PLATFORM_EXPORT FontCache { (private) +$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_FontCache_h,v 1.2 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/platform/fonts/FontCache.h.orig.port Thu Sep 1 00:03:48 2016 ++++ third_party/WebKit/Source/platform/fonts/FontCache.h Thu Sep 1 11:12:24 2016 +@@ -179,7 +179,7 @@ class PLATFORM_EXPORT FontCache { (private) // Implemented on skia platforms. PassRefPtr createTypeface(const FontDescription&, const FontFaceCreationParams&, CString& name); diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontPlatformData_cpp b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontPlatformData_cpp new file mode 100644 index 00000000000..f052d0774ed --- /dev/null +++ b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontPlatformData_cpp @@ -0,0 +1,48 @@ +$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_FontPlatformData_cpp,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig.port Thu Jul 21 20:09:59 2016 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp Thu Jul 21 20:10:28 2016 +@@ -93,7 +93,7 @@ FontPlatformData::FontPlatformData(const FontPlatformD + , m_syntheticBold(source.m_syntheticBold) + , m_syntheticItalic(source.m_syntheticItalic) + , m_orientation(source.m_orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(OPENBSD) + , m_style(source.m_style) + #endif + , m_harfBuzzFace(nullptr) +@@ -115,7 +115,7 @@ FontPlatformData::FontPlatformData(const FontPlatformD + , m_syntheticBold(src.m_syntheticBold) + , m_syntheticItalic(src.m_syntheticItalic) + , m_orientation(src.m_orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(OPENBSD) + , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style())) + #endif + , m_harfBuzzFace(nullptr) +@@ -142,7 +142,7 @@ FontPlatformData::FontPlatformData(PassRefPtrstyle())) + #endif + , m_isHashTableDeletedValue(false) +@@ -188,7 +188,7 @@ const FontPlatformData& FontPlatformData::operator=(co + m_syntheticItalic = other.m_syntheticItalic; + m_harfBuzzFace = nullptr; + m_orientation = other.m_orientation; +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(OPENBSD) + m_style = other.m_style; + #endif + +@@ -216,7 +216,7 @@ bool FontPlatformData::operator==(const FontPlatformDa + && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue + && m_syntheticBold == a.m_syntheticBold + && m_syntheticItalic == a.m_syntheticItalic +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(OPENBSD) + && m_style == a.m_style + #endif + && m_orientation == a.m_orientation; diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontPlatformData_h b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontPlatformData_h new file mode 100644 index 00000000000..f11c389bbec --- /dev/null +++ b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_FontPlatformData_h @@ -0,0 +1,30 @@ +$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_FontPlatformData_h,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig.port Thu Jul 21 12:42:29 2016 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h Thu Jul 21 12:42:50 2016 +@@ -46,7 +46,7 @@ + #include "wtf/text/CString.h" + #include "wtf/text/StringImpl.h" + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(OPENBSD) + #include "platform/fonts/linux/FontRenderStyle.h" + #endif // OS(LINUX) || OS(ANDROID) + +@@ -126,7 +126,7 @@ class PLATFORM_EXPORT FontPlatformData { (public) + PassRefPtr verticalData() const; + PassRefPtr openTypeTable(SkFontTableTag) const; + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(OPENBSD) + // The returned styles are all actual styles without FontRenderStyle::NoPreference. + const FontRenderStyle& getFontRenderStyle() const { return m_style; } + #endif +@@ -152,7 +152,7 @@ class PLATFORM_EXPORT FontPlatformData { (public) + bool m_syntheticItalic; + FontOrientation m_orientation; + private: +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(OPENBSD) + FontRenderStyle m_style; + #endif + diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp index 865ffa9655d..1f2482ae8df 100644 --- a/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp +++ b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp,v 1.6 2016/03/23 20:13:07 robert Exp $ ---- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig.port Wed Feb 24 21:01:34 2016 -+++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp Thu Mar 3 09:43:26 2016 -@@ -49,7 +49,7 @@ namespace blink { +$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp,v 1.7 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig.port Thu Sep 1 00:03:48 2016 ++++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp Thu Sep 1 11:12:24 2016 +@@ -51,7 +51,7 @@ namespace blink { const float smallCapsFontSizeMultiplier = 0.7f; const float emphasisMarkFontSizeMultiplier = 0.5f; @@ -17,9 +17,9 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp,v 1. -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(OPENBSD) // Manually digging up VDMX metrics is only applicable when bytecode hinting using FreeType. - // With GDI, the metrics will already have taken this into account (as needed). // With DirectWrite or CoreText, no bytecode hinting is ever done. -@@ -136,7 +136,7 @@ void SimpleFontData::platformInit() + // This code should be pushed into FreeType (hinted font metrics). +@@ -135,7 +135,7 @@ void SimpleFontData::platformInit() } else { ascent = SkScalarRoundToInt(-metrics.fAscent); descent = SkScalarRoundToInt(metrics.fDescent); diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp index 0e7410fe8c1..20951b4f287 100644 --- a/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp +++ b/www/iridium/patches/patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig.port Thu May 26 08:30:51 2016 -+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp Thu May 26 08:31:15 2016 -@@ -60,7 +60,7 @@ static PassRefPtr typefaceForFontconfigInt +$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig.port Wed Oct 12 21:03:14 2016 ++++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp Wed Oct 19 12:56:08 2016 +@@ -62,7 +62,7 @@ static PassRefPtr typefaceForFontconfigInt namespace blink { @@ -10,21 +10,12 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp, // Android special locale for retrieving the color emoji font // based on the proposed changes in UTR #51 for introducing // an Emoji script code: -@@ -171,7 +171,7 @@ PassRefPtr FontCache::getLastResortFal - return fontDataFromFontPlatformData(fontPlatformData, shouldRetain); - } - --#if OS(WIN) || OS(LINUX) -+#if OS(WIN) || OS(LINUX) || OS(OPENBSD) - static inline SkFontStyle fontStyle(const FontDescription& fontDescription) - { - int width = static_cast(fontDescription.stretch()); -@@ -232,7 +232,7 @@ PassRefPtr FontCache::createTypeface(const +@@ -183,7 +183,7 @@ PassRefPtr FontCache::createTypeface(const } #endif --#if OS(LINUX) -+#if OS(LINUX) || OS(OPENBSD) +-#if OS(LINUX) || OS(WIN) ++#if OS(LINUX) || OS(WIN) || OS(OPENBSD) // On linux if the fontManager has been overridden then we should be calling the embedder // provided font Manager rather than calling SkTypeface::CreateFromName which may redirect the // call to the default font Manager. diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp b/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp index 84cad82ae47..fa338390654 100644 --- a/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp +++ b/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp,v 1.7 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp,v 1.8 2016/10/27 18:30:41 robert Exp $ --- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig.port Wed May 25 04:54:37 2016 +++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp Thu May 26 08:09:48 2016 @@ -13,6 +13,10 @@ diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp b/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp index d012a7d00bb..05832cc4a4b 100644 --- a/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp +++ b/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp,v 1.9 2016/04/27 12:46:16 robert Exp $ ---- third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig.port Wed Apr 13 23:00:02 2016 -+++ third_party/WebKit/Source/platform/heap/ThreadState.cpp Thu Apr 14 08:25:14 2016 -@@ -60,7 +60,7 @@ +$OpenBSD: patch-third_party_WebKit_Source_platform_heap_ThreadState_cpp,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig.port Thu Sep 1 00:03:49 2016 ++++ third_party/WebKit/Source/platform/heap/ThreadState.cpp Thu Sep 1 11:12:24 2016 +@@ -65,7 +65,7 @@ #include #endif diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h b/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h index 0ad38aac132..52db6e3aa36 100644 --- a/www/iridium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h +++ b/www/iridium/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.10 2016/05/28 14:49:39 robert Exp $ ---- third_party/WebKit/Source/platform/heap/ThreadState.h.orig.port Wed May 25 21:01:11 2016 -+++ third_party/WebKit/Source/platform/heap/ThreadState.h Thu May 26 08:09:48 2016 -@@ -203,7 +203,7 @@ class PLATFORM_EXPORT ThreadState { (public) +$OpenBSD: patch-third_party_WebKit_Source_platform_heap_ThreadState_h,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/platform/heap/ThreadState.h.orig.port Thu Sep 1 00:03:49 2016 ++++ third_party/WebKit/Source/platform/heap/ThreadState.h Thu Sep 1 11:12:24 2016 +@@ -193,7 +193,7 @@ class PLATFORM_EXPORT ThreadState { (public) static ThreadState* current() { diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder_cpp b/www/iridium/patches/patch-third_party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder_cpp deleted file mode 100644 index 2576a278a7b..00000000000 --- a/www/iridium/patches/patch-third_party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-third_party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder_cpp,v 1.1 2016/05/28 14:49:39 robert Exp $ ---- third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp.orig.port Thu May 26 14:26:49 2016 -+++ third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp Thu May 26 14:35:45 2016 -@@ -234,7 +234,7 @@ void PNGImageDecoder::headerAvailable() - #endif - png_uint_32 profileLength = 0; - if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) { -- setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */); -+ setColorProfileAndTransform(reinterpret_cast(profile), profileLength, imageHasAlpha, false /* useSRGB */); - } - } - #endif // PNG_iCCP_SUPPORTED diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_web_PopupMenuImpl_cpp b/www/iridium/patches/patch-third_party_WebKit_Source_web_PopupMenuImpl_cpp index 7dac49ffaba..587fd1ff036 100644 --- a/www/iridium/patches/patch-third_party_WebKit_Source_web_PopupMenuImpl_cpp +++ b/www/iridium/patches/patch-third_party_WebKit_Source_web_PopupMenuImpl_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_web_PopupMenuImpl_cpp,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig.port Thu May 26 08:31:20 2016 -+++ third_party/WebKit/Source/web/PopupMenuImpl.cpp Thu May 26 08:31:26 2016 -@@ -170,7 +170,7 @@ class PopupMenuImpl::ItemIterationContext { (public) +$OpenBSD: patch-third_party_WebKit_Source_web_PopupMenuImpl_cpp,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig.port Wed Oct 12 21:03:14 2016 ++++ third_party/WebKit/Source/web/PopupMenuImpl.cpp Wed Oct 19 12:56:08 2016 +@@ -156,7 +156,7 @@ class PopupMenuImpl::ItemIterationContext { (public) , m_buffer(buffer) { DCHECK(m_buffer); diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_web_web_gyp b/www/iridium/patches/patch-third_party_WebKit_Source_web_web_gyp deleted file mode 100644 index 913543ccde7..00000000000 --- a/www/iridium/patches/patch-third_party_WebKit_Source_web_web_gyp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-third_party_WebKit_Source_web_web_gyp,v 1.6 2016/05/28 14:49:39 robert Exp $ ---- third_party/WebKit/Source/web/web.gyp.orig.port Wed May 25 21:01:12 2016 -+++ third_party/WebKit/Source/web/web.gyp Thu May 26 08:09:48 2016 -@@ -118,7 +118,7 @@ - '../core/core.gyp:webcore', - ], - }], -- ['OS == "linux"', { -+ ['OS == "linux" or os_bsd == 1', { - 'dependencies': [ - '<(DEPTH)/build/linux/system.gyp:fontconfig', - ], diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_wtf_BUILD_gn b/www/iridium/patches/patch-third_party_WebKit_Source_wtf_BUILD_gn new file mode 100644 index 00000000000..a04a2ad448d --- /dev/null +++ b/www/iridium/patches/patch-third_party_WebKit_Source_wtf_BUILD_gn @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_WebKit_Source_wtf_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/WebKit/Source/wtf/BUILD.gn.orig.port Thu Sep 1 00:03:49 2016 ++++ third_party/WebKit/Source/wtf/BUILD.gn Thu Sep 1 11:12:24 2016 +@@ -84,7 +84,7 @@ component("wtf") { + if (is_android) { + libs = [ "log" ] + } +- if (is_linux) { ++ if (is_linux && !is_openbsd) { + libs = [ "dl" ] + } + diff --git a/www/iridium/patches/patch-third_party_WebKit_Source_wtf_MathExtras_h b/www/iridium/patches/patch-third_party_WebKit_Source_wtf_MathExtras_h index 0187560a1fb..89e512fa728 100644 --- a/www/iridium/patches/patch-third_party_WebKit_Source_wtf_MathExtras_h +++ b/www/iridium/patches/patch-third_party_WebKit_Source_wtf_MathExtras_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_WebKit_Source_wtf_MathExtras_h,v 1.4 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-third_party_WebKit_Source_wtf_MathExtras_h,v 1.5 2016/10/27 18:30:41 robert Exp $ --- third_party/WebKit/Source/wtf/MathExtras.h.orig.port Fri Apr 8 18:02:13 2016 +++ third_party/WebKit/Source/wtf/MathExtras.h Thu Apr 14 08:25:14 2016 @@ -43,8 +43,8 @@ diff --git a/www/iridium/patches/patch-third_party_angle_BUILD_gn b/www/iridium/patches/patch-third_party_angle_BUILD_gn new file mode 100644 index 00000000000..e53f74a51ce --- /dev/null +++ b/www/iridium/patches/patch-third_party_angle_BUILD_gn @@ -0,0 +1,56 @@ +$OpenBSD: patch-third_party_angle_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/angle/BUILD.gn.orig.port Wed Oct 12 21:05:04 2016 ++++ third_party/angle/BUILD.gn Thu Oct 20 13:25:59 2016 +@@ -150,6 +150,8 @@ static_library("angle_common") { + ":angle_release_asserts_config", + ":angle_common_config", + ] ++ ++ cflags = [ "-I/usr/XXXX" ] + } + + config("angle_image_util_config") { +@@ -214,6 +216,7 @@ static_library("translator_lib") { + # For some reason this warning doesn't get triggered in Chromium + cflags = [ "/wd4718" ] + } ++ cflags = [ "-I/usr/XXXX" ] + } + + static_library("translator_static") { +@@ -304,6 +307,7 @@ config("libANGLE_config") { + if (is_win) { + cflags += [ "/wd4530" ] # C++ exception handler used, but unwind semantics are not enabled. + } ++ cflags += [ "-I/usr/XXXX" ] + } + + static_library("libANGLE") { +@@ -408,6 +412,8 @@ static_library("libANGLE") { + ":copy_compiler_dll", + ] + } ++ ++ cflags = [ "-I/usr/XXXX" ] + } + + config("shared_library_public_config") { +@@ -451,6 +457,7 @@ shared_library("libGLESv2") { + ":includes", + ":libANGLE", + ] ++ ldflags = [ "-L/usr/X11R6/lib" ] + } + + shared_library("libEGL") { +@@ -506,10 +513,6 @@ static_library("angle_util") { + + if (is_linux) { + sources += rebase_path(util_gypi.util_linux_sources, ".", "util") +- libs = [ +- "rt", +- "dl", +- ] + } + + if (is_mac) { diff --git a/www/iridium/patches/patch-third_party_ffmpeg_BUILD_gn b/www/iridium/patches/patch-third_party_ffmpeg_BUILD_gn new file mode 100644 index 00000000000..eed967fe16b --- /dev/null +++ b/www/iridium/patches/patch-third_party_ffmpeg_BUILD_gn @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_ffmpeg_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/ffmpeg/BUILD.gn.orig.port Wed Oct 12 21:05:13 2016 ++++ third_party/ffmpeg/BUILD.gn Wed Oct 19 12:56:08 2016 +@@ -271,7 +271,7 @@ target(link_target_type, "ffmpeg_internal") { + # all unwinder-providing libraries). + + # librt for clock_gettime on precise +- libs += [ "m", "z", "rt" ] ++ libs += [ "m", "z" ] + } + if (is_component_ffmpeg) { + # Export all symbols when building as component. diff --git a/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm b/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm index 3f2b316a806..a132f8f1d52 100644 --- a/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm +++ b/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm,v 1.8 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm,v 1.9 2016/10/27 18:30:41 robert Exp $ --- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig.port Thu May 26 18:07:02 2016 +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm Thu May 26 20:03:18 2016 @@ -0,0 +1,2063 @@ diff --git a/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h b/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h index d06ac3566ad..c88167d9eea 100644 --- a/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h +++ b/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,v 1.8 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,v 1.9 2016/10/27 18:30:41 robert Exp $ --- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig.port Thu May 26 18:07:02 2016 +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h Thu May 26 20:03:18 2016 @@ -0,0 +1,2080 @@ diff --git a/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm b/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm index d0a1d5f5577..1c52389752b 100644 --- a/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm +++ b/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm,v 1.8 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm,v 1.9 2016/10/27 18:30:41 robert Exp $ --- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig.port Thu May 26 08:09:48 2016 +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm Thu May 26 09:42:49 2016 @@ -0,0 +1,2063 @@ diff --git a/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h b/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h index f90d562b24e..f42391cf59e 100644 --- a/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h +++ b/www/iridium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig.port Thu May 26 08:09:48 2016 -+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h Thu May 26 09:42:45 2016 +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v 1.9 2016/10/27 18:30:41 robert Exp $ +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig.port Wed Oct 19 13:17:04 2016 ++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h Thu Oct 20 20:50:12 2016 @@ -0,0 +1,2080 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H @@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v +#define CONFIG_THIS_YEAR 2016 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" -+#define CC_IDENT "clang version 3.8.0 (tags/RELEASE_380/final)" ++#define CC_IDENT "clang version 3.8.1 (tags/RELEASE_381/final)" +#define av_restrict restrict +#define EXTERN_PREFIX "" +#define EXTERN_ASM diff --git a/www/iridium/patches/patch-third_party_ffmpeg_ffmpeg_generated_gypi b/www/iridium/patches/patch-third_party_ffmpeg_ffmpeg_generated_gypi deleted file mode 100644 index 0ea1c99008d..00000000000 --- a/www/iridium/patches/patch-third_party_ffmpeg_ffmpeg_generated_gypi +++ /dev/null @@ -1,396 +0,0 @@ -$OpenBSD: patch-third_party_ffmpeg_ffmpeg_generated_gypi,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- third_party/ffmpeg/ffmpeg_generated.gypi.orig.port Wed May 25 21:02:03 2016 -+++ third_party/ffmpeg/ffmpeg_generated.gypi Thu May 26 08:09:48 2016 -@@ -8,7 +8,7 @@ - { - 'variables': { - 'conditions': [ -- ['OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"', { -+ ['OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"', { - 'c_sources': [ - 'libavcodec/arm/blockdsp_init_neon.c', - 'libavcodec/arm/idctdsp_init_neon.c', -@@ -19,8 +19,8 @@ - 'libavcodec/arm/mpegvideo_neon.S', - 'libavcodec/arm/simple_idct_neon.S', - ], -- }], # OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS" -- ['OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"', { -+ }], # OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS" -+ ['OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"', { - 'c_sources': [ - 'libavcodec/mips/blockdsp_init_mips.c', - 'libavcodec/mips/h263dsp_init_mips.c', -@@ -31,8 +31,8 @@ - 'libavcodec/mips/qpeldsp_init_mips.c', - 'libavcodec/mips/xvididct_init_mips.c', - ], -- }], # OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS" -- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', { -+ }], # OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS" -+ ['(OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/x86/blockdsp_init.c', - 'libavcodec/x86/fdct.c', -@@ -57,26 +57,26 @@ - 'libavcodec/x86/simple_idct10.asm', - 'libavcodec/x86/xvididct.asm', - ], -- }], # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") -+ }], # (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") - ['(OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'asm_sources': [ - 'libavutil/x86/emms.asm', - ], - }], # (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', { -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', { - 'asm_sources': [ - 'libavcodec/arm/h264cmc_neon.S', - 'libavcodec/arm/h264dsp_neon.S', - 'libavcodec/arm/h264idct_neon.S', - 'libavcodec/arm/h264qpel_neon.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/neon/autorename_libavcodec_neon_mpegvideo.c', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/arm/blockdsp_init_arm.c', - 'libavcodec/arm/idctdsp_init_arm.c', -@@ -98,8 +98,8 @@ - 'libavcodec/arm/simple_idct_armv5te.S', - 'libavcodec/arm/simple_idct_armv6.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/aarch64/h264chroma_init_aarch64.c', - 'libavcodec/aarch64/h264dsp_init_aarch64.c', -@@ -111,8 +111,8 @@ - 'libavcodec/aarch64/autorename_libavcodec_aarch64_h264idct_neon.S', - 'libavcodec/aarch64/autorename_libavcodec_aarch64_h264qpel_neon.S', - ], -- }], # (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -- ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/aarch64/imdct15_init.c', - 'libavcodec/aarch64/mpegaudiodsp_init.c', -@@ -121,36 +121,36 @@ - 'libavcodec/aarch64/imdct15_neon.S', - 'libavcodec/aarch64/mpegaudiodsp_neon.S', - ], -- }], # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/mips/h264chroma_init_mips.c', - 'libavcodec/mips/h264dsp_init_mips.c', - 'libavcodec/mips/h264qpel_init_mips.c', - ], -- }], # (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") -+ }], # (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") - ['(OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'compat/msvcrt/snprintf.c', - ], - }], # (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', { -+ ['(OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/x86/flacdsp_init.c', - ], - 'asm_sources': [ - 'libavcodec/x86/flacdsp.asm', - ], -- }], # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/mips/aacdec_mips.c', - 'libavcodec/mips/aacpsdsp_mips.c', - 'libavcodec/mips/aacsbr_mips.c', - 'libavcodec/mips/sbrdsp_mips.c', - ], -- }], # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ }], # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'c_sources': [ - 'libavcodec/x86/h264_qpel.c', - 'libavcodec/x86/h264chroma_init.c', -@@ -169,14 +169,14 @@ - 'libavcodec/x86/h264_weight_10bit.asm', - 'libavcodec/x86/qpel.asm', - ], -- }], # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', { - 'asm_sources': [ - 'libavcodec/arm/aacpsdsp_neon.S', - 'libavcodec/arm/sbrdsp_neon.S', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/arm/hpeldsp_init_neon.c', - 'libavcodec/arm/vp8dsp_init_neon.c', -@@ -187,8 +187,8 @@ - 'libavcodec/arm/vp3dsp_neon.S', - 'libavcodec/arm/vp8dsp_neon.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/arm/h264chroma_init_arm.c', - 'libavcodec/arm/h264dsp_init_arm.c', -@@ -197,16 +197,16 @@ - 'asm_sources': [ - 'libavcodec/arm/startcode_armv6.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/arm/flacdsp_init_arm.c', - ], - 'asm_sources': [ - 'libavcodec/arm/flacdsp_arm.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/aarch64/h264pred_init.c', - 'libavcodec/aarch64/hpeldsp_init_aarch64.c', -@@ -217,8 +217,8 @@ - 'libavcodec/aarch64/autorename_libavcodec_aarch64_hpeldsp_neon.S', - 'libavcodec/aarch64/videodsp.S', - ], -- }], # (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/aarch64/fft_init_aarch64.c', - 'libavcodec/aarch64/vorbisdsp_init.c', -@@ -231,15 +231,15 @@ - 'libavcodec/aarch64/vorbisdsp_neon.S', - 'libavutil/aarch64/float_dsp_neon.S', - ], -- }], # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/mips/h264pred_init_mips.c', - 'libavcodec/mips/hpeldsp_init_mips.c', - 'libavcodec/mips/vp8dsp_init_mips.c', - ], -- }], # (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/acelp_filters.c', - 'libavcodec/acelp_pitch_delay.c', -@@ -292,8 +292,8 @@ - 'libavformat/avidec.c', - 'libavformat/gsmdec.c', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/arm/aacpsdsp_init_arm.c', - 'libavcodec/arm/mpegaudiodsp_init_arm.c', -@@ -302,29 +302,29 @@ - 'asm_sources': [ - 'libavcodec/arm/mpegaudiodsp_fixed_armv6.S', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -- ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'asm_sources': [ - 'libavcodec/x86/aacpsdsp.asm', - 'libavcodec/x86/dct32.asm', - 'libavcodec/x86/imdct36.asm', - 'libavcodec/x86/sbrdsp.asm', - ], -- }], # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ }], # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'c_sources': [ - 'libavcodec/x86/aacpsdsp_init.c', - 'libavcodec/x86/dct_init.c', - 'libavcodec/x86/mpegaudiodsp.c', - 'libavcodec/x86/sbrdsp_init.c', - ], -- }], # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavutil/mips/float_dsp_mips.c', - ], -- }], # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { -+ }], # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c', - 'libavcodec/x86/h264_intrapred_init.c', -@@ -342,8 +342,8 @@ - 'libavcodec/x86/vp8dsp.asm', - 'libavcodec/x86/vp8dsp_loopfilter.asm', - ], -- }], # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavutil/arm/float_dsp_init_neon.c', - ], -@@ -356,8 +356,8 @@ - 'libavcodec/arm/rdft_neon.S', - 'libavutil/arm/autorename_libavutil_arm_float_dsp_neon.S', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/arm/h264pred_init_arm.c', - 'libavcodec/arm/hpeldsp_init_arm.c', -@@ -375,8 +375,8 @@ - 'libavcodec/arm/vp8_armv6.S', - 'libavcodec/arm/vp8dsp_armv6.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/flac.c', - 'libavcodec/flac_parser.c', -@@ -385,8 +385,8 @@ - 'libavcodec/flacdsp.c', - 'libavformat/autorename_libavformat_flacdec.c', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/arm/fft_fixed_init_arm.c', - 'libavcodec/arm/fft_init_arm.c', -@@ -400,8 +400,8 @@ - 'libavcodec/arm/mdct_vfp.S', - 'libavutil/arm/float_dsp_vfp.S', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'c_sources': [ - 'libavcodec/cabac.c', - 'libavcodec/h264.c', -@@ -422,8 +422,8 @@ - 'libavcodec/h264qpel.c', - 'libavcodec/startcode.c', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'asm_sources': [ - 'libavcodec/x86/fft.asm', - 'libavcodec/x86/vorbisdsp.asm', -@@ -432,8 +432,8 @@ - 'libavutil/x86/float_dsp.asm', - 'libavutil/x86/lls.asm', - ], -- }], # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { -+ }], # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -+ ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c', - 'libavcodec/x86/constants.c', -@@ -443,13 +443,13 @@ - 'libavutil/x86/fixed_dsp_init.c', - 'libavutil/x86/lls_init.c', - ], -- }], # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -+ }], # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") - ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'compat/strtod.c', - ], - }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'c_sources': [ - 'libavcodec/aac_ac3_parser.c', - 'libavcodec/aac_parser.c', -@@ -483,13 +483,13 @@ - 'libavformat/mov_chan.c', - 'libavformat/mp3dec.c', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'c_sources': [ - 'libavformat/rawdec.c', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'libavcodec/h264pred.c', - 'libavcodec/hpeldsp.c', -@@ -502,8 +502,8 @@ - 'libavcodec/vp8_parser.c', - 'libavcodec/vp8dsp.c', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { -+ }], # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'libavcodec/allcodecs.c', - 'libavcodec/autorename_libavcodec_utils.c', -@@ -634,7 +634,7 @@ - 'libavutil/twofish.c', - 'libavutil/utils.c', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") - ], # conditions - }, - } diff --git a/www/iridium/patches/patch-third_party_ffmpeg_ffmpeg_gyp b/www/iridium/patches/patch-third_party_ffmpeg_ffmpeg_gyp deleted file mode 100644 index ab7ca43ddd6..00000000000 --- a/www/iridium/patches/patch-third_party_ffmpeg_ffmpeg_gyp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-third_party_ffmpeg_ffmpeg_gyp,v 1.7 2016/03/23 20:13:07 robert Exp $ ---- third_party/ffmpeg/ffmpeg.gyp.orig.port Wed Mar 2 21:02:56 2016 -+++ third_party/ffmpeg/ffmpeg.gyp Thu Mar 3 09:43:26 2016 -@@ -317,7 +317,7 @@ - ], - }, - 'conditions': [ -- ['OS != "android"', { -+ ['OS != "android" and os_bsd != 1', { - 'link_settings': { - # OS=android requires that both -lz and -lm occur - # after -lc++_shared on the link command diff --git a/www/iridium/patches/patch-third_party_ffmpeg_libavcodec_x86_cabac_h b/www/iridium/patches/patch-third_party_ffmpeg_libavcodec_x86_cabac_h index 61523c527fd..122f13f96e2 100644 --- a/www/iridium/patches/patch-third_party_ffmpeg_libavcodec_x86_cabac_h +++ b/www/iridium/patches/patch-third_party_ffmpeg_libavcodec_x86_cabac_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_ffmpeg_libavcodec_x86_cabac_h,v 1.2 2015/05/06 14:27:24 robert Exp $ +$OpenBSD: patch-third_party_ffmpeg_libavcodec_x86_cabac_h,v 1.3 2016/10/27 18:30:41 robert Exp $ --- third_party/ffmpeg/libavcodec/x86/cabac.h.orig.port Thu Nov 13 23:02:42 2014 +++ third_party/ffmpeg/libavcodec/x86/cabac.h Fri Nov 14 22:03:05 2014 @@ -29,7 +29,7 @@ diff --git a/www/iridium/patches/patch-third_party_ffmpeg_libavutil_autorename_libavutil_cpu_c b/www/iridium/patches/patch-third_party_ffmpeg_libavutil_autorename_libavutil_cpu_c deleted file mode 100644 index 66dfc9ac797..00000000000 --- a/www/iridium/patches/patch-third_party_ffmpeg_libavutil_autorename_libavutil_cpu_c +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-third_party_ffmpeg_libavutil_autorename_libavutil_cpu_c,v 1.1 2015/08/12 10:56:13 robert Exp $ ---- third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c.orig.port Wed Jul 22 09:44:47 2015 -+++ third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c Wed Jul 22 10:00:36 2015 -@@ -37,6 +37,7 @@ - #if HAVE_SYS_PARAM_H - #include - #endif -+typedef unsigned long u_long; - #include - #include - #endif diff --git a/www/iridium/patches/patch-third_party_ffmpeg_libavutil_cpu_c b/www/iridium/patches/patch-third_party_ffmpeg_libavutil_cpu_c index dbb6e20c4e1..7cfe95e35ef 100644 --- a/www/iridium/patches/patch-third_party_ffmpeg_libavutil_cpu_c +++ b/www/iridium/patches/patch-third_party_ffmpeg_libavutil_cpu_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_ffmpeg_libavutil_cpu_c,v 1.3 2016/02/15 18:07:53 robert Exp $ +$OpenBSD: patch-third_party_ffmpeg_libavutil_cpu_c,v 1.4 2016/10/27 18:30:41 robert Exp $ --- third_party/ffmpeg/libavutil/cpu.c.orig.port Wed Jan 20 21:02:06 2016 +++ third_party/ffmpeg/libavutil/cpu.c Fri Jan 22 19:58:59 2016 @@ -33,10 +33,7 @@ diff --git a/www/iridium/patches/patch-third_party_ffmpeg_libavutil_mem_c b/www/iridium/patches/patch-third_party_ffmpeg_libavutil_mem_c index 2febae3639d..b8f0459778c 100644 --- a/www/iridium/patches/patch-third_party_ffmpeg_libavutil_mem_c +++ b/www/iridium/patches/patch-third_party_ffmpeg_libavutil_mem_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_ffmpeg_libavutil_mem_c,v 1.2 2015/05/06 14:27:24 robert Exp $ +$OpenBSD: patch-third_party_ffmpeg_libavutil_mem_c,v 1.3 2016/10/27 18:30:41 robert Exp $ --- third_party/ffmpeg/libavutil/mem.c.orig.port Fri May 17 22:46:42 2013 +++ third_party/ffmpeg/libavutil/mem.c Thu May 30 00:10:49 2013 @@ -32,9 +32,6 @@ diff --git a/www/iridium/patches/patch-third_party_iccjpeg_iccjpeg_gyp b/www/iridium/patches/patch-third_party_iccjpeg_iccjpeg_gyp deleted file mode 100644 index 4f865e57e55..00000000000 --- a/www/iridium/patches/patch-third_party_iccjpeg_iccjpeg_gyp +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-third_party_iccjpeg_iccjpeg_gyp,v 1.2 2015/05/06 14:27:24 robert Exp $ ---- third_party/iccjpeg/iccjpeg.gyp.orig.port Fri Mar 22 02:13:38 2013 -+++ third_party/iccjpeg/iccjpeg.gyp Tue Apr 2 21:05:17 2013 -@@ -14,6 +14,13 @@ - 'iccjpeg.c', - 'iccjpeg.h', - ], -+ 'conditions': [ -+ ['OS=="openbsd" and use_system_libjpeg==1', { -+ 'include_dirs': [ -+ '/usr/local/include', -+ ], -+ }], -+ ], - 'direct_dependent_settings': { - 'include_dirs': [ - '.', diff --git a/www/iridium/patches/patch-third_party_libXNVCtrl_NVCtrl_c b/www/iridium/patches/patch-third_party_libXNVCtrl_NVCtrl_c index 51fa56857a3..547c48f5810 100644 --- a/www/iridium/patches/patch-third_party_libXNVCtrl_NVCtrl_c +++ b/www/iridium/patches/patch-third_party_libXNVCtrl_NVCtrl_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_libXNVCtrl_NVCtrl_c,v 1.2 2015/05/06 14:27:24 robert Exp $ +$OpenBSD: patch-third_party_libXNVCtrl_NVCtrl_c,v 1.3 2016/10/27 18:30:41 robert Exp $ --- third_party/libXNVCtrl/NVCtrl.c.orig.port Fri Mar 22 02:13:35 2013 +++ third_party/libXNVCtrl/NVCtrl.c Tue Apr 2 21:05:17 2013 @@ -27,10 +27,6 @@ diff --git a/www/iridium/patches/patch-third_party_libXNVCtrl_libXNVCtrl_gyp b/www/iridium/patches/patch-third_party_libXNVCtrl_libXNVCtrl_gyp deleted file mode 100644 index ff9d4daf637..00000000000 --- a/www/iridium/patches/patch-third_party_libXNVCtrl_libXNVCtrl_gyp +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-third_party_libXNVCtrl_libXNVCtrl_gyp,v 1.2 2015/05/06 14:27:24 robert Exp $ ---- third_party/libXNVCtrl/libXNVCtrl.gyp.orig.port Fri Mar 22 02:13:35 2013 -+++ third_party/libXNVCtrl/libXNVCtrl.gyp Tue Apr 2 21:05:17 2013 -@@ -13,6 +13,9 @@ - 'NVCtrlLib.h', - 'nv_control.h', - ], -+ 'cflags': [ -+ '-I/usr/X11R6/include', -+ ], - }, - ], - } diff --git a/www/iridium/patches/patch-third_party_libjingle_libjingle_gyp b/www/iridium/patches/patch-third_party_libjingle_libjingle_gyp deleted file mode 100644 index 5094a4b2e80..00000000000 --- a/www/iridium/patches/patch-third_party_libjingle_libjingle_gyp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-third_party_libjingle_libjingle_gyp,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- third_party/libjingle/libjingle.gyp.orig.port Wed May 25 21:01:12 2016 -+++ third_party/libjingle/libjingle.gyp Thu May 26 08:09:48 2016 -@@ -121,6 +121,8 @@ - ['os_bsd==1', { - 'defines': [ - 'BSD', -+ 'WEBRTC_LINUX', -+ 'WEBRTC_BSD', - ], - }], - ['OS=="openbsd"', { -@@ -191,6 +193,8 @@ - ['os_bsd==1', { - 'defines': [ - 'BSD', -+ 'WEBRTC_LINUX', -+ 'WEBRTC_BSD', - ], - }], - ['OS=="openbsd"', { diff --git a/www/iridium/patches/patch-third_party_libjpeg_turbo_libjpeg_gyp b/www/iridium/patches/patch-third_party_libjpeg_turbo_libjpeg_gyp deleted file mode 100644 index 3d44c3d3c68..00000000000 --- a/www/iridium/patches/patch-third_party_libjpeg_turbo_libjpeg_gyp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-third_party_libjpeg_turbo_libjpeg_gyp,v 1.4 2016/02/15 18:07:53 robert Exp $ ---- third_party/libjpeg_turbo/libjpeg.gyp.orig.port Wed Jan 20 21:02:14 2016 -+++ third_party/libjpeg_turbo/libjpeg.gyp Wed Jan 27 17:56:11 2016 -@@ -246,7 +246,7 @@ - ], - }, - }], -- [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and (target_arch=="ia32" or target_arch=="x64"))', { -+ [ 'OS=="linux" or os_bsd==1 or (OS=="android" and (target_arch=="ia32" or target_arch=="x64"))', { - 'conditions': [ - [ 'use_system_yasm==0', { - 'dependencies': [ diff --git a/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton_h b/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton_h index a9f37d7a278..d9aac8bd423 100644 --- a/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton_h +++ b/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton_h,v 1.1 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig.port Thu May 26 13:05:44 2016 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h Thu May 26 13:06:40 2016 @@ -56,7 +56,7 @@ template boost::once_flag Singleton::flag diff --git a/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock_h b/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock_h index aba0b447b0d..d55cb9b905d 100644 --- a/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock_h +++ b/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock_h,v 1.1 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig.port Thu May 26 13:07:07 2016 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h Thu May 26 13:07:14 2016 @@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLock; diff --git a/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_thread_checker_h b/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_thread_checker_h index 4866c1228c2..bed73b7ff52 100644 --- a/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_thread_checker_h +++ b/www/iridium/patches/patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_thread_checker_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_thread_checker_h,v 1.1 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-third_party_libphonenumber_dist_cpp_src_phonenumbers_base_thread_checker_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig.port Thu May 26 13:06:45 2016 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h Thu May 26 13:07:03 2016 @@ -23,7 +23,7 @@ diff --git a/www/iridium/patches/patch-third_party_libusb_BUILD_gn b/www/iridium/patches/patch-third_party_libusb_BUILD_gn new file mode 100644 index 00000000000..94b9361f41c --- /dev/null +++ b/www/iridium/patches/patch-third_party_libusb_BUILD_gn @@ -0,0 +1,38 @@ +$OpenBSD: patch-third_party_libusb_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/libusb/BUILD.gn.orig.port Wed Oct 12 21:03:15 2016 ++++ third_party/libusb/BUILD.gn Wed Oct 19 12:56:09 2016 +@@ -93,7 +93,7 @@ static_library("libusb") { + ] + } + +- if (is_linux) { ++ if (is_linux && !is_openbsd) { + sources += [ + "src/libusb/os/linux_usbfs.c", + "src/libusb/os/linux_usbfs.h", +@@ -104,6 +104,16 @@ static_library("libusb") { + ] + } + ++ if (is_openbsd) { ++ sources += [ ++ "src/libusb/os/openbsd_usb.c", ++ ] ++ defines += [ ++ "OS_OPENBSD=1", ++ "_GNU_SOURCE=1", ++ ] ++ } ++ + if (is_chromeos) { + defines += [ "USBI_TIMERFD_AVAILABLE" ] + } +@@ -117,7 +127,7 @@ static_library("libusb") { + deps += [ "//build/linux/libudev" ] + } + +- if (is_linux && !use_udev) { ++ if (is_linux && !use_udev && !is_openbsd) { + sources += [ "src/libusb/os/linux_netlink.c" ] + defines += [ "HAVE_LINUX_NETLINK_H" ] + } diff --git a/www/iridium/patches/patch-third_party_libusb_libusb_gyp b/www/iridium/patches/patch-third_party_libusb_libusb_gyp deleted file mode 100644 index 7c8ffc32ade..00000000000 --- a/www/iridium/patches/patch-third_party_libusb_libusb_gyp +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-third_party_libusb_libusb_gyp,v 1.2 2015/10/24 18:22:21 robert Exp $ ---- third_party/libusb/libusb.gyp.orig.port Tue Oct 13 21:04:35 2015 -+++ third_party/libusb/libusb.gyp Wed Oct 14 07:41:14 2015 -@@ -40,7 +40,7 @@ - ], - }, - 'conditions': [ -- ['OS=="linux" or OS=="mac"', { -+ ['OS=="linux" or OS=="mac" or os_bsd==1', { - 'sources': [ - 'src/libusb/os/poll_posix.c', - 'src/libusb/os/poll_posix.h', -@@ -55,6 +55,15 @@ - 'LIBUSB_DESCRIBE="1.0.16"', - 'POLL_NFDS_TYPE=nfds_t', - 'THREADS_POSIX=1', -+ ], -+ }], -+ ['OS=="openbsd"', { -+ 'defines': [ -+ 'OS_OPENBSD=1', -+ '_GNU_SOURCE=1', -+ ], -+ 'sources': [ -+ 'src/libusb/os/openbsd_usb.c', - ], - }], - ['OS=="linux"', { diff --git a/www/iridium/patches/patch-third_party_libusb_src_libusb_core_c b/www/iridium/patches/patch-third_party_libusb_src_libusb_core_c index 06b1e05e550..1d28b23876b 100644 --- a/www/iridium/patches/patch-third_party_libusb_src_libusb_core_c +++ b/www/iridium/patches/patch-third_party_libusb_src_libusb_core_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_libusb_src_libusb_core_c,v 1.1 2015/08/17 17:21:31 robert Exp $ +$OpenBSD: patch-third_party_libusb_src_libusb_core_c,v 1.2 2016/10/27 18:30:41 robert Exp $ --- third_party/libusb/src/libusb/core.c.orig.port Sun Aug 16 11:07:28 2015 +++ third_party/libusb/src/libusb/core.c Sun Aug 16 11:07:39 2015 @@ -448,7 +448,7 @@ libusb_free_device_list(list, 1); diff --git a/www/iridium/patches/patch-third_party_libyuv_libyuv_gyp b/www/iridium/patches/patch-third_party_libyuv_libyuv_gyp deleted file mode 100644 index e824dcd438c..00000000000 --- a/www/iridium/patches/patch-third_party_libyuv_libyuv_gyp +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-third_party_libyuv_libyuv_gyp,v 1.6 2016/04/27 12:46:16 robert Exp $ ---- third_party/libyuv/libyuv.gyp.orig.port Wed Apr 13 23:01:16 2016 -+++ third_party/libyuv/libyuv.gyp Thu Apr 14 08:25:14 2016 -@@ -88,11 +88,15 @@ - ], - }], - [ 'use_system_libjpeg == 1', { -+ 'include_dirs': [ '/usr/local/include' ], - 'link_settings': { - 'libraries': [ - '-ljpeg', - ], - } -+ }], -+ ['target_arch == "ia32"', { -+ 'cflags': [ '-fomit-frame-pointer' ], - }], - ], - }], diff --git a/www/iridium/patches/patch-third_party_pdfium_build_standalone_gypi b/www/iridium/patches/patch-third_party_pdfium_build_standalone_gypi deleted file mode 100644 index ccc8064b590..00000000000 --- a/www/iridium/patches/patch-third_party_pdfium_build_standalone_gypi +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-third_party_pdfium_build_standalone_gypi,v 1.7 2016/04/27 12:46:16 robert Exp $ ---- third_party/pdfium/build/standalone.gypi.orig.port Wed Apr 13 23:01:22 2016 -+++ third_party/pdfium/build/standalone.gypi Thu Apr 14 08:25:14 2016 -@@ -18,7 +18,7 @@ - 'variables': { - 'variables': { - 'conditions': [ -- ['OS=="linux" or OS=="mac"', { -+ ['OS=="linux" or OS=="mac" or OS=="openbsd"', { - # This handles the Unix platforms we generally deal with. - # Anything else gets passed through, which probably won't work - # very well; such hosts should pass an explicit target_arch -@@ -139,7 +139,7 @@ - }, - }, - 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="openbsd"', { - 'cflags': [ - '-fdata-sections', - '-ffunction-sections', diff --git a/www/iridium/patches/patch-third_party_pdfium_core_fxcrt_include_fx_system_h b/www/iridium/patches/patch-third_party_pdfium_core_fxcrt_include_fx_system_h index 56ed9adf222..4316d153ce3 100644 --- a/www/iridium/patches/patch-third_party_pdfium_core_fxcrt_include_fx_system_h +++ b/www/iridium/patches/patch-third_party_pdfium_core_fxcrt_include_fx_system_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_pdfium_core_fxcrt_include_fx_system_h,v 1.1 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-third_party_pdfium_core_fxcrt_include_fx_system_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- third_party/pdfium/core/fxcrt/include/fx_system.h.orig.port Thu May 26 08:32:11 2016 +++ third_party/pdfium/core/fxcrt/include/fx_system.h Thu May 26 08:32:19 2016 @@ -40,7 +40,7 @@ diff --git a/www/iridium/patches/patch-third_party_pdfium_core_fxge_ge_fx_ge_linux_cpp b/www/iridium/patches/patch-third_party_pdfium_core_fxge_ge_fx_ge_linux_cpp index b30b5e51e9d..243f71037a1 100644 --- a/www/iridium/patches/patch-third_party_pdfium_core_fxge_ge_fx_ge_linux_cpp +++ b/www/iridium/patches/patch-third_party_pdfium_core_fxge_ge_fx_ge_linux_cpp @@ -1,8 +1,8 @@ -$OpenBSD: patch-third_party_pdfium_core_fxge_ge_fx_ge_linux_cpp,v 1.1 2016/05/28 14:49:39 robert Exp $ ---- third_party/pdfium/core/fxge/ge/fx_ge_linux.cpp.orig.port Thu May 26 08:32:40 2016 -+++ third_party/pdfium/core/fxge/ge/fx_ge_linux.cpp Thu May 26 08:32:52 2016 -@@ -123,9 +123,8 @@ void* CFX_LinuxFontInfo::MapFont(int weight, - IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUserPaths) { +$OpenBSD: patch-third_party_pdfium_core_fxge_ge_fx_ge_linux_cpp,v 1.2 2016/10/27 18:30:41 robert Exp $ +--- third_party/pdfium/core/fxge/ge/fx_ge_linux.cpp.orig.port Wed Oct 12 21:05:31 2016 ++++ third_party/pdfium/core/fxge/ge/fx_ge_linux.cpp Wed Oct 19 12:56:09 2016 +@@ -143,9 +143,8 @@ std::unique_ptr IFX_SystemFontInfo + const char** pUserPaths) { CFX_LinuxFontInfo* pInfo = new CFX_LinuxFontInfo; if (!pInfo->ParseFontCfg(pUserPaths)) { - pInfo->AddPath("/usr/share/fonts"); @@ -12,4 +12,4 @@ $OpenBSD: patch-third_party_pdfium_core_fxge_ge_fx_ge_linux_cpp,v 1.1 2016/05/28 + pInfo->AddPath("/usr/X11R6/lib/X11/fonts/TTF"); pInfo->AddPath("/usr/local/share/fonts"); } - return pInfo; + return std::unique_ptr(pInfo); diff --git a/www/iridium/patches/patch-third_party_pdfium_fpdfsdk_javascript_JS_Value_cpp b/www/iridium/patches/patch-third_party_pdfium_fpdfsdk_javascript_JS_Value_cpp index 1121c1a0af7..cd20bd5c3e6 100644 --- a/www/iridium/patches/patch-third_party_pdfium_fpdfsdk_javascript_JS_Value_cpp +++ b/www/iridium/patches/patch-third_party_pdfium_fpdfsdk_javascript_JS_Value_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_pdfium_fpdfsdk_javascript_JS_Value_cpp,v 1.1 2016/05/28 14:49:39 robert Exp $ ---- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig.port Thu May 26 08:33:02 2016 -+++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp Thu May 26 08:33:16 2016 -@@ -602,7 +602,12 @@ double _getLocalTZA() { +$OpenBSD: patch-third_party_pdfium_fpdfsdk_javascript_JS_Value_cpp,v 1.2 2016/10/27 18:30:41 robert Exp $ +--- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig.port Wed Oct 12 21:05:31 2016 ++++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp Wed Oct 19 12:56:09 2016 +@@ -470,7 +470,12 @@ double _getLocalTZA() { long timezone = 0; _get_timezone(&timezone); #endif diff --git a/www/iridium/patches/patch-third_party_pdfium_pdfium_gyp b/www/iridium/patches/patch-third_party_pdfium_pdfium_gyp deleted file mode 100644 index a63758d4e03..00000000000 --- a/www/iridium/patches/patch-third_party_pdfium_pdfium_gyp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-third_party_pdfium_pdfium_gyp,v 1.6 2016/05/28 14:49:39 robert Exp $ ---- third_party/pdfium/pdfium.gyp.orig.port Wed May 25 21:02:25 2016 -+++ third_party/pdfium/pdfium.gyp Thu May 26 08:09:48 2016 -@@ -16,7 +16,7 @@ - 'pdf_enable_v8%': 1, - 'pdf_enable_xfa%': 0, # Set to 1 by standalone.gypi in a standalone build. - '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. -@@ -75,7 +75,7 @@ - ['pdf_enable_xfa==1', { - 'defines': ['PDF_ENABLE_XFA'], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['target_arch=="x64"', { - 'defines' : [ '_FX_CPU_=_FX_X64_', ], diff --git a/www/iridium/patches/patch-third_party_pdfium_third_party_libopenjpeg20_opj_malloc_h b/www/iridium/patches/patch-third_party_pdfium_third_party_libopenjpeg20_opj_malloc_h index c757f9ff650..81d3c9c0147 100644 --- a/www/iridium/patches/patch-third_party_pdfium_third_party_libopenjpeg20_opj_malloc_h +++ b/www/iridium/patches/patch-third_party_pdfium_third_party_libopenjpeg20_opj_malloc_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_pdfium_third_party_libopenjpeg20_opj_malloc_h,v 1.1 2015/10/24 18:22:21 robert Exp $ +$OpenBSD: patch-third_party_pdfium_third_party_libopenjpeg20_opj_malloc_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- third_party/pdfium/third_party/libopenjpeg20/opj_malloc.h.orig.port Thu Oct 22 09:01:40 2015 +++ third_party/pdfium/third_party/libopenjpeg20/opj_malloc.h Fri Oct 23 15:56:07 2015 @@ -98,7 +98,7 @@ Allocate memory aligned to a 16 byte boundary diff --git a/www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h b/www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h index 1270a626682..ced8971a98f 100644 --- a/www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h +++ b/www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h,v 1.2 2015/05/06 14:27:24 robert Exp $ ---- third_party/protobuf/src/google/protobuf/stubs/atomicops.h.orig.port Fri Mar 22 02:13:26 2013 -+++ third_party/protobuf/src/google/protobuf/stubs/atomicops.h Tue Apr 2 21:05:18 2013 -@@ -77,7 +77,11 @@ typedef intptr_t Atomic64; +$OpenBSD: patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- third_party/protobuf/src/google/protobuf/stubs/atomicops.h.orig.port Wed Jul 20 21:03:43 2016 ++++ third_party/protobuf/src/google/protobuf/stubs/atomicops.h Thu Jul 21 10:25:32 2016 +@@ -89,7 +89,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/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros_h b/www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros_h new file mode 100644 index 00000000000..8ae6846925a --- /dev/null +++ b/www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros_h,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig.port Thu Sep 1 11:36:47 2016 ++++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h Thu Sep 1 11:36:59 2016 +@@ -114,7 +114,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR + + #undef GOOGLE_PROTOBUF_PLATFORM_ERROR + +-#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) ++#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__) + // Android ndk does not support the __thread keyword very well yet. Here + // we use pthread_key_create()/pthread_getspecific()/... methods for + // TLS support on android. diff --git a/www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_strutil_h b/www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_strutil_h index 3fd18713052..0dbb72b822a 100644 --- a/www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_strutil_h +++ b/www/iridium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_strutil_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_protobuf_src_google_protobuf_stubs_strutil_h,v 1.2 2015/05/06 14:27:24 robert Exp $ ---- third_party/protobuf/src/google/protobuf/stubs/strutil.h.orig.port Fri Oct 11 19:29:11 2013 -+++ third_party/protobuf/src/google/protobuf/stubs/strutil.h Fri Oct 18 20:47:20 2013 -@@ -317,13 +317,13 @@ inline uint32 strtou32(const char *nptr, char **endptr +$OpenBSD: patch-third_party_protobuf_src_google_protobuf_stubs_strutil_h,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- third_party/protobuf/src/google/protobuf/stubs/strutil.h.orig.port Wed Jul 20 21:03:44 2016 ++++ third_party/protobuf/src/google/protobuf/stubs/strutil.h Thu Jul 21 10:25:32 2016 +@@ -371,13 +371,13 @@ inline uint32 strtou32(const char *nptr, char **endptr inline int64 strto64(const char *nptr, char **endptr, int base) { GOOGLE_COMPILE_ASSERT(sizeof(int64) == sizeof(long long), sizeof_int64_is_not_sizeof_long_long); diff --git a/www/iridium/patches/patch-third_party_skia_gyp_ports_gyp b/www/iridium/patches/patch-third_party_skia_gyp_ports_gyp deleted file mode 100644 index 7bec0375490..00000000000 --- a/www/iridium/patches/patch-third_party_skia_gyp_ports_gyp +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-third_party_skia_gyp_ports_gyp,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- third_party/skia/gyp/ports.gyp.orig.port Wed May 25 21:02:33 2016 -+++ third_party/skia/gyp/ports.gyp Thu May 26 08:09:49 2016 -@@ -89,7 +89,6 @@ - [ 'skia_android_framework', { - 'link_settings': { 'libraries': [ '-lexpat' ] }, - }, { -- 'link_settings': { 'libraries': [ '-ldl' ] }, - 'dependencies': [ 'expat.gyp:expat' ], - }], - [ 'skia_embedded_fonts', { diff --git a/www/iridium/patches/patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h b/www/iridium/patches/patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h index 71763459c94..986420a8eea 100644 --- a/www/iridium/patches/patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h +++ b/www/iridium/patches/patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h,v 1.4 2016/10/27 18:30:41 robert Exp $ --- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig.port Thu Mar 3 10:12:57 2016 +++ third_party/skia/src/gpu/GrAutoLocaleSetter.h Thu Mar 3 10:13:40 2016 @@ -22,7 +22,7 @@ diff --git a/www/iridium/patches/patch-third_party_skia_src_ports_SkOSFile_stdio_cpp b/www/iridium/patches/patch-third_party_skia_src_ports_SkOSFile_stdio_cpp index 0fa81b0c0e6..ab735f4fcec 100644 --- a/www/iridium/patches/patch-third_party_skia_src_ports_SkOSFile_stdio_cpp +++ b/www/iridium/patches/patch-third_party_skia_src_ports_SkOSFile_stdio_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_skia_src_ports_SkOSFile_stdio_cpp,v 1.2 2016/04/27 12:46:16 robert Exp $ ---- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig.port Thu Apr 14 14:09:36 2016 -+++ third_party/skia/src/ports/SkOSFile_stdio.cpp Thu Apr 14 14:09:45 2016 -@@ -145,7 +145,7 @@ void sk_fflush(FILE* f) { +$OpenBSD: patch-third_party_skia_src_ports_SkOSFile_stdio_cpp,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig.port Wed Oct 12 21:05:36 2016 ++++ third_party/skia/src/ports/SkOSFile_stdio.cpp Wed Oct 19 12:56:10 2016 +@@ -149,7 +149,7 @@ void sk_fflush(FILE* f) { void sk_fsync(FILE* f) { #if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \ diff --git a/www/iridium/patches/patch-third_party_sqlite_BUILD_gn b/www/iridium/patches/patch-third_party_sqlite_BUILD_gn new file mode 100644 index 00000000000..a53aa91df82 --- /dev/null +++ b/www/iridium/patches/patch-third_party_sqlite_BUILD_gn @@ -0,0 +1,21 @@ +$OpenBSD: patch-third_party_sqlite_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/sqlite/BUILD.gn.orig.port Sun Aug 14 20:22:54 2016 ++++ third_party/sqlite/BUILD.gn Mon Aug 15 16:18:50 2016 +@@ -125,7 +125,7 @@ if (!use_system_sqlite) { + + # Pull in config.h on Linux. This allows use of preprocessor macros which + # are not available to the build config. +- if (is_linux) { ++ if (is_linux && !is_openbsd) { + defines += [ "_HAVE_SQLITE_CONFIG_H" ] + } + +@@ -140,7 +140,7 @@ if (!use_system_sqlite) { + ":sqlite_warnings", + ] + +- if (is_linux) { ++ if (is_linux && !is_openbsd) { + libs = [ "dl" ] + } else if (is_mac || is_ios) { + libs = [ diff --git a/www/iridium/patches/patch-third_party_usrsctp_BUILD_gn b/www/iridium/patches/patch-third_party_usrsctp_BUILD_gn new file mode 100644 index 00000000000..022fddee2ce --- /dev/null +++ b/www/iridium/patches/patch-third_party_usrsctp_BUILD_gn @@ -0,0 +1,19 @@ +$OpenBSD: patch-third_party_usrsctp_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/usrsctp/BUILD.gn.orig.port Sun Aug 14 16:32:41 2016 ++++ third_party/usrsctp/BUILD.gn Sun Aug 14 16:33:15 2016 +@@ -107,9 +107,14 @@ static_library("usrsctp") { + "-UINET6", + ] + +- if (is_linux || is_android) { ++ if ((is_linux && !is_openbsd) || is_android) { + defines += [ + "__Userspace_os_Linux", ++ "_GNU_SOURCE", ++ ] ++ } else if (is_openbsd) { ++ defines += [ ++ "__Userspace_os_OpenBSD", + "_GNU_SOURCE", + ] + } else if (is_mac || is_ios) { diff --git a/www/iridium/patches/patch-third_party_usrsctp_usrsctp_gyp b/www/iridium/patches/patch-third_party_usrsctp_usrsctp_gyp deleted file mode 100644 index 492b9ac15cb..00000000000 --- a/www/iridium/patches/patch-third_party_usrsctp_usrsctp_gyp +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-third_party_usrsctp_usrsctp_gyp,v 1.1 2016/04/27 12:46:16 robert Exp $ ---- third_party/usrsctp/usrsctp.gyp.orig.port Mon Apr 25 19:19:30 2016 -+++ third_party/usrsctp/usrsctp.gyp Mon Apr 25 19:56:41 2016 -@@ -111,6 +111,11 @@ - 'cflags!': [ '-Werror', '-Wall' ], - 'cflags': [ '-w' ], - }], -+ ['os_bsd==1', { -+ 'defines': [ -+ '__Userspace_os_OpenBSD', -+ ], -+ }], - ['OS=="mac" or OS=="ios"', { - 'defines': [ - 'HAVE_SA_LEN', diff --git a/www/iridium/patches/patch-third_party_webrtc_BUILD_gn b/www/iridium/patches/patch-third_party_webrtc_BUILD_gn new file mode 100644 index 00000000000..a6a079eecf2 --- /dev/null +++ b/www/iridium/patches/patch-third_party_webrtc_BUILD_gn @@ -0,0 +1,13 @@ +$OpenBSD: patch-third_party_webrtc_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/webrtc/BUILD.gn.orig.port Wed Oct 12 21:05:46 2016 ++++ third_party/webrtc/BUILD.gn Wed Oct 19 12:56:10 2016 +@@ -60,6 +60,9 @@ config("common_inherited_config") { + if (is_linux) { + defines += [ "WEBRTC_LINUX" ] + } ++ if (is_openbsd) { ++ defines += [ "WEBRTC_BSD" ] ++ } + if (is_mac) { + defines += [ "WEBRTC_MAC" ] + } diff --git a/www/iridium/patches/patch-third_party_webrtc_base_BUILD_gn b/www/iridium/patches/patch-third_party_webrtc_base_BUILD_gn new file mode 100644 index 00000000000..19e76b679c6 --- /dev/null +++ b/www/iridium/patches/patch-third_party_webrtc_base_BUILD_gn @@ -0,0 +1,22 @@ +$OpenBSD: patch-third_party_webrtc_base_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/webrtc/base/BUILD.gn.orig.port Fri Oct 21 00:02:58 2016 ++++ third_party/webrtc/base/BUILD.gn Sat Oct 22 16:08:11 2016 +@@ -563,16 +563,15 @@ static_library("rtc_base") { + "x11windowpicker.h", + ] + libs += [ +- "dl", +- "rt", + "Xext", + "X11", + "Xcomposite", + "Xrender", + ] ++ cflags += [ "-I/usr/XXXXX11R6/include" ] + } + +- if (is_linux) { ++ if (is_linux && !is_openbsd) { + libs += [ + "dl", + "rt", diff --git a/www/iridium/patches/patch-third_party_webrtc_base_base_gyp b/www/iridium/patches/patch-third_party_webrtc_base_base_gyp deleted file mode 100644 index 1d12c4e559d..00000000000 --- a/www/iridium/patches/patch-third_party_webrtc_base_base_gyp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-third_party_webrtc_base_base_gyp,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- third_party/webrtc/base/base.gyp.orig.port Wed May 25 21:02:41 2016 -+++ third_party/webrtc/base/base.gyp Thu May 26 08:09:49 2016 -@@ -519,8 +519,6 @@ - ], - 'link_settings': { - 'libraries': [ -- '-ldl', -- '-lrt', - '-lXext', - '-lX11', - '-lXcomposite', diff --git a/www/iridium/patches/patch-third_party_webrtc_base_httpcommon_cc b/www/iridium/patches/patch-third_party_webrtc_base_httpcommon_cc index 64654565d1f..fc9ba708bee 100644 --- a/www/iridium/patches/patch-third_party_webrtc_base_httpcommon_cc +++ b/www/iridium/patches/patch-third_party_webrtc_base_httpcommon_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_webrtc_base_httpcommon_cc,v 1.3 2016/02/15 18:07:53 robert Exp $ +$OpenBSD: patch-third_party_webrtc_base_httpcommon_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- third_party/webrtc/base/httpcommon.cc.orig.port Wed Jan 20 21:02:39 2016 +++ third_party/webrtc/base/httpcommon.cc Fri Jan 22 19:58:59 2016 @@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string& date, time_t diff --git a/www/iridium/patches/patch-third_party_webrtc_base_network_cc b/www/iridium/patches/patch-third_party_webrtc_base_network_cc index fc5eafdefe6..6deb50ed445 100644 --- a/www/iridium/patches/patch-third_party_webrtc_base_network_cc +++ b/www/iridium/patches/patch-third_party_webrtc_base_network_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-third_party_webrtc_base_network_cc,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- third_party/webrtc/base/network.cc.orig.port Wed May 25 21:02:41 2016 -+++ third_party/webrtc/base/network.cc Thu May 26 08:09:49 2016 +$OpenBSD: patch-third_party_webrtc_base_network_cc,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- third_party/webrtc/base/network.cc.orig.port Thu Sep 1 00:05:08 2016 ++++ third_party/webrtc/base/network.cc Thu Sep 1 11:12:25 2016 @@ -14,7 +14,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.9 2016/05/28 14:49:39 rob #include #include #elif !defined(__native_client__) -@@ -631,7 +631,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ +@@ -656,7 +656,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ } #endif // WEBRTC_WIN @@ -19,7 +19,7 @@ $OpenBSD: patch-third_party_webrtc_base_network_cc,v 1.9 2016/05/28 14:49:39 rob bool IsDefaultRoute(const std::string& network_name) { FileStream fs; if (!fs.Open("/proc/net/route", "r", NULL)) { -@@ -674,7 +674,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo +@@ -699,7 +699,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo strncmp(network.name().c_str(), "vboxnet", 7) == 0) { return true; } diff --git a/www/iridium/patches/patch-third_party_webrtc_base_physicalsocketserver_cc b/www/iridium/patches/patch-third_party_webrtc_base_physicalsocketserver_cc index 5d37457bb54..e2205fde374 100644 --- a/www/iridium/patches/patch-third_party_webrtc_base_physicalsocketserver_cc +++ b/www/iridium/patches/patch-third_party_webrtc_base_physicalsocketserver_cc @@ -1,7 +1,16 @@ -$OpenBSD: patch-third_party_webrtc_base_physicalsocketserver_cc,v 1.7 2016/05/28 14:49:39 robert Exp $ ---- third_party/webrtc/base/physicalsocketserver.cc.orig.port Wed May 25 21:02:41 2016 -+++ third_party/webrtc/base/physicalsocketserver.cc Thu May 26 08:09:49 2016 -@@ -245,7 +245,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +$OpenBSD: patch-third_party_webrtc_base_physicalsocketserver_cc,v 1.8 2016/10/27 18:30:41 robert Exp $ +--- third_party/webrtc/base/physicalsocketserver.cc.orig.port Thu Sep 1 00:05:08 2016 ++++ third_party/webrtc/base/physicalsocketserver.cc Thu Sep 1 14:11:35 2016 +@@ -59,7 +59,7 @@ typedef void* SockOptArg; + + #endif // WEBRTC_POSIX + +-#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) ++#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) && !defined(WEBRTC_BSD) + + int64_t GetSocketRecvTimestamp(int socket) { + struct timeval tv_ioctl; +@@ -276,7 +276,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) socklen_t optlen = sizeof(*value); int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); if (ret != -1 && opt == OPT_DONTFRAGMENT) { @@ -10,7 +19,7 @@ $OpenBSD: patch-third_party_webrtc_base_physicalsocketserver_cc,v 1.7 2016/05/28 *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } -@@ -258,7 +258,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -289,7 +289,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -19,7 +28,7 @@ $OpenBSD: patch-third_party_webrtc_base_physicalsocketserver_cc,v 1.7 2016/05/28 value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } -@@ -533,7 +533,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -571,7 +571,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/iridium/patches/patch-third_party_webrtc_base_platform_thread_cc b/www/iridium/patches/patch-third_party_webrtc_base_platform_thread_cc index 4fb0ffb56e3..c4296355c8b 100644 --- a/www/iridium/patches/patch-third_party_webrtc_base_platform_thread_cc +++ b/www/iridium/patches/patch-third_party_webrtc_base_platform_thread_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_webrtc_base_platform_thread_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-third_party_webrtc_base_platform_thread_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- third_party/webrtc/base/platform_thread.cc.orig.port Thu Mar 3 10:14:44 2016 +++ third_party/webrtc/base/platform_thread.cc Thu Mar 3 10:15:35 2016 @@ -13,7 +13,9 @@ diff --git a/www/iridium/patches/patch-third_party_webrtc_base_stringutils_h b/www/iridium/patches/patch-third_party_webrtc_base_stringutils_h index 34c97b1e446..0b78db21d45 100644 --- a/www/iridium/patches/patch-third_party_webrtc_base_stringutils_h +++ b/www/iridium/patches/patch-third_party_webrtc_base_stringutils_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_webrtc_base_stringutils_h,v 1.2 2015/05/06 14:27:24 robert Exp $ +$OpenBSD: patch-third_party_webrtc_base_stringutils_h,v 1.3 2016/10/27 18:30:41 robert Exp $ --- third_party/webrtc/base/stringutils.h.orig.port Thu Oct 2 19:40:33 2014 +++ third_party/webrtc/base/stringutils.h Fri Oct 10 19:52:11 2014 @@ -20,14 +20,14 @@ diff --git a/www/iridium/patches/patch-third_party_webrtc_build_common_gypi b/www/iridium/patches/patch-third_party_webrtc_build_common_gypi deleted file mode 100644 index d8441c9f056..00000000000 --- a/www/iridium/patches/patch-third_party_webrtc_build_common_gypi +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-third_party_webrtc_build_common_gypi,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- third_party/webrtc/build/common.gypi.orig.port Wed May 25 21:02:41 2016 -+++ third_party/webrtc/build/common.gypi Thu May 26 08:09:49 2016 -@@ -402,6 +402,13 @@ - 'WEBRTC_LINUX', - ], - }], -+ ['os_bsd==1', { -+ 'defines': [ -+ 'WEBRTC_BSD', -+ 'WEBRTC_LINUX', -+ 'WEBRTC_THREAD_RR', -+ ], -+ }], - ['OS=="mac"', { - 'defines': [ - 'WEBRTC_MAC', -@@ -485,7 +492,7 @@ - 'WEBRTC_WIN', - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'defines': [ - 'WEBRTC_LINUX', - ], diff --git a/www/iridium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn b/www/iridium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn new file mode 100644 index 00000000000..0fcb2dfae94 --- /dev/null +++ b/www/iridium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_webrtc_modules_audio_device_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig.port Wed Oct 19 13:53:09 2016 ++++ third_party/webrtc/modules/audio_device/BUILD.gn Wed Oct 19 13:53:42 2016 +@@ -98,7 +98,7 @@ source_set("audio_device") { + if (rtc_use_dummy_audio_file_devices) { + defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] + } else { +- if (is_linux) { ++ if (is_linux && !is_openbsd) { + sources += [ + "linux/alsasymboltable_linux.cc", + "linux/alsasymboltable_linux.h", diff --git a/www/iridium/patches/patch-third_party_webrtc_system_wrappers_BUILD_gn b/www/iridium/patches/patch-third_party_webrtc_system_wrappers_BUILD_gn new file mode 100644 index 00000000000..fb8afbfc89a --- /dev/null +++ b/www/iridium/patches/patch-third_party_webrtc_system_wrappers_BUILD_gn @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_webrtc_system_wrappers_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/webrtc/system_wrappers/BUILD.gn.orig.port Thu Sep 1 00:05:08 2016 ++++ third_party/webrtc/system_wrappers/BUILD.gn Thu Sep 1 11:12:25 2016 +@@ -111,8 +111,6 @@ source_set("system_wrappers") { + if (!build_with_chromium) { + deps += [ ":cpu_features_linux" ] + } +- +- libs += [ "rt" ] + } + + if (is_linux || is_android) { diff --git a/www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_atomic32_non_darwin_unix_cc b/www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_atomic32_non_darwin_unix_cc new file mode 100644 index 00000000000..4d3846f7dcf --- /dev/null +++ b/www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_atomic32_non_darwin_unix_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_webrtc_system_wrappers_source_atomic32_non_darwin_unix_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig.port Thu Sep 1 14:38:15 2016 ++++ third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc Thu Sep 1 14:38:59 2016 +@@ -12,7 +12,7 @@ + + #include + #include +-#include ++#include + + #include "webrtc/common_types.h" + diff --git a/www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_atomic32_posix_cc b/www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_atomic32_posix_cc deleted file mode 100644 index 00f1ec75dd5..00000000000 --- a/www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_atomic32_posix_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-third_party_webrtc_system_wrappers_source_atomic32_posix_cc,v 1.2 2015/05/06 14:27:24 robert Exp $ ---- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig.port Sat Oct 11 19:03:07 2014 -+++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc Sat Oct 11 19:03:13 2014 -@@ -12,7 +12,7 @@ - - #include - #include --#include -+#include - - #include "webrtc/common_types.h" - diff --git a/www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_timestamp_extrapolator_cc b/www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_timestamp_extrapolator_cc index f70f475c120..80cf0e7e919 100644 --- a/www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_timestamp_extrapolator_cc +++ b/www/iridium/patches/patch-third_party_webrtc_system_wrappers_source_timestamp_extrapolator_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_webrtc_system_wrappers_source_timestamp_extrapolator_cc,v 1.2 2015/05/06 14:27:24 robert Exp $ +$OpenBSD: patch-third_party_webrtc_system_wrappers_source_timestamp_extrapolator_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ --- third_party/webrtc/system_wrappers/source/timestamp_extrapolator.cc.orig.port Thu Jul 17 13:41:47 2014 +++ third_party/webrtc/system_wrappers/source/timestamp_extrapolator.cc Thu Jul 17 13:41:56 2014 @@ -12,6 +12,8 @@ diff --git a/www/iridium/patches/patch-third_party_webrtc_voice_engine_voice_engine_defines_h b/www/iridium/patches/patch-third_party_webrtc_voice_engine_voice_engine_defines_h index 024489a5970..6e2a13a297c 100644 --- a/www/iridium/patches/patch-third_party_webrtc_voice_engine_voice_engine_defines_h +++ b/www/iridium/patches/patch-third_party_webrtc_voice_engine_voice_engine_defines_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_webrtc_voice_engine_voice_engine_defines_h,v 1.1 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-third_party_webrtc_voice_engine_voice_engine_defines_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- third_party/webrtc/voice_engine/voice_engine_defines.h.orig.port Mon Apr 25 10:30:44 2016 +++ third_party/webrtc/voice_engine/voice_engine_defines.h Mon Apr 25 10:37:34 2016 @@ -210,7 +210,7 @@ inline int VoEChannelId(int moduleId) { diff --git a/www/iridium/patches/patch-third_party_yasm_source_config_openbsd_config_h b/www/iridium/patches/patch-third_party_yasm_source_config_openbsd_config_h index 9a699860b14..0382743d782 100644 --- a/www/iridium/patches/patch-third_party_yasm_source_config_openbsd_config_h +++ b/www/iridium/patches/patch-third_party_yasm_source_config_openbsd_config_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_yasm_source_config_openbsd_config_h,v 1.2 2015/05/06 14:27:24 robert Exp $ +$OpenBSD: patch-third_party_yasm_source_config_openbsd_config_h,v 1.3 2016/10/27 18:30:41 robert Exp $ --- third_party/yasm/source/config/openbsd/config.h.orig.port Fri Mar 22 02:13:37 2013 +++ third_party/yasm/source/config/openbsd/config.h Tue Apr 2 21:05:18 2013 @@ -13,6 +13,14 @@ diff --git a/www/iridium/patches/patch-third_party_yasm_source_config_openbsd_libyasm-stdint_h b/www/iridium/patches/patch-third_party_yasm_source_config_openbsd_libyasm-stdint_h index 954411a4df8..eea80ccc680 100644 --- a/www/iridium/patches/patch-third_party_yasm_source_config_openbsd_libyasm-stdint_h +++ b/www/iridium/patches/patch-third_party_yasm_source_config_openbsd_libyasm-stdint_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-third_party_yasm_source_config_openbsd_libyasm-stdint_h,v 1.2 2015/05/06 14:27:24 robert Exp $ +$OpenBSD: patch-third_party_yasm_source_config_openbsd_libyasm-stdint_h,v 1.3 2016/10/27 18:30:41 robert Exp $ --- third_party/yasm/source/config/openbsd/libyasm-stdint.h.orig.port Fri Mar 22 02:13:37 2013 +++ third_party/yasm/source/config/openbsd/libyasm-stdint.h Tue Apr 2 21:05:18 2013 @@ -1,7 +1,7 @@ diff --git a/www/iridium/patches/patch-third_party_zlib_BUILD_gn b/www/iridium/patches/patch-third_party_zlib_BUILD_gn new file mode 100644 index 00000000000..2ff5e0b07af --- /dev/null +++ b/www/iridium/patches/patch-third_party_zlib_BUILD_gn @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_zlib_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- third_party/zlib/BUILD.gn.orig.port Mon Aug 15 21:10:46 2016 ++++ third_party/zlib/BUILD.gn Mon Aug 15 21:10:52 2016 +@@ -115,7 +115,7 @@ static_library("minizip") { + "contrib/minizip/iowin32.h", + ] + } +- if (is_mac || is_ios || is_android) { ++ if (is_mac || is_ios || is_android || is_openbsd) { + # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We + # use fopen, ftell, and fseek instead on these systems. + defines = [ "USE_FILE32API" ] diff --git a/www/iridium/patches/patch-tools_gn_args_cc b/www/iridium/patches/patch-tools_gn_args_cc new file mode 100644 index 00000000000..9ab23a22e94 --- /dev/null +++ b/www/iridium/patches/patch-tools_gn_args_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-tools_gn_args_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- tools/gn/args.cc.orig.port Wed Oct 19 13:53:46 2016 ++++ tools/gn/args.cc Wed Oct 19 13:54:01 2016 +@@ -260,6 +260,8 @@ void Args::SetSystemVarsLocked(Scope* dest) const { + os = "android"; + #elif defined(OS_NETBSD) + os = "netbsd"; ++#elif defined(OS_OPENBSD) ++ os = "openbsd"; + #else + #error Unknown OS type. + #endif diff --git a/www/iridium/patches/patch-tools_gn_bootstrap_bootstrap_py b/www/iridium/patches/patch-tools_gn_bootstrap_bootstrap_py new file mode 100644 index 00000000000..f5867d9b552 --- /dev/null +++ b/www/iridium/patches/patch-tools_gn_bootstrap_bootstrap_py @@ -0,0 +1,49 @@ +$OpenBSD: patch-tools_gn_bootstrap_bootstrap_py,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- tools/gn/bootstrap/bootstrap.py.orig.port Fri Oct 21 00:02:19 2016 ++++ tools/gn/bootstrap/bootstrap.py Tue Oct 25 09:40:32 2016 +@@ -32,7 +32,8 @@ SRC_ROOT = os.path.dirname(os.path.dirname(GN_ROOT)) + is_win = sys.platform.startswith('win') + is_linux = sys.platform.startswith('linux') + is_mac = sys.platform.startswith('darwin') +-is_posix = is_linux or is_mac ++is_openbsd = sys.platform.startswith('openbsd') ++is_posix = is_linux or is_mac or is_openbsd + + def check_call(cmd, **kwargs): + logging.debug('Running: %s', ' '.join(cmd)) +@@ -561,6 +562,35 @@ def write_gn_ninja(path, root_gen_dir, options): + 'include_dirs': [], + 'cflags': cflags + ['-DHAVE_CONFIG_H'], + } ++ ++ ++ if is_openbsd: ++ ldflags.extend(['-lpthread', '-lexecinfo']) ++ include_dirs += ["/usr/local/include"] ++ ++ static_libraries['xdg_user_dirs'] = { ++ 'sources': [ ++ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', ++ ], ++ 'tool': 'cxx', ++ } ++ static_libraries['base']['sources'].extend([ ++ 'base/memory/shared_memory_posix.cc', ++ 'base/nix/xdg_util.cc', ++ 'base/process/internal_linux.cc', ++ 'base/process/process_handle_openbsd.cc', ++ 'base/process/process_metrics_openbsd.cc', ++ 'base/strings/sys_string_conversions_posix.cc', ++ 'base/sys_info_openbsd.cc', ++ 'base/threading/platform_thread_linux.cc', ++ 'base/trace_event/malloc_dump_provider.cc', ++ ]) ++ static_libraries['libevent']['include_dirs'].extend([ ++ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'openbsd') ++ ]) ++ static_libraries['libevent']['sources'].extend([ ++ 'base/third_party/libevent/kqueue.c', ++ ]) + + if is_linux: + libs.extend(['-lrt', '-latomic']) diff --git a/www/iridium/patches/patch-tools_gn_bootstrap_build_ninja_template b/www/iridium/patches/patch-tools_gn_bootstrap_build_ninja_template new file mode 100644 index 00000000000..505c720b5e0 --- /dev/null +++ b/www/iridium/patches/patch-tools_gn_bootstrap_build_ninja_template @@ -0,0 +1,12 @@ +$OpenBSD: patch-tools_gn_bootstrap_build_ninja_template,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- tools/gn/bootstrap/build.ninja.template.orig.port Wed Oct 12 21:03:16 2016 ++++ tools/gn/bootstrap/build.ninja.template Wed Oct 19 12:56:11 2016 +@@ -11,7 +11,7 @@ rule cxx + deps = gcc + + rule alink_thin +- command = rm -f $out && $ar rcsT $out $in ++ command = rm -f $out && $ar rcs $out $in + description = AR $out + + rule link diff --git a/www/iridium/patches/patch-tools_gyp_pylib_gyp_generator_make_py b/www/iridium/patches/patch-tools_gyp_pylib_gyp_generator_make_py index ce17c950357..242f9f1a695 100644 --- a/www/iridium/patches/patch-tools_gyp_pylib_gyp_generator_make_py +++ b/www/iridium/patches/patch-tools_gyp_pylib_gyp_generator_make_py @@ -1,4 +1,4 @@ -$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.3 2016/02/15 18:07:53 robert Exp $ +$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.4 2016/10/27 18:30:41 robert Exp $ --- tools/gyp/pylib/gyp/generator/make.py.orig.port Fri Jan 22 22:14:59 2016 +++ tools/gyp/pylib/gyp/generator/make.py Fri Jan 22 22:15:51 2016 @@ -136,7 +136,7 @@ quiet_cmd_alink = AR($(TOOLSET)) $@ diff --git a/www/iridium/patches/patch-tools_gyp_pylib_gyp_generator_ninja_py b/www/iridium/patches/patch-tools_gyp_pylib_gyp_generator_ninja_py index d0a8382625c..6e5a28a246f 100644 --- a/www/iridium/patches/patch-tools_gyp_pylib_gyp_generator_ninja_py +++ b/www/iridium/patches/patch-tools_gyp_pylib_gyp_generator_ninja_py @@ -1,7 +1,7 @@ -$OpenBSD: patch-tools_gyp_pylib_gyp_generator_ninja_py,v 1.9 2016/05/28 14:49:39 robert Exp $ ---- tools/gyp/pylib/gyp/generator/ninja.py.orig.port Wed May 25 21:02:45 2016 -+++ tools/gyp/pylib/gyp/generator/ninja.py Thu May 26 08:09:49 2016 -@@ -2106,7 +2106,7 @@ def GenerateOutputForConfig(target_list, target_dicts, +$OpenBSD: patch-tools_gyp_pylib_gyp_generator_ninja_py,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- tools/gyp/pylib/gyp/generator/ninja.py.orig.port Wed Jul 20 21:05:09 2016 ++++ tools/gyp/pylib/gyp/generator/ninja.py Thu Jul 21 10:25:32 2016 +@@ -2107,7 +2107,7 @@ def GenerateOutputForConfig(target_list, target_dicts, master_ninja.rule( 'alink_thin', description='AR $out', @@ -10,7 +10,7 @@ $OpenBSD: patch-tools_gyp_pylib_gyp_generator_ninja_py,v 1.9 2016/05/28 14:49:39 # 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 -@@ -2123,7 +2123,7 @@ def GenerateOutputForConfig(target_list, target_dicts, +@@ -2124,7 +2124,7 @@ def GenerateOutputForConfig(target_list, target_dicts, '$ld -shared $ldflags -o $lib -Wl,-soname=$soname %(suffix)s', 'extract_toc': ('{ $readelf -d $lib | grep SONAME ; ' diff --git a/www/iridium/patches/patch-tools_perf_chrome_telemetry_build_BUILD_gn b/www/iridium/patches/patch-tools_perf_chrome_telemetry_build_BUILD_gn new file mode 100644 index 00000000000..bafb618beef --- /dev/null +++ b/www/iridium/patches/patch-tools_perf_chrome_telemetry_build_BUILD_gn @@ -0,0 +1,12 @@ +$OpenBSD: patch-tools_perf_chrome_telemetry_build_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig.port Thu Sep 1 00:03:52 2016 ++++ tools/perf/chrome_telemetry_build/BUILD.gn Thu Sep 1 11:12:25 2016 +@@ -52,7 +52,7 @@ group("telemetry_chrome_test") { + data_deps += [ "//chrome:reorder_imports" ] + } + +- if (is_linux) { ++ if (is_linux && !is_openbsd) { + data_deps += [ + "//tools/xdisplaycheck", + "//breakpad:dump_syms($host_toolchain)", diff --git a/www/iridium/patches/patch-ui_accessibility_accessibility_gyp b/www/iridium/patches/patch-ui_accessibility_accessibility_gyp deleted file mode 100644 index af150fd8076..00000000000 --- a/www/iridium/patches/patch-ui_accessibility_accessibility_gyp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-ui_accessibility_accessibility_gyp,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- ui/accessibility/accessibility.gyp.orig.port Wed May 25 04:54:43 2016 -+++ ui/accessibility/accessibility.gyp Thu May 26 08:09:49 2016 -@@ -68,7 +68,7 @@ - '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2' - ], - }], -- ['OS=="linux" and chromeos==0 and use_x11==1', { -+ ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_x11==1', { - 'dependencies': [ - '../../build/linux/system.gyp:atk', - '../../build/linux/system.gyp:gconf', -@@ -85,7 +85,7 @@ - ], - }, - }], -- ['OS!="linux" or chromeos==1 or use_x11==0', { -+ ['(OS!="linux" and os_bsd!=1) or chromeos==1 or use_x11==0', { - 'sources!': [ - 'platform/ax_platform_node_auralinux.cc', - 'platform/ax_platform_node_auralinux.h', diff --git a/www/iridium/patches/patch-ui_accessibility_platform_ax_platform_node_h b/www/iridium/patches/patch-ui_accessibility_platform_ax_platform_node_h index 0fade539eaf..19884b2bee3 100644 --- a/www/iridium/patches/patch-ui_accessibility_platform_ax_platform_node_h +++ b/www/iridium/patches/patch-ui_accessibility_platform_ax_platform_node_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_accessibility_platform_ax_platform_node_h,v 1.1 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_accessibility_platform_ax_platform_node_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- ui/accessibility/platform/ax_platform_node.h.orig.port Sat Mar 5 23:36:06 2016 +++ ui/accessibility/platform/ax_platform_node.h Sat Mar 5 23:36:15 2016 @@ -22,7 +22,7 @@ diff --git a/www/iridium/patches/patch-ui_app_list_app_list_constants_cc b/www/iridium/patches/patch-ui_app_list_app_list_constants_cc index 2e356d98bec..466254819ff 100644 --- a/www/iridium/patches/patch-ui_app_list_app_list_constants_cc +++ b/www/iridium/patches/patch-ui_app_list_app_list_constants_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_app_list_app_list_constants_cc,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- ui/app_list/app_list_constants.cc.orig.port Wed May 25 21:01:13 2016 -+++ ui/app_list/app_list_constants.cc Thu May 26 08:09:49 2016 -@@ -148,7 +148,7 @@ const char kSearchQueryLength[] = "Apps.AppListSearchQ +$OpenBSD: patch-ui_app_list_app_list_constants_cc,v 1.9 2016/10/27 18:30:41 robert Exp $ +--- ui/app_list/app_list_constants.cc.orig.port Thu Sep 1 00:03:52 2016 ++++ ui/app_list/app_list_constants.cc Thu Sep 1 11:12:25 2016 +@@ -154,7 +154,7 @@ const char kSearchQueryLength[] = "Apps.AppListSearchQ const char kSearchResultDistanceFromOrigin[] = "Apps.AppListSearchResultDistanceFromOrigin"; diff --git a/www/iridium/patches/patch-ui_app_list_app_list_constants_h b/www/iridium/patches/patch-ui_app_list_app_list_constants_h index 68b98f66716..713024c566b 100644 --- a/www/iridium/patches/patch-ui_app_list_app_list_constants_h +++ b/www/iridium/patches/patch-ui_app_list_app_list_constants_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_app_list_app_list_constants_h,v 1.6 2016/03/23 20:13:07 robert Exp $ ---- ui/app_list/app_list_constants.h.orig.port Wed Feb 24 00:02:06 2016 -+++ ui/app_list/app_list_constants.h Thu Mar 3 09:43:26 2016 -@@ -92,7 +92,7 @@ APP_LIST_EXPORT extern const char kSearchResultOpenDis +$OpenBSD: patch-ui_app_list_app_list_constants_h,v 1.7 2016/10/27 18:30:41 robert Exp $ +--- ui/app_list/app_list_constants.h.orig.port Thu Sep 1 00:03:52 2016 ++++ ui/app_list/app_list_constants.h Thu Sep 1 11:12:25 2016 +@@ -95,7 +95,7 @@ APP_LIST_EXPORT extern const char kSearchResultOpenDis APP_LIST_EXPORT extern const char kSearchQueryLength[]; APP_LIST_EXPORT extern const char kSearchResultDistanceFromOrigin[]; diff --git a/www/iridium/patches/patch-ui_app_list_app_list_menu_cc b/www/iridium/patches/patch-ui_app_list_app_list_menu_cc index a2a12a975bb..c045c23d693 100644 --- a/www/iridium/patches/patch-ui_app_list_app_list_menu_cc +++ b/www/iridium/patches/patch-ui_app_list_app_list_menu_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-ui_app_list_app_list_menu_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ ---- ui/app_list/app_list_menu.cc.orig.port Wed Feb 24 00:02:06 2016 -+++ ui/app_list/app_list_menu.cc Thu Mar 3 09:43:26 2016 -@@ -35,7 +35,7 @@ void AppListMenu::InitMenu() { - users_[i].email.empty() ? users_[i].name - : users_[i].email, - 0 /* group_id */); --#elif defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#elif defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) +$OpenBSD: patch-ui_app_list_app_list_menu_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ +--- ui/app_list/app_list_menu.cc.orig.port Wed Oct 19 13:54:06 2016 ++++ ui/app_list/app_list_menu.cc Wed Oct 19 13:54:28 2016 +@@ -30,7 +30,7 @@ void AppListMenu::InitMenu() { + // only 1 user. + if (users_.size() > 1) { + for (size_t i = 0; i < users_.size(); ++i) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) menu_model_.AddItem(SELECT_PROFILE + i, users_[i].name); int menu_index = menu_model_.GetIndexOfCommandId(SELECT_PROFILE + i); menu_model_.SetSublabel(menu_index, users_[i].email); diff --git a/www/iridium/patches/patch-ui_app_list_views_app_list_item_view_cc b/www/iridium/patches/patch-ui_app_list_views_app_list_item_view_cc index 0bb7e37507d..d1fec45a4eb 100644 --- a/www/iridium/patches/patch-ui_app_list_views_app_list_item_view_cc +++ b/www/iridium/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.6 2016/03/23 20:13:07 robert Exp $ ---- ui/app_list/views/app_list_item_view.cc.orig.port Wed Feb 24 00:02:06 2016 -+++ ui/app_list/views/app_list_item_view.cc Thu Mar 3 09:43:26 2016 -@@ -62,7 +62,7 @@ gfx::FontList GetFontList() { +$OpenBSD: patch-ui_app_list_views_app_list_item_view_cc,v 1.7 2016/10/27 18:30:41 robert Exp $ +--- ui/app_list/views/app_list_item_view.cc.orig.port Wed Oct 12 21:03:17 2016 ++++ ui/app_list/views/app_list_item_view.cc Wed Oct 19 12:56:11 2016 +@@ -55,7 +55,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/iridium/patches/patch-ui_app_list_views_app_list_view_cc b/www/iridium/patches/patch-ui_app_list_views_app_list_view_cc index 5335003c30f..aedebfc4a08 100644 --- a/www/iridium/patches/patch-ui_app_list_views_app_list_view_cc +++ b/www/iridium/patches/patch-ui_app_list_views_app_list_view_cc @@ -1,21 +1,21 @@ -$OpenBSD: patch-ui_app_list_views_app_list_view_cc,v 1.6 2016/04/27 12:46:16 robert Exp $ ---- ui/app_list/views/app_list_view.cc.orig.port Wed Apr 13 23:00:04 2016 -+++ ui/app_list/views/app_list_view.cc Thu Apr 14 08:25:15 2016 -@@ -80,7 +80,7 @@ bool SupportsShadow() { - ::switches::kDisableDwmComposition)) { - return false; - } --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) +$OpenBSD: patch-ui_app_list_views_app_list_view_cc,v 1.7 2016/10/27 18:30:41 robert Exp $ +--- ui/app_list/views/app_list_view.cc.orig.port Wed Oct 19 13:54:33 2016 ++++ ui/app_list/views/app_list_view.cc Wed Oct 19 13:54:57 2016 +@@ -70,7 +70,7 @@ const int kArrowOffset = 10; + + // Determines whether the current environment supports shadows bubble borders. + bool SupportsShadow() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) // Shadows are not supported on (non-ChromeOS) Linux. return false; #endif -@@ -606,7 +606,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; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +@@ -567,7 +567,7 @@ void AppListView::OnBeforeBubbleWidgetInit( + if (!params->native_widget && delegate_ && delegate_->ForceNativeDesktop()) + params->native_widget = new views::DesktopNativeWidgetAura(widget); + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) // Set up a custom WM_CLASS for the app launcher window. This allows task // switchers in X11 environments to distinguish it from main browser windows. params->wm_class_name = kAppListWMClass; diff --git a/www/iridium/patches/patch-ui_base_ime_ime_engine_handler_interface_h b/www/iridium/patches/patch-ui_base_ime_ime_engine_handler_interface_h index ea064b0b46e..89e3de402d8 100644 --- a/www/iridium/patches/patch-ui_base_ime_ime_engine_handler_interface_h +++ b/www/iridium/patches/patch-ui_base_ime_ime_engine_handler_interface_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_base_ime_ime_engine_handler_interface_h,v 1.1 2016/04/27 12:46:16 robert Exp $ +$OpenBSD: patch-ui_base_ime_ime_engine_handler_interface_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- ui/base/ime/ime_engine_handler_interface.h.orig.port Sat Apr 16 12:34:20 2016 +++ ui/base/ime/ime_engine_handler_interface.h Sat Apr 16 12:34:25 2016 @@ -138,7 +138,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface { diff --git a/www/iridium/patches/patch-ui_base_ime_input_method_factory_cc b/www/iridium/patches/patch-ui_base_ime_input_method_factory_cc index dd0ebab7a7f..a52c015ce10 100644 --- a/www/iridium/patches/patch-ui_base_ime_input_method_factory_cc +++ b/www/iridium/patches/patch-ui_base_ime_input_method_factory_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_base_ime_input_method_factory_cc,v 1.5 2016/04/27 12:46:16 robert Exp $ ---- ui/base/ime/input_method_factory.cc.orig.port Fri Apr 8 18:02:15 2016 -+++ ui/base/ime/input_method_factory.cc Thu Apr 14 08:25:15 2016 -@@ -13,7 +13,7 @@ +$OpenBSD: patch-ui_base_ime_input_method_factory_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- ui/base/ime/input_method_factory.cc.orig.port Wed Oct 19 13:55:02 2016 ++++ ui/base/ime/input_method_factory.cc Wed Oct 19 13:55:26 2016 +@@ -14,7 +14,7 @@ #include "ui/base/ime/input_method_win.h" #elif defined(OS_MACOSX) #include "ui/base/ime/input_method_mac.h" @@ -10,12 +10,12 @@ $OpenBSD: patch-ui_base_ime_input_method_factory_cc,v 1.5 2016/04/27 12:46:16 ro !defined(OS_CHROMEOS) #include "ui/base/ime/input_method_auralinux.h" #elif defined(OS_ANDROID) -@@ -55,7 +55,7 @@ scoped_ptr CreateInputMethod( - return make_scoped_ptr(new InputMethodWin(delegate, widget)); +@@ -56,7 +56,7 @@ std::unique_ptr CreateInputMethod( + return base::MakeUnique(delegate, widget); #elif defined(OS_MACOSX) - return make_scoped_ptr(new InputMethodMac(delegate)); + return base::MakeUnique(delegate); -#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ +#elif defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) && \ !defined(OS_CHROMEOS) - return make_scoped_ptr(new InputMethodAuraLinux(delegate)); + return base::MakeUnique(delegate); #elif defined(OS_ANDROID) diff --git a/www/iridium/patches/patch-ui_base_ime_input_method_initializer_cc b/www/iridium/patches/patch-ui_base_ime_input_method_initializer_cc index 5ca7efcc9f6..055acd62cbe 100644 --- a/www/iridium/patches/patch-ui_base_ime_input_method_initializer_cc +++ b/www/iridium/patches/patch-ui_base_ime_input_method_initializer_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_base_ime_input_method_initializer_cc,v 1.4 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_base_ime_input_method_initializer_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ --- ui/base/ime/input_method_initializer.cc.orig.port Sun Mar 6 00:48:54 2016 +++ ui/base/ime/input_method_initializer.cc Sun Mar 6 00:49:28 2016 @@ -8,14 +8,14 @@ diff --git a/www/iridium/patches/patch-ui_base_resource_resource_bundle_cc b/www/iridium/patches/patch-ui_base_resource_resource_bundle_cc index 882acc6d941..1f9e777767a 100644 --- a/www/iridium/patches/patch-ui_base_resource_resource_bundle_cc +++ b/www/iridium/patches/patch-ui_base_resource_resource_bundle_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_base_resource_resource_bundle_cc,v 1.7 2016/04/27 12:46:16 robert Exp $ ---- ui/base/resource/resource_bundle.cc.orig.port Thu Apr 14 14:10:58 2016 -+++ ui/base/resource/resource_bundle.cc Thu Apr 14 14:11:14 2016 -@@ -612,7 +612,7 @@ void ResourceBundle::ReloadFonts() { +$OpenBSD: patch-ui_base_resource_resource_bundle_cc,v 1.8 2016/10/27 18:30:41 robert Exp $ +--- ui/base/resource/resource_bundle.cc.orig.port Wed Oct 12 21:03:17 2016 ++++ ui/base/resource/resource_bundle.cc Wed Oct 19 12:56:11 2016 +@@ -638,7 +638,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -10,12 +10,12 @@ $OpenBSD: patch-ui_base_resource_resource_bundle_cc,v 1.7 2016/04/27 12:46:16 ro return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -674,7 +674,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele - #elif defined(OS_MACOSX) - if (base::mac::IsOSLionOrLater()) - supported_scale_factors.push_back(SCALE_FACTOR_200P); --#elif defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +@@ -698,7 +698,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele + supported_scale_factors.push_back(SCALE_FACTOR_100P); + } + #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ +- defined(OS_WIN) ++ defined(OS_WIN) || defined(OS_BSD) supported_scale_factors.push_back(SCALE_FACTOR_200P); #endif ui::SetSupportedScaleFactors(supported_scale_factors); diff --git a/www/iridium/patches/patch-ui_base_ui_base_gyp b/www/iridium/patches/patch-ui_base_ui_base_gyp deleted file mode 100644 index 06eda355edf..00000000000 --- a/www/iridium/patches/patch-ui_base_ui_base_gyp +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-ui_base_ui_base_gyp,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- ui/base/ui_base.gyp.orig.port Wed May 25 21:01:13 2016 -+++ ui/base/ui_base.gyp Thu May 26 08:09:49 2016 -@@ -456,7 +456,7 @@ - 'x/selection_utils.h', - ] - }], -- ['use_aura==0 or OS!="linux"', { -+ ['use_aura==0 or (OS!="linux" and OS!="openbsd")', { - 'sources!': [ - 'resource/resource_bundle_auralinux.cc', - ], -@@ -480,7 +480,7 @@ - '../../build/linux/system.gyp:glib', - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['toolkit_views==0 and use_aura==0', { - # Note: because of gyp predence rules this has to be defined as -@@ -513,7 +513,7 @@ - 'clipboard/clipboard_aurax11.cc', - ], - }], -- ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', { -+ ['chromeos==1 or (use_aura==1 and (OS=="linux" or os_bsd==1) and use_x11==0)', { - 'sources!': [ - 'dragdrop/os_exchange_data_provider_aurax11.cc', - ], diff --git a/www/iridium/patches/patch-ui_base_webui_web_ui_util_cc b/www/iridium/patches/patch-ui_base_webui_web_ui_util_cc index fa897356704..c8e843fceeb 100644 --- a/www/iridium/patches/patch-ui_base_webui_web_ui_util_cc +++ b/www/iridium/patches/patch-ui_base_webui_web_ui_util_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_base_webui_web_ui_util_cc,v 1.6 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-ui_base_webui_web_ui_util_cc,v 1.7 2016/10/27 18:30:41 robert Exp $ --- ui/base/webui/web_ui_util.cc.orig.port Wed May 25 04:54:43 2016 +++ ui/base/webui/web_ui_util.cc Thu May 26 08:09:49 2016 @@ -165,7 +165,7 @@ std::string GetFontFamily() { diff --git a/www/iridium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc b/www/iridium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc index 17efea3d5a7..babfb566d1b 100644 --- a/www/iridium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc +++ b/www/iridium/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.8 2016/05/28 14:49:39 robert Exp $ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig.port Wed May 25 21:01:13 2016 -+++ ui/events/devices/x11/device_data_manager_x11.cc Thu May 26 08:09:49 2016 -@@ -816,6 +816,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +$OpenBSD: patch-ui_events_devices_x11_device_data_manager_x11_cc,v 1.9 2016/10/27 18:30:41 robert Exp $ +--- ui/events/devices/x11/device_data_manager_x11.cc.orig.port Wed Oct 12 21:03:17 2016 ++++ ui/events/devices/x11/device_data_manager_x11.cc Wed Oct 19 12:56:11 2016 +@@ -834,6 +834,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(int deviceid) { @@ -9,8 +9,8 @@ $OpenBSD: patch-ui_events_devices_x11_device_data_manager_x11_cc,v 1.8 2016/05/2 +#if !defined(OS_BSD) //XXXROBERT blocked_devices_.set(deviceid, true); // TODO(rsadam@): Support blocking touchscreen devices. - std::vector keyboards = keyboard_devices(); -@@ -827,6 +829,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) + std::vector keyboards = GetKeyboardDevices(); +@@ -845,6 +847,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) keyboards.erase(it); DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); } diff --git a/www/iridium/patches/patch-ui_events_event_switches_cc b/www/iridium/patches/patch-ui_events_event_switches_cc index 1ab876d054c..0154bf84654 100644 --- a/www/iridium/patches/patch-ui_events_event_switches_cc +++ b/www/iridium/patches/patch-ui_events_event_switches_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_events_event_switches_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_events_event_switches_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- ui/events/event_switches.cc.orig.port Wed Feb 24 00:02:06 2016 +++ ui/events/event_switches.cc Thu Mar 3 09:43:26 2016 @@ -28,7 +28,7 @@ const char kTouchEventsDisabled[] = "disabled"; diff --git a/www/iridium/patches/patch-ui_events_event_switches_h b/www/iridium/patches/patch-ui_events_event_switches_h index 7c976ea55e1..4e1d2e689dd 100644 --- a/www/iridium/patches/patch-ui_events_event_switches_h +++ b/www/iridium/patches/patch-ui_events_event_switches_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_events_event_switches_h,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_events_event_switches_h,v 1.4 2016/10/27 18:30:41 robert Exp $ --- ui/events/event_switches.h.orig.port Wed Feb 24 00:02:06 2016 +++ ui/events/event_switches.h Thu Mar 3 09:43:26 2016 @@ -18,7 +18,7 @@ EVENTS_BASE_EXPORT extern const char kTouchEventsEnabl diff --git a/www/iridium/patches/patch-ui_events_keycodes_dom_keycode_converter_cc b/www/iridium/patches/patch-ui_events_keycodes_dom_keycode_converter_cc index 3194c7231f9..3b941cc762a 100644 --- a/www/iridium/patches/patch-ui_events_keycodes_dom_keycode_converter_cc +++ b/www/iridium/patches/patch-ui_events_keycodes_dom_keycode_converter_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_events_keycodes_dom_keycode_converter_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_events_keycodes_dom_keycode_converter_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- ui/events/keycodes/dom/keycode_converter.cc.orig.port Wed Feb 24 21:01:35 2016 +++ ui/events/keycodes/dom/keycode_converter.cc Thu Mar 3 09:43:26 2016 @@ -19,7 +19,7 @@ namespace { diff --git a/www/iridium/patches/patch-ui_gfx_canvas_skia_cc b/www/iridium/patches/patch-ui_gfx_canvas_skia_cc index 3b1f3d28ef5..443ad38a624 100644 --- a/www/iridium/patches/patch-ui_gfx_canvas_skia_cc +++ b/www/iridium/patches/patch-ui_gfx_canvas_skia_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_gfx_canvas_skia_cc,v 1.7 2016/04/27 12:46:16 robert Exp $ ---- ui/gfx/canvas_skia.cc.orig.port Fri Apr 8 18:02:15 2016 -+++ ui/gfx/canvas_skia.cc Thu Apr 14 08:25:15 2016 -@@ -246,7 +246,7 @@ void Canvas::DrawStringRectWithShadows(const base::str +$OpenBSD: patch-ui_gfx_canvas_skia_cc,v 1.8 2016/10/27 18:30:41 robert Exp $ +--- ui/gfx/canvas_skia.cc.orig.port Wed Oct 12 21:03:17 2016 ++++ ui/gfx/canvas_skia.cc Wed Oct 19 12:56:12 2016 +@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithShadows(const base::str Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/iridium/patches/patch-ui_gfx_codec_png_codec_cc b/www/iridium/patches/patch-ui_gfx_codec_png_codec_cc index d9600a8b259..7311cf8547e 100644 --- a/www/iridium/patches/patch-ui_gfx_codec_png_codec_cc +++ b/www/iridium/patches/patch-ui_gfx_codec_png_codec_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_gfx_codec_png_codec_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_gfx_codec_png_codec_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- ui/gfx/codec/png_codec.cc.orig.port Wed Feb 24 00:02:06 2016 +++ ui/gfx/codec/png_codec.cc Thu Mar 3 09:43:26 2016 @@ -9,7 +9,7 @@ diff --git a/www/iridium/patches/patch-ui_gfx_font_fallback_linux_cc b/www/iridium/patches/patch-ui_gfx_font_fallback_linux_cc index 060f2149231..8f3ccba639e 100644 --- a/www/iridium/patches/patch-ui_gfx_font_fallback_linux_cc +++ b/www/iridium/patches/patch-ui_gfx_font_fallback_linux_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_gfx_font_fallback_linux_cc,v 1.1 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-ui_gfx_font_fallback_linux_cc,v 1.2 2016/10/27 18:30:41 robert Exp $ --- ui/gfx/font_fallback_linux.cc.orig.port Thu May 26 09:46:11 2016 +++ ui/gfx/font_fallback_linux.cc Thu May 26 09:57:44 2016 @@ -15,6 +15,8 @@ diff --git a/www/iridium/patches/patch-ui_gfx_font_render_params_h b/www/iridium/patches/patch-ui_gfx_font_render_params_h index 1aaf2422e6b..633667cc0f2 100644 --- a/www/iridium/patches/patch-ui_gfx_font_render_params_h +++ b/www/iridium/patches/patch-ui_gfx_font_render_params_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_gfx_font_render_params_h,v 1.1 2016/05/28 14:49:39 robert Exp $ ---- ui/gfx/font_render_params.h.orig.port Thu May 26 09:55:47 2016 -+++ ui/gfx/font_render_params.h Thu May 26 09:56:03 2016 -@@ -102,13 +102,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( +$OpenBSD: patch-ui_gfx_font_render_params_h,v 1.2 2016/10/27 18:30:41 robert Exp $ +--- ui/gfx/font_render_params.h.orig.port Thu Sep 1 00:03:52 2016 ++++ ui/gfx/font_render_params.h Thu Sep 1 11:12:25 2016 +@@ -106,13 +106,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); diff --git a/www/iridium/patches/patch-ui_gfx_gfx_gyp b/www/iridium/patches/patch-ui_gfx_gfx_gyp deleted file mode 100644 index 29b246e8241..00000000000 --- a/www/iridium/patches/patch-ui_gfx_gfx_gyp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-ui_gfx_gfx_gyp,v 1.6 2016/05/28 14:49:39 robert Exp $ ---- ui/gfx/gfx.gyp.orig.port Wed May 25 21:01:13 2016 -+++ ui/gfx/gfx.gyp Thu May 26 08:09:49 2016 -@@ -454,7 +454,7 @@ - '<(DEPTH)/build/linux/system.gyp:pangocairo', - ], - }], -- ['desktop_linux==1 or chromeos==1', { -+ ['desktop_linux==1 or chromeos==1 or os_bsd==1', { - 'dependencies': [ - # font_render_params_linux.cc uses fontconfig - '<(DEPTH)/build/linux/system.gyp:fontconfig', -@@ -560,7 +560,7 @@ - ['exclude', 'cocoa'] - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'dependencies': [ - '../../build/linux/system.gyp:fontconfig', - ], diff --git a/www/iridium/patches/patch-ui_gl_BUILD_gn b/www/iridium/patches/patch-ui_gl_BUILD_gn new file mode 100644 index 00000000000..77d836b9459 --- /dev/null +++ b/www/iridium/patches/patch-ui_gl_BUILD_gn @@ -0,0 +1,30 @@ +$OpenBSD: patch-ui_gl_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- ui/gl/BUILD.gn.orig.port Wed Oct 19 13:55:31 2016 ++++ ui/gl/BUILD.gn Thu Oct 20 15:48:54 2016 +@@ -234,7 +234,6 @@ component("gl") { + data_deps = [ + "//third_party/angle:libEGL", + "//third_party/angle:libGLESv2", +- "//third_party/mesa:osmesa", + ] + } + if (is_mac) { +@@ -273,6 +272,7 @@ component("gl") { + + deps += [ ":gl_jni_headers" ] + } ++ cflags = [ "-I/usr/X11R6/XXXinclude" ] + } + + static_library("gl_unittest_utils") { +@@ -386,10 +386,6 @@ test("gl_unittests") { + "//ui/gfx", + "//ui/gfx/geometry", + "//ui/gl/init", +- ] +- +- data_deps = [ +- "//third_party/mesa:osmesa", + ] + } + diff --git a/www/iridium/patches/patch-ui_gl_generate_bindings_py b/www/iridium/patches/patch-ui_gl_generate_bindings_py index d591f6e03c6..2cc8a83d902 100644 --- a/www/iridium/patches/patch-ui_gl_generate_bindings_py +++ b/www/iridium/patches/patch-ui_gl_generate_bindings_py @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_gl_generate_bindings_py,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- ui/gl/generate_bindings.py.orig.port Wed May 25 21:01:13 2016 -+++ ui/gl/generate_bindings.py Thu May 26 08:09:49 2016 -@@ -1665,6 +1665,9 @@ GLX_FUNCTIONS = [ +$OpenBSD: patch-ui_gl_generate_bindings_py,v 1.11 2016/10/27 18:30:41 robert Exp $ +--- ui/gl/generate_bindings.py.orig.port Wed Oct 12 21:03:17 2016 ++++ ui/gl/generate_bindings.py Wed Oct 19 12:56:12 2016 +@@ -1783,6 +1783,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/iridium/patches/patch-ui_gl_gl_bindings_api_autogen_glx_h b/www/iridium/patches/patch-ui_gl_gl_bindings_api_autogen_glx_h index 4329468f0f4..8741cef0453 100644 --- a/www/iridium/patches/patch-ui_gl_gl_bindings_api_autogen_glx_h +++ b/www/iridium/patches/patch-ui_gl_gl_bindings_api_autogen_glx_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_gl_gl_bindings_api_autogen_glx_h,v 1.2 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_gl_gl_bindings_api_autogen_glx_h,v 1.3 2016/10/27 18:30:41 robert Exp $ --- ui/gl/gl_bindings_api_autogen_glx.h.orig.port Thu Mar 3 10:17:08 2016 +++ ui/gl/gl_bindings_api_autogen_glx.h Thu Mar 3 10:17:19 2016 @@ -84,6 +84,7 @@ bool glXGetMscRateOMLFn(Display* dpy, diff --git a/www/iridium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc b/www/iridium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc index 62356fa37ce..c53e52eadb8 100644 --- a/www/iridium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc +++ b/www/iridium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ --- ui/gl/gl_bindings_autogen_glx.cc.orig.port Thu May 26 08:38:20 2016 +++ ui/gl/gl_bindings_autogen_glx.cc Thu May 26 08:38:28 2016 @@ -74,6 +74,7 @@ void DriverGLX::InitializeStaticBindings() { diff --git a/www/iridium/patches/patch-ui_gl_gl_bindings_autogen_glx_h b/www/iridium/patches/patch-ui_gl_gl_bindings_autogen_glx_h index 3c83fe3bcbc..fa15ba355e4 100644 --- a/www/iridium/patches/patch-ui_gl_gl_bindings_autogen_glx_h +++ b/www/iridium/patches/patch-ui_gl_gl_bindings_autogen_glx_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_h,v 1.2 2016/03/23 20:13:07 robert Exp $ ---- ui/gl/gl_bindings_autogen_glx.h.orig.port Thu Mar 3 10:17:26 2016 -+++ ui/gl/gl_bindings_autogen_glx.h Thu Mar 3 10:18:18 2016 +$OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_h,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- ui/gl/gl_bindings_autogen_glx.h.orig.port Thu Sep 1 11:37:31 2016 ++++ ui/gl/gl_bindings_autogen_glx.h Thu Sep 1 13:52:17 2016 @@ -102,6 +102,8 @@ typedef bool(GL_BINDING_CALL* glXGetMscRateOMLProc)(Di GLXDrawable drawable, int32_t* numerator, @@ -34,12 +34,11 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_h,v 1.2 2016/03/23 20:13:07 robert 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 +@@ -390,6 +395,7 @@ class GL_EXPORT GLXApi { + ::gl::g_current_glx_context->glXGetFBConfigFromVisualSGIXFn + #define glXGetFBConfigs ::gl::g_current_glx_context->glXGetFBConfigsFn + #define glXGetMscRateOML ::gl::g_current_glx_context->glXGetMscRateOMLFn ++#define glXGetProcAddressARB ::gl::g_current_glx_context->glXGetProcAddressARBFn + #define glXGetSelectedEvent ::gl::g_current_glx_context->glXGetSelectedEventFn + #define glXGetSyncValuesOML ::gl::g_current_glx_context->glXGetSyncValuesOMLFn #define glXGetVisualFromFBConfig \ diff --git a/www/iridium/patches/patch-ui_gl_gl_gyp b/www/iridium/patches/patch-ui_gl_gl_gyp deleted file mode 100644 index 2cad2aeb256..00000000000 --- a/www/iridium/patches/patch-ui_gl_gl_gyp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-ui_gl_gl_gyp,v 1.6 2016/04/27 12:46:16 robert Exp $ ---- ui/gl/gl.gyp.orig.port Fri Apr 8 18:02:15 2016 -+++ ui/gl/gl.gyp Thu Apr 14 08:25:16 2016 -@@ -130,7 +130,7 @@ - 'trace_util.h', - ], - 'conditions': [ -- ['OS in ("win", "android", "linux")', { -+ ['OS in ("win", "android", "linux", "openbsd")', { - 'sources': [ - 'egl_util.cc', - 'egl_util.h', -@@ -151,7 +151,7 @@ - '<(DEPTH)/third_party/khronos', - ], - }], -- ['OS in ("android", "linux")', { -+ ['OS in ("android", "linux", "openbsd")', { - 'sources': [ - 'gl_implementation_osmesa.cc', - 'gl_implementation_osmesa.h', diff --git a/www/iridium/patches/patch-ui_gl_gl_surface_glx_cc b/www/iridium/patches/patch-ui_gl_gl_surface_glx_cc deleted file mode 100644 index c8df9125127..00000000000 --- a/www/iridium/patches/patch-ui_gl_gl_surface_glx_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-ui_gl_gl_surface_glx_cc,v 1.6 2016/03/23 20:13:07 robert Exp $ ---- ui/gl/gl_surface_glx.cc.orig.port Wed Feb 24 21:01:35 2016 -+++ ui/gl/gl_surface_glx.cc Thu Mar 3 09:43:26 2016 -@@ -48,7 +48,7 @@ bool g_glx_get_msc_rate_oml_supported = false; - bool g_glx_sgi_video_sync_supported = false; - - static const int kGetVSyncParametersMinSeconds = --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // See crbug.com/373489 - // On Linux, querying the vsync parameters might burn CPU for up to an - // entire vsync, so we only query periodically to reduce CPU usage. diff --git a/www/iridium/patches/patch-ui_gl_sync_control_vsync_provider_cc b/www/iridium/patches/patch-ui_gl_sync_control_vsync_provider_cc index 796af86cab3..14680614206 100644 --- a/www/iridium/patches/patch-ui_gl_sync_control_vsync_provider_cc +++ b/www/iridium/patches/patch-ui_gl_sync_control_vsync_provider_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-ui_gl_sync_control_vsync_provider_cc,v 1.4 2016/03/23 20:13:07 robert Exp $ ---- ui/gl/sync_control_vsync_provider.cc.orig.port Wed Feb 24 00:02:06 2016 -+++ ui/gl/sync_control_vsync_provider.cc Thu Mar 3 09:43:26 2016 +$OpenBSD: patch-ui_gl_sync_control_vsync_provider_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- ui/gl/sync_control_vsync_provider.cc.orig.port Thu Sep 1 11:38:47 2016 ++++ ui/gl/sync_control_vsync_provider.cc Thu Sep 1 11:39:07 2016 @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" @@ -10,7 +10,16 @@ $OpenBSD: patch-ui_gl_sync_control_vsync_provider_cc,v 1.4 2016/03/23 20:13:07 r // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; -@@ -38,7 +38,7 @@ SyncControlVSyncProvider::~SyncControlVSyncProvider() +@@ -26,7 +26,7 @@ const double kRelativeIntervalDifferenceThreshold = 0. + namespace gl { + + SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On platforms where we can't get an accurate reading on the refresh + // rate we fall back to the assumption that we're displaying 60 frames + // per second. +@@ -39,7 +39,7 @@ SyncControlVSyncProvider::~SyncControlVSyncProvider() void SyncControlVSyncProvider::GetVSyncParameters( const UpdateVSyncCallback& callback) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); diff --git a/www/iridium/patches/patch-ui_gl_sync_control_vsync_provider_h b/www/iridium/patches/patch-ui_gl_sync_control_vsync_provider_h new file mode 100644 index 00000000000..de469541729 --- /dev/null +++ b/www/iridium/patches/patch-ui_gl_sync_control_vsync_provider_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-ui_gl_sync_control_vsync_provider_h,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- ui/gl/sync_control_vsync_provider.h.orig.port Thu Sep 1 00:03:52 2016 ++++ ui/gl/sync_control_vsync_provider.h Thu Sep 1 11:12:25 2016 +@@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv + virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; + + private: +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::TimeTicks last_timebase_; + uint64_t last_media_stream_counter_ = 0; + base::TimeDelta last_good_interval_; diff --git a/www/iridium/patches/patch-ui_message_center_message_center_style_h b/www/iridium/patches/patch-ui_message_center_message_center_style_h index 152df232112..c9cafbb45c4 100644 --- a/www/iridium/patches/patch-ui_message_center_message_center_style_h +++ b/www/iridium/patches/patch-ui_message_center_message_center_style_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_message_center_message_center_style_h,v 1.5 2016/03/23 20:13:07 robert Exp $ ---- ui/message_center/message_center_style.h.orig.port Wed Feb 24 00:02:06 2016 -+++ ui/message_center/message_center_style.h Thu Mar 3 09:43:26 2016 -@@ -111,7 +111,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs. +$OpenBSD: patch-ui_message_center_message_center_style_h,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- ui/message_center/message_center_style.h.orig.port Wed Oct 12 21:03:17 2016 ++++ ui/message_center/message_center_style.h Wed Oct 19 12:56:12 2016 +@@ -115,7 +115,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs. const int kButtonIconTopPadding = 11; // In DIPs. const int kButtonIconToTitlePadding = 16; // In DIPs. diff --git a/www/iridium/patches/patch-ui_message_center_views_message_center_button_bar_cc b/www/iridium/patches/patch-ui_message_center_views_message_center_button_bar_cc index b78e63b19ef..3f148b73ae3 100644 --- a/www/iridium/patches/patch-ui_message_center_views_message_center_button_bar_cc +++ b/www/iridium/patches/patch-ui_message_center_views_message_center_button_bar_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_message_center_views_message_center_button_bar_cc,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- ui/message_center/views/message_center_button_bar.cc.orig.port Fri Apr 8 18:02:15 2016 -+++ ui/message_center/views/message_center_button_bar.cc Thu Apr 14 08:25:16 2016 -@@ -96,7 +96,7 @@ MessageCenterButtonBar::MessageCenterButtonBar( +$OpenBSD: patch-ui_message_center_views_message_center_button_bar_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- ui/message_center/views/message_center_button_bar.cc.orig.port Wed Jul 20 21:03:46 2016 ++++ ui/message_center/views/message_center_button_bar.cc Thu Jul 21 10:25:33 2016 +@@ -95,7 +95,7 @@ MessageCenterButtonBar::MessageCenterButtonBar( const base::string16& title) : message_center_view_(message_center_view), message_center_(message_center), @@ -10,7 +10,7 @@ $OpenBSD: patch-ui_message_center_views_message_center_button_bar_cc,v 1.4 2016/ close_bubble_button_(NULL), #endif title_arrow_(NULL), -@@ -171,7 +171,7 @@ MessageCenterButtonBar::MessageCenterButtonBar( +@@ -170,7 +170,7 @@ MessageCenterButtonBar::MessageCenterButtonBar( IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL); button_container_->AddChildView(settings_button_); @@ -19,7 +19,7 @@ $OpenBSD: patch-ui_message_center_views_message_center_button_bar_cc,v 1.4 2016/ close_bubble_button_ = new views::ImageButton(this); close_bubble_button_->SetImage( views::Button::STATE_NORMAL, -@@ -233,7 +233,7 @@ void MessageCenterButtonBar::ViewVisibilityChanged() { +@@ -232,7 +232,7 @@ void MessageCenterButtonBar::ViewVisibilityChanged() { 0, 0); @@ -28,7 +28,7 @@ $OpenBSD: patch-ui_message_center_views_message_center_button_bar_cc,v 1.4 2016/ // The close-bubble button. column->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, -@@ -248,7 +248,7 @@ void MessageCenterButtonBar::ViewVisibilityChanged() { +@@ -247,7 +247,7 @@ void MessageCenterButtonBar::ViewVisibilityChanged() { layout->AddView(title_arrow_); layout->AddView(notification_label_); layout->AddView(button_container_); @@ -37,7 +37,7 @@ $OpenBSD: patch-ui_message_center_views_message_center_button_bar_cc,v 1.4 2016/ layout->AddView(close_bubble_button_); #endif } -@@ -295,7 +295,7 @@ void MessageCenterButtonBar::ButtonPressed(views::Butt +@@ -297,7 +297,7 @@ void MessageCenterButtonBar::ButtonPressed(views::Butt else message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1)); quiet_mode_button_->SetToggled(message_center()->IsQuietMode()); diff --git a/www/iridium/patches/patch-ui_message_center_views_message_center_button_bar_h b/www/iridium/patches/patch-ui_message_center_views_message_center_button_bar_h index d77904fdd23..5d3c92b23f3 100644 --- a/www/iridium/patches/patch-ui_message_center_views_message_center_button_bar_h +++ b/www/iridium/patches/patch-ui_message_center_views_message_center_button_bar_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_message_center_views_message_center_button_bar_h,v 1.4 2016/04/27 12:46:16 robert Exp $ ---- ui/message_center/views/message_center_button_bar.h.orig.port Fri Apr 8 18:02:15 2016 -+++ ui/message_center/views/message_center_button_bar.h Thu Apr 14 08:25:16 2016 -@@ -73,7 +73,7 @@ class MessageCenterButtonBar : public views::View, +$OpenBSD: patch-ui_message_center_views_message_center_button_bar_h,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- ui/message_center/views/message_center_button_bar.h.orig.port Wed Jul 20 21:03:46 2016 ++++ ui/message_center/views/message_center_button_bar.h Thu Jul 21 10:25:33 2016 +@@ -76,7 +76,7 @@ class MessageCenterButtonBar : public views::View, // close-on-deactivation is off. This is a tentative solution. Once pkotwicz // Fixes the problem of focus-follow-mouse, close-on-deactivation will be // back and this field will be removed. See crbug.com/319516. diff --git a/www/iridium/patches/patch-ui_message_center_views_message_center_view_cc b/www/iridium/patches/patch-ui_message_center_views_message_center_view_cc deleted file mode 100644 index f5383628462..00000000000 --- a/www/iridium/patches/patch-ui_message_center_views_message_center_view_cc +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-ui_message_center_views_message_center_view_cc,v 1.4 2016/03/23 20:13:07 robert Exp $ ---- ui/message_center/views/message_center_view.cc.orig.port Wed Feb 24 00:02:06 2016 -+++ ui/message_center/views/message_center_view.cc Thu Mar 3 09:43:26 2016 -@@ -44,7 +44,7 @@ namespace message_center { - namespace { - - const SkColor kNoNotificationsTextColor = SkColorSetRGB(0xb4, 0xb4, 0xb4); --#if defined(OS_LINUX) && defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS) - const SkColor kTransparentColor = SkColorSetARGB(0, 0, 0, 0); - #endif - -@@ -82,7 +82,7 @@ NoNotificationMessageView::NoNotificationMessageView() - label_->SetEnabledColor(kNoNotificationsTextColor); - // Set transparent background to ensure that subpixel rendering - // is disabled. See crbug.com/169056 --#if defined(OS_LINUX) && defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS) - label_->SetBackgroundColor(kTransparentColor); - #endif - AddChildView(label_); diff --git a/www/iridium/patches/patch-ui_message_center_views_message_view_factory_cc b/www/iridium/patches/patch-ui_message_center_views_message_view_factory_cc new file mode 100644 index 00000000000..833de6f3b2e --- /dev/null +++ b/www/iridium/patches/patch-ui_message_center_views_message_view_factory_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-ui_message_center_views_message_view_factory_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- ui/message_center/views/message_view_factory.cc.orig.port Thu Jul 21 10:44:12 2016 ++++ ui/message_center/views/message_view_factory.cc Thu Jul 21 10:44:24 2016 +@@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create(MessageCenterC + notification_view = new NotificationView(controller, notification); + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Don't create shadows for notification toasts on linux wih aura. + if (top_level) + return notification_view; diff --git a/www/iridium/patches/patch-ui_message_center_views_notification_view_cc b/www/iridium/patches/patch-ui_message_center_views_notification_view_cc deleted file mode 100644 index f0bd216beaf..00000000000 --- a/www/iridium/patches/patch-ui_message_center_views_notification_view_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-ui_message_center_views_notification_view_cc,v 1.7 2016/05/28 14:49:39 robert Exp $ ---- ui/message_center/views/notification_view.cc.orig.port Wed May 25 21:01:13 2016 -+++ ui/message_center/views/notification_view.cc Thu May 26 08:09:50 2016 -@@ -173,7 +173,7 @@ NotificationView* NotificationView::Create(MessageCent - NotificationView* notification_view = - new NotificationView(controller, notification); - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // Don't create shadows for notification toasts on linux wih aura. - if (top_level) - return notification_view; diff --git a/www/iridium/patches/patch-ui_resources_ui_resources_grd b/www/iridium/patches/patch-ui_resources_ui_resources_grd index 957f0e4118c..8717f955891 100644 --- a/www/iridium/patches/patch-ui_resources_ui_resources_grd +++ b/www/iridium/patches/patch-ui_resources_ui_resources_grd @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_resources_ui_resources_grd,v 1.3 2015/10/24 18:22:22 robert Exp $ +$OpenBSD: patch-ui_resources_ui_resources_grd,v 1.4 2016/10/27 18:30:41 robert Exp $ --- ui/resources/ui_resources.grd.orig.port Wed Oct 14 07:59:01 2015 +++ ui/resources/ui_resources.grd Wed Oct 14 07:59:13 2015 @@ -15,7 +15,7 @@ diff --git a/www/iridium/patches/patch-ui_touch_selection_ui_touch_selection_gyp b/www/iridium/patches/patch-ui_touch_selection_ui_touch_selection_gyp deleted file mode 100644 index dc07420abc1..00000000000 --- a/www/iridium/patches/patch-ui_touch_selection_ui_touch_selection_gyp +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-ui_touch_selection_ui_touch_selection_gyp,v 1.2 2015/12/17 07:02:48 robert Exp $ ---- ui/touch_selection/ui_touch_selection.gyp.orig.port Tue Nov 24 21:01:01 2015 -+++ ui/touch_selection/ui_touch_selection.gyp Wed Dec 2 08:18:33 2015 -@@ -17,6 +17,7 @@ - '../events/events.gyp:events', - '../events/events.gyp:gesture_detection', - '../gfx/gfx.gyp:gfx_geometry', -+ '../resources/ui_resources.gyp:ui_resources', - ], - 'defines': [ - 'UI_TOUCH_SELECTION_IMPLEMENTATION', diff --git a/www/iridium/patches/patch-ui_views_accessibility_native_view_accessibility_h b/www/iridium/patches/patch-ui_views_accessibility_native_view_accessibility_h index 43da08e78be..81076c39caf 100644 --- a/www/iridium/patches/patch-ui_views_accessibility_native_view_accessibility_h +++ b/www/iridium/patches/patch-ui_views_accessibility_native_view_accessibility_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_views_accessibility_native_view_accessibility_h,v 1.1 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_views_accessibility_native_view_accessibility_h,v 1.2 2016/10/27 18:30:41 robert Exp $ --- ui/views/accessibility/native_view_accessibility.h.orig.port Sat Mar 5 23:32:04 2016 +++ ui/views/accessibility/native_view_accessibility.h Sat Mar 5 23:32:13 2016 @@ -22,7 +22,7 @@ diff --git a/www/iridium/patches/patch-ui_views_bubble_bubble_delegate_cc b/www/iridium/patches/patch-ui_views_bubble_bubble_dialog_delegate_cc similarity index 64% rename from www/iridium/patches/patch-ui_views_bubble_bubble_delegate_cc rename to www/iridium/patches/patch-ui_views_bubble_bubble_dialog_delegate_cc index 74288ff679e..8eb3ea5a686 100644 --- a/www/iridium/patches/patch-ui_views_bubble_bubble_delegate_cc +++ b/www/iridium/patches/patch-ui_views_bubble_bubble_dialog_delegate_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_views_bubble_bubble_delegate_cc,v 1.5 2016/04/27 12:46:16 robert Exp $ ---- ui/views/bubble/bubble_delegate.cc.orig.port Wed Apr 13 23:00:05 2016 -+++ ui/views/bubble/bubble_delegate.cc Thu Apr 14 08:25:16 2016 -@@ -96,7 +96,7 @@ Widget* BubbleDelegateView::CreateBubble(BubbleDelegat +$OpenBSD: patch-ui_views_bubble_bubble_dialog_delegate_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- ui/views/bubble/bubble_dialog_delegate.cc.orig.port Thu Jul 21 10:44:52 2016 ++++ ui/views/bubble/bubble_dialog_delegate.cc Thu Jul 21 10:45:02 2016 +@@ -72,7 +72,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( // 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/iridium/patches/patch-ui_views_controls_button_label_button_cc b/www/iridium/patches/patch-ui_views_controls_button_label_button_cc deleted file mode 100644 index a755dbffb32..00000000000 --- a/www/iridium/patches/patch-ui_views_controls_button_label_button_cc +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-ui_views_controls_button_label_button_cc,v 1.8 2016/05/28 14:49:39 robert Exp $ ---- ui/views/controls/button/label_button.cc.orig.port Wed May 25 21:01:13 2016 -+++ ui/views/controls/button/label_button.cc Thu May 26 08:09:50 2016 -@@ -31,7 +31,7 @@ namespace { - // The default spacing between the icon and text. - const int kSpacing = 5; - --#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) - // Default text and shadow colors for STYLE_BUTTON. - const SkColor kStyleButtonTextColor = SK_ColorBLACK; - const SkColor kStyleButtonShadowColor = SK_ColorWHITE; -@@ -484,7 +484,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 --#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) - constant_text_color = true; - colors[STATE_NORMAL] = kStyleButtonTextColor; - label_->SetBackgroundColor(theme->GetSystemColor( diff --git a/www/iridium/patches/patch-ui_views_controls_scrollbar_base_scroll_bar_cc b/www/iridium/patches/patch-ui_views_controls_scrollbar_base_scroll_bar_cc deleted file mode 100644 index a24a857f05f..00000000000 --- a/www/iridium/patches/patch-ui_views_controls_scrollbar_base_scroll_bar_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-ui_views_controls_scrollbar_base_scroll_bar_cc,v 1.2 2015/05/06 14:27:24 robert Exp $ ---- ui/views/controls/scrollbar/base_scroll_bar.cc.orig.port Wed Mar 18 19:58:38 2015 -+++ ui/views/controls/scrollbar/base_scroll_bar.cc Wed Mar 18 19:58:47 2015 -@@ -24,7 +24,7 @@ - #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h" - #include "ui/views/widget/widget.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "ui/gfx/screen.h" - #endif - diff --git a/www/iridium/patches/patch-ui_views_controls_textfield_textfield_cc b/www/iridium/patches/patch-ui_views_controls_textfield_textfield_cc index c86db95705c..a9ddcf79559 100644 --- a/www/iridium/patches/patch-ui_views_controls_textfield_textfield_cc +++ b/www/iridium/patches/patch-ui_views_controls_textfield_textfield_cc @@ -1,43 +1,33 @@ -$OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.9 2016/04/27 12:46:16 robert Exp $ ---- ui/views/controls/textfield/textfield.cc.orig.port Fri Apr 8 18:02:15 2016 -+++ ui/views/controls/textfield/textfield.cc Thu Apr 14 08:25:16 2016 -@@ -47,7 +47,7 @@ - #include "base/win/win_util.h" +$OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.10 2016/10/27 18:30:41 robert Exp $ +--- ui/views/controls/textfield/textfield.cc.orig.port Wed Oct 12 21:03:17 2016 ++++ ui/views/controls/textfield/textfield.cc Wed Oct 19 12:56:13 2016 +@@ -51,7 +51,7 @@ + #include "ui/base/win/osk_display_manager.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "base/strings/utf_string_conversions.h" - #include "ui/events/linux/text_edit_command_auralinux.h" - #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -130,7 +130,7 @@ int GetCommandForKeyEvent(const ui::KeyEvent& event, b + #include "ui/base/ime/linux/text_edit_command_auralinux.h" + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" +@@ -156,14 +156,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke case ui::VKEY_BACK: - if (!control || has_selection) - return IDS_DELETE_BACKWARD; + if (!control) + return ui::TextEditCommand::DELETE_BACKWARD; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift) - return IDS_DELETE_TO_BEGINNING_OF_LINE; -@@ -139,7 +139,7 @@ int GetCommandForKeyEvent(const ui::KeyEvent& event, b + return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; + #endif + return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: - if (!control || has_selection) - return (shift && has_selection) ? IDS_APP_CUT : IDS_DELETE_FORWARD; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. - if (shift) - return IDS_DELETE_TO_END_OF_LINE; -@@ -154,7 +154,7 @@ int GetCommandForKeyEvent(const ui::KeyEvent& event, b - } - } - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // 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(); -@@ -642,7 +642,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e + if (shift && control) + return ui::TextEditCommand::DELETE_TO_END_OF_LINE; +@@ -596,7 +596,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e OnAfterUserAction(); } @@ -46,7 +36,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.9 2016/04/27 12:46: if (event.IsOnlyMiddleMouseButton()) { if (GetRenderText()->IsPointInSelection(event.location())) { OnBeforeUserAction(); -@@ -711,7 +711,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -665,7 +665,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -55,7 +45,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.9 2016/04/27 12:46: ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector commands; -@@ -846,7 +846,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -805,7 +805,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -64,8 +54,8 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.9 2016/04/27 12:46: // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1105,7 +1105,7 @@ void Textfield::WriteDragDataForView(View* sender, - scoped_ptr canvas( +@@ -1065,7 +1065,7 @@ void Textfield::WriteDragDataForView(View* sender, + std::unique_ptr canvas( GetCanvasForDragImage(GetWidget(), label.size())); label.SetEnabledColor(GetTextColor()); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -73,7 +63,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.9 2016/04/27 12:46: // Desktop Linux Aura does not yet support transparency in drag images. canvas->DrawColor(GetBackgroundColor()); #endif -@@ -1880,7 +1880,7 @@ void Textfield::CreateTouchSelectionControllerAndNotif +@@ -2004,7 +2004,7 @@ void Textfield::CreateTouchSelectionControllerAndNotif } void Textfield::UpdateSelectionClipboard() const { diff --git a/www/iridium/patches/patch-ui_views_controls_webview_webview_gyp b/www/iridium/patches/patch-ui_views_controls_webview_webview_gyp deleted file mode 100644 index f14f032fb9e..00000000000 --- a/www/iridium/patches/patch-ui_views_controls_webview_webview_gyp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-ui_views_controls_webview_webview_gyp,v 1.1 2016/02/15 18:07:53 robert Exp $ ---- ui/views/controls/webview/webview.gyp.orig.port Sat Jan 23 10:27:57 2016 -+++ ui/views/controls/webview/webview.gyp Sat Jan 23 10:28:02 2016 -@@ -42,7 +42,7 @@ - 'webview_export.h', - ], - 'conditions': [ -- ['OS=="linux" or OS=="android"', { -+ ['OS=="linux" or OS=="android" or os_bsd==1', { - 'sources': [ 'unhandled_keyboard_event_handler_default.cc', ], - }], - ], diff --git a/www/iridium/patches/patch-ui_views_corewm_tooltip_aura_cc b/www/iridium/patches/patch-ui_views_corewm_tooltip_aura_cc new file mode 100644 index 00000000000..7146eb1adbf --- /dev/null +++ b/www/iridium/patches/patch-ui_views_corewm_tooltip_aura_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-ui_views_corewm_tooltip_aura_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- ui/views/corewm/tooltip_aura.cc.orig.port Tue Oct 25 21:56:44 2016 ++++ ui/views/corewm/tooltip_aura.cc Tue Oct 25 22:14:45 2016 +@@ -35,7 +35,7 @@ const int kCursorOffsetY = 15; + + // TODO(varkha): Update if native widget can be transparent on Linux. + bool CanUseTranslucentTooltipWidget() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + return false; + #else + return ui::MaterialDesignController::IsModeMaterial(); diff --git a/www/iridium/patches/patch-ui_views_examples_widget_example_cc b/www/iridium/patches/patch-ui_views_examples_widget_example_cc new file mode 100644 index 00000000000..6bc1439162a --- /dev/null +++ b/www/iridium/patches/patch-ui_views_examples_widget_example_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-ui_views_examples_widget_example_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- ui/views/examples/widget_example.cc.orig.port Tue Oct 25 21:56:44 2016 ++++ ui/views/examples/widget_example.cc Tue Oct 25 22:14:54 2016 +@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(View* container) + BuildButton(container, "Popup widget", POPUP); + BuildButton(container, "Dialog widget", DIALOG); + BuildButton(container, "Modal Dialog", MODAL_DIALOG); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Windows does not support TYPE_CONTROL top-level widgets. + BuildButton(container, "Child widget", CHILD); + #endif diff --git a/www/iridium/patches/patch-ui_views_mus_aura_init_cc b/www/iridium/patches/patch-ui_views_mus_aura_init_cc new file mode 100644 index 00000000000..58647027386 --- /dev/null +++ b/www/iridium/patches/patch-ui_views_mus_aura_init_cc @@ -0,0 +1,30 @@ +$OpenBSD: patch-ui_views_mus_aura_init_cc,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- ui/views/mus/aura_init.cc.orig.port Tue Oct 25 21:56:44 2016 ++++ ui/views/mus/aura_init.cc Tue Oct 25 22:15:07 2016 +@@ -19,7 +19,7 @@ + #include "ui/base/ui_base_paths.h" + #include "ui/views/views_delegate.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "components/font_service/public/cpp/font_loader.h" + #endif + +@@ -63,7 +63,7 @@ AuraInit::AuraInit(shell::Connector* connector, + } + + AuraInit::~AuraInit() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (font_loader_.get()) { + SkFontConfigInterface::SetGlobal(nullptr); + // FontLoader is ref counted. We need to explicitly shutdown the background +@@ -91,7 +91,7 @@ void AuraInit::InitializeResources(shell::Connector* c + std::move(pak_file_2), ui::SCALE_FACTOR_100P); + + // Initialize the skia font code to go ask fontconfig underneath. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + font_loader_ = sk_make_sp(connector); + SkFontConfigInterface::SetGlobal(font_loader_.get()); + #endif diff --git a/www/iridium/patches/patch-ui_views_mus_aura_init_h b/www/iridium/patches/patch-ui_views_mus_aura_init_h new file mode 100644 index 00000000000..2644983e925 --- /dev/null +++ b/www/iridium/patches/patch-ui_views_mus_aura_init_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-ui_views_mus_aura_init_h,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- ui/views/mus/aura_init.h.orig.port Tue Oct 25 21:56:44 2016 ++++ ui/views/mus/aura_init.h Tue Oct 25 22:17:30 2016 +@@ -38,7 +38,7 @@ class VIEWS_MUS_EXPORT AuraInit { + private: + void InitializeResources(shell::Connector* connector); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + sk_sp font_loader_; + #endif + diff --git a/www/iridium/patches/patch-ui_views_style_platform_style_cc b/www/iridium/patches/patch-ui_views_style_platform_style_cc index 8938f85905f..a25d3cfd721 100644 --- a/www/iridium/patches/patch-ui_views_style_platform_style_cc +++ b/www/iridium/patches/patch-ui_views_style_platform_style_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-ui_views_style_platform_style_cc,v 1.2 2016/05/28 14:49:39 robert Exp $ ---- ui/views/style/platform_style.cc.orig.port Wed May 25 21:01:13 2016 -+++ ui/views/style/platform_style.cc Thu May 26 08:09:50 2016 -@@ -55,7 +55,7 @@ scoped_ptr PlatformStyle::CreateScrollBar(b - } +$OpenBSD: patch-ui_views_style_platform_style_cc,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- ui/views/style/platform_style.cc.orig.port Thu Jul 21 10:45:26 2016 ++++ ui/views/style/platform_style.cc Thu Jul 21 10:46:11 2016 +@@ -17,7 +17,7 @@ + #include "ui/views/controls/focusable_border.h" + #include "ui/views/controls/scrollbar/native_scroll_bar.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #define DESKTOP_LINUX #endif --#if !defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) - // static - scoped_ptr PlatformStyle::CreateThemedLabelButtonBorder( - LabelButton* button) { diff --git a/www/iridium/patches/patch-ui_views_views_delegate_cc b/www/iridium/patches/patch-ui_views_views_delegate_cc index b02460bfce5..b599d43cb6f 100644 --- a/www/iridium/patches/patch-ui_views_views_delegate_cc +++ b/www/iridium/patches/patch-ui_views_views_delegate_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_views_views_delegate_cc,v 1.8 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_views_views_delegate_cc,v 1.9 2016/10/27 18:30:41 robert Exp $ --- ui/views/views_delegate.cc.orig.port Wed Feb 24 00:02:06 2016 +++ ui/views/views_delegate.cc Thu Mar 3 09:43:26 2016 @@ -70,7 +70,7 @@ HICON ViewsDelegate::GetDefaultWindowIcon() const { diff --git a/www/iridium/patches/patch-ui_views_views_delegate_h b/www/iridium/patches/patch-ui_views_views_delegate_h index 983d6cc0e14..561e9490a08 100644 --- a/www/iridium/patches/patch-ui_views_views_delegate_h +++ b/www/iridium/patches/patch-ui_views_views_delegate_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_views_views_delegate_h,v 1.7 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_views_views_delegate_h,v 1.8 2016/10/27 18:30:41 robert Exp $ --- ui/views/views_delegate.h.orig.port Wed Feb 24 00:02:06 2016 +++ ui/views/views_delegate.h Thu Mar 3 09:43:26 2016 @@ -141,7 +141,7 @@ class VIEWS_EXPORT ViewsDelegate { diff --git a/www/iridium/patches/patch-ui_views_views_gyp b/www/iridium/patches/patch-ui_views_views_gyp deleted file mode 100644 index 1f61cb0bdc3..00000000000 --- a/www/iridium/patches/patch-ui_views_views_gyp +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-ui_views_views_gyp,v 1.10 2016/05/28 14:49:39 robert Exp $ ---- ui/views/views.gyp.orig.port Wed May 25 21:01:13 2016 -+++ ui/views/views.gyp Thu May 26 08:09:50 2016 -@@ -712,12 +712,12 @@ - '../display/display.gyp:display_util', - ], - }], -- ['OS=="linux" and chromeos==0 and use_ozone==0', { -+ ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_ozone==0', { - 'dependencies': [ - '../../build/linux/system.gyp:atk', - ], - }], -- ['OS=="linux" and chromeos==0', { -+ ['(OS=="linux" or os_bsd==1) and chromeos==0', { - 'dependencies': [ - '../shell_dialogs/shell_dialogs.gyp:shell_dialogs', - ], -@@ -787,7 +787,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/iridium/patches/patch-ui_views_views_switches_cc b/www/iridium/patches/patch-ui_views_views_switches_cc index 2f06720bf11..4855395fcb0 100644 --- a/www/iridium/patches/patch-ui_views_views_switches_cc +++ b/www/iridium/patches/patch-ui_views_views_switches_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_views_views_switches_cc,v 1.3 2016/03/23 20:13:07 robert Exp $ +$OpenBSD: patch-ui_views_views_switches_cc,v 1.4 2016/10/27 18:30:41 robert Exp $ --- ui/views/views_switches.cc.orig.port Wed Feb 24 00:02:06 2016 +++ ui/views/views_switches.cc Thu Mar 3 09:43:26 2016 @@ -18,7 +18,7 @@ const char kDisableViewsRectBasedTargeting[] = diff --git a/www/iridium/patches/patch-ui_views_window_custom_frame_view_cc b/www/iridium/patches/patch-ui_views_window_custom_frame_view_cc index 79b6c10e202..0f2eaf70168 100644 --- a/www/iridium/patches/patch-ui_views_window_custom_frame_view_cc +++ b/www/iridium/patches/patch-ui_views_window_custom_frame_view_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_views_window_custom_frame_view_cc,v 1.5 2016/03/23 20:13:07 robert Exp $ ---- ui/views/window/custom_frame_view.cc.orig.port Wed Feb 24 00:02:06 2016 -+++ ui/views/window/custom_frame_view.cc Thu Mar 3 09:43:26 2016 -@@ -288,7 +288,7 @@ int CustomFrameView::NonClientTopBorderHeight() const +$OpenBSD: patch-ui_views_window_custom_frame_view_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- ui/views/window/custom_frame_view.cc.orig.port Wed Oct 12 21:03:17 2016 ++++ ui/views/window/custom_frame_view.cc Wed Oct 19 12:56:13 2016 +@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderHeight() const int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/iridium/patches/patch-ui_views_window_dialog_delegate_cc b/www/iridium/patches/patch-ui_views_window_dialog_delegate_cc index 7b477f59ace..0c292e0e95b 100644 --- a/www/iridium/patches/patch-ui_views_window_dialog_delegate_cc +++ b/www/iridium/patches/patch-ui_views_window_dialog_delegate_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_views_window_dialog_delegate_cc,v 1.5 2016/05/28 14:49:39 robert Exp $ ---- ui/views/window/dialog_delegate.cc.orig.port Wed May 25 21:01:13 2016 -+++ ui/views/window/dialog_delegate.cc Thu May 26 08:09:50 2016 -@@ -51,7 +51,7 @@ Widget* DialogDelegate::CreateDialogWidgetWithBounds(W +$OpenBSD: patch-ui_views_window_dialog_delegate_cc,v 1.6 2016/10/27 18:30:41 robert Exp $ +--- ui/views/window/dialog_delegate.cc.orig.port Wed Oct 12 21:03:17 2016 ++++ ui/views/window/dialog_delegate.cc Wed Oct 19 12:56:13 2016 +@@ -56,7 +56,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit params.bounds = bounds; DialogDelegate* dialog = delegate->AsDialogDelegate(); @@ -9,4 +9,4 @@ $OpenBSD: patch-ui_views_window_dialog_delegate_cc,v 1.5 2016/05/28 14:49:39 rob +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) // The new style doesn't support unparented dialogs on Linux desktop. if (dialog) - dialog->supports_new_style_ &= parent != NULL; + dialog->supports_custom_frame_ &= parent != NULL; diff --git a/www/iridium/patches/patch-ui_webui_resources_js_cr_js b/www/iridium/patches/patch-ui_webui_resources_js_cr_js index 259cab0cbea..9b82083c13b 100644 --- a/www/iridium/patches/patch-ui_webui_resources_js_cr_js +++ b/www/iridium/patches/patch-ui_webui_resources_js_cr_js @@ -1,4 +1,4 @@ -$OpenBSD: patch-ui_webui_resources_js_cr_js,v 1.4 2016/05/28 14:49:39 robert Exp $ +$OpenBSD: patch-ui_webui_resources_js_cr_js,v 1.5 2016/10/27 18:30:41 robert Exp $ --- ui/webui/resources/js/cr.js.orig.port Wed May 25 04:54:44 2016 +++ ui/webui/resources/js/cr.js Thu May 26 08:09:50 2016 @@ -467,6 +467,11 @@ var cr = cr || function() { diff --git a/www/iridium/patches/patch-ui_webui_resources_js_icon_js b/www/iridium/patches/patch-ui_webui_resources_js_icon_js new file mode 100644 index 00000000000..3a074e64711 --- /dev/null +++ b/www/iridium/patches/patch-ui_webui_resources_js_icon_js @@ -0,0 +1,12 @@ +$OpenBSD: patch-ui_webui_resources_js_icon_js,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- ui/webui/resources/js/icon.js.orig.port Thu Jul 21 10:48:32 2016 ++++ ui/webui/resources/js/icon.js Thu Jul 21 10:48:47 2016 +@@ -9,7 +9,7 @@ cr.define('cr.icon', function() { + */ + function getSupportedScaleFactors() { + var supportedScaleFactors = []; +- if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) { ++ if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) { + // All desktop platforms support zooming which also updates the + // renderer's device scale factors (a.k.a devicePixelRatio), and + // these platforms has high DPI assets for 2.0x. Use 1x and 2x in diff --git a/www/iridium/patches/patch-ui_webui_resources_js_util_js b/www/iridium/patches/patch-ui_webui_resources_js_util_js deleted file mode 100644 index 9a808a0c0e9..00000000000 --- a/www/iridium/patches/patch-ui_webui_resources_js_util_js +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-ui_webui_resources_js_util_js,v 1.2 2016/04/27 12:46:16 robert Exp $ ---- ui/webui/resources/js/util.js.orig.port Wed Apr 13 23:00:05 2016 -+++ ui/webui/resources/js/util.js Thu Apr 14 08:25:16 2016 -@@ -52,7 +52,7 @@ function announceAccessibleMessage(msg) { - */ - function getSupportedScaleFactors() { - var supportedScaleFactors = []; -- if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) { -+ if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) { - // All desktop platforms support zooming which also updates the - // renderer's device scale factors (a.k.a devicePixelRatio), and - // these platforms has high DPI assets for 2.0x. Use 1x and 2x in diff --git a/www/iridium/patches/patch-v8_BUILD_gn b/www/iridium/patches/patch-v8_BUILD_gn new file mode 100644 index 00000000000..669e92c683b --- /dev/null +++ b/www/iridium/patches/patch-v8_BUILD_gn @@ -0,0 +1,34 @@ +$OpenBSD: patch-v8_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $ +--- v8/BUILD.gn.orig.port Fri Oct 21 00:03:00 2016 ++++ v8/BUILD.gn Tue Oct 25 08:34:25 2016 +@@ -2086,7 +2086,7 @@ v8_source_set("v8_libbase") { + sources += [ "src/base/platform/platform-posix.cc" ] + } + +- if (is_linux) { ++ if (is_linux && !is_openbsd) { + sources += [ + "src/base/debug/stack_trace_posix.cc", + "src/base/platform/platform-linux.cc", +@@ -2096,6 +2096,12 @@ v8_source_set("v8_libbase") { + "dl", + "rt", + ] ++ } else if (is_openbsd) { ++ sources += [ ++ "src/base/debug/stack_trace_posix.cc", ++ "src/base/platform/platform-openbsd.cc", ++ ] ++ libs = [ "execinfo" ] + } else if (is_android) { + if (current_toolchain == host_toolchain) { + libs = [ +@@ -2223,6 +2229,8 @@ v8_source_set("simple_fuzzer") { + if (current_toolchain == v8_snapshot_toolchain) { + v8_executable("mksnapshot") { + visibility = [ ":*" ] # Only targets in this file can depend on this. ++ ++ libs = [ "execinfo" ] + + sources = [ + "src/snapshot/mksnapshot.cc", diff --git a/www/iridium/patches/patch-v8_src_base_platform_platform-openbsd_cc b/www/iridium/patches/patch-v8_src_base_platform_platform-openbsd_cc deleted file mode 100644 index 347a476400b..00000000000 --- a/www/iridium/patches/patch-v8_src_base_platform_platform-openbsd_cc +++ /dev/null @@ -1,309 +0,0 @@ -$OpenBSD: patch-v8_src_base_platform_platform-openbsd_cc,v 1.3 2016/02/15 18:07:53 robert Exp $ ---- v8/src/base/platform/platform-openbsd.cc.orig.port Wed Jan 20 21:02:45 2016 -+++ v8/src/base/platform/platform-openbsd.cc Fri Jan 22 19:58:59 2016 -@@ -2,26 +2,41 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - --// Platform-specific code for OpenBSD and NetBSD goes here. For the --// POSIX-compatible parts, the implementation is in platform-posix.cc. -+// Platform-specific code for Linux goes here. For the POSIX-compatible -+// parts, the implementation is in platform-posix.cc. - - #include - #include - #include -+#include - #include - #include --#include - #include --#include - -+// Ubuntu Dapper requires memory pages to be marked as -+// executable. Otherwise, OS raises an exception when executing code -+// in that page. - #include - #include // open - #include - #include // index - #include // mmap & munmap - #include // open -+#include // mmap & munmap - #include // sysconf - -+// GLibc on ARM defines mcontext_t has a typedef for 'struct sigcontext'. -+// Old versions of the C library didn't define the type. -+#if defined(__ANDROID__) && !defined(__BIONIC_HAVE_UCONTEXT_T) && \ -+ (defined(__arm__) || defined(__aarch64__)) && \ -+ !defined(__BIONIC_HAVE_STRUCT_SIGCONTEXT) -+#include // NOLINT -+#endif -+ -+#if defined(LEAK_SANITIZER) -+#include -+#endif -+ - #include - - #undef MAP_TYPE -@@ -29,26 +44,87 @@ - #include "src/base/macros.h" - #include "src/base/platform/platform.h" - -+#if V8_OS_NACL -+#if !defined(MAP_NORESERVE) -+// PNaCL doesn't have this, so we always grab all of the memory, which is bad. -+#define MAP_NORESERVE 0 -+#endif -+#else -+#include -+#endif - - namespace v8 { - namespace base { - - -+#ifdef __arm__ -+ -+bool OS::ArmUsingHardFloat() { -+ // GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify -+ // the Floating Point ABI used (PCS stands for Procedure Call Standard). -+ // We use these as well as a couple of other defines to statically determine -+ // what FP ABI used. -+ // GCC versions 4.4 and below don't support hard-fp. -+ // GCC versions 4.5 may support hard-fp without defining __ARM_PCS or -+ // __ARM_PCS_VFP. -+ -+#define GCC_VERSION (__GNUC__ * 10000 \ -+ + __GNUC_MINOR__ * 100 \ -+ + __GNUC_PATCHLEVEL__) -+#if GCC_VERSION >= 40600 -+#if defined(__ARM_PCS_VFP) -+ return true; -+#else -+ return false; -+#endif -+ -+#elif GCC_VERSION < 40500 -+ return false; -+ -+#else -+#if defined(__ARM_PCS_VFP) -+ return true; -+#elif defined(__ARM_PCS) || defined(__SOFTFP__) || defined(__SOFTFP) || \ -+ !defined(__VFP_FP__) -+ return false; -+#else -+#error "Your version of GCC does not report the FP ABI compiled for." \ -+ "Please report it on this issue" \ -+ "http://code.google.com/p/v8/issues/detail?id=2140" -+ -+#endif -+#endif -+#undef GCC_VERSION -+} -+ -+#endif // def __arm__ -+ -+ - const char* OS::LocalTimezone(double time, TimezoneCache* cache) { -+#if V8_OS_NACL -+ // Missing support for tm_zone field. -+ return ""; -+#else - if (std::isnan(time)) return ""; - time_t tv = static_cast(std::floor(time/msPerSecond)); - struct tm* t = localtime(&tv); // NOLINT(runtime/threadsafe_fn) -- if (NULL == t) return ""; -+ if (!t || !t->tm_zone) return ""; - return t->tm_zone; -+#endif - } - - - double OS::LocalTimeOffset(TimezoneCache* cache) { -+#if V8_OS_NACL -+ // Missing support for tm_zone field. -+ return 0; -+#else - time_t tv = time(NULL); - struct tm* t = localtime(&tv); // NOLINT(runtime/threadsafe_fn) - // tm_gmtoff includes any daylight savings offset, so subtract it. - return static_cast(t->tm_gmtoff * msPerSecond - - (t->tm_isdst > 0 ? 3600 * msPerSecond : 0)); -+#endif - } - - -@@ -58,7 +134,7 @@ void* OS::Allocate(const size_t requested, - const size_t msize = RoundUp(requested, AllocateAlignment()); - int prot = PROT_READ | PROT_WRITE | (is_executable ? PROT_EXEC : 0); - void* addr = OS::GetRandomMmapAddr(); -- void* mbase = mmap(addr, msize, prot, MAP_PRIVATE | MAP_ANON, -1, 0); -+ void* mbase = mmap(addr, msize, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - if (mbase == MAP_FAILED) return NULL; - *allocated = msize; - return mbase; -@@ -91,19 +167,20 @@ std::vector OS::GetSharedLib - // the beginning of the filename or the end of the line. - do { - c = getc(fp); -- } while ((c != EOF) && (c != '\n') && (c != '/')); -+ } while ((c != EOF) && (c != '\n') && (c != '/') && (c != '[')); - if (c == EOF) break; // EOF: Was unexpected, just exit. - - // Process the filename if found. -- if (c == '/') { -- ungetc(c, fp); // Push the '/' back into the stream to be read below. -+ if ((c == '/') || (c == '[')) { -+ // Push the '/' or '[' back into the stream to be read below. -+ ungetc(c, fp); - - // Read to the end of the line. Exit if the read fails. - if (fgets(lib_name, kLibNameLen, fp) == NULL) break; - - // Drop the newline character read by fgets. We do not need to check - // for a zero-length string because we know that we at least read the -- // '/' character. -+ // '/' or '[' character. - lib_name[strlen(lib_name) - 1] = '\0'; - } else { - // No library name found, just record the raw address range. -@@ -135,21 +212,27 @@ void OS::SignalCodeMovingGC() { - // it. This injects a GC marker into the stream of events generated - // by the kernel and allows us to synchronize V8 code log and the - // kernel log. -- int size = sysconf(_SC_PAGESIZE); -+ long size = sysconf(_SC_PAGESIZE); // NOLINT(runtime/int) - FILE* f = fopen(OS::GetGCFakeMMapFile(), "w+"); - if (f == NULL) { - OS::PrintError("Failed to open %s\n", OS::GetGCFakeMMapFile()); - OS::Abort(); - } -- void* addr = mmap(NULL, size, PROT_READ | PROT_EXEC, MAP_PRIVATE, -- fileno(f), 0); -- DCHECK(addr != MAP_FAILED); -+ void* addr = mmap(OS::GetRandomMmapAddr(), size, -+#if V8_OS_NACL -+ // The Native Client port of V8 uses an interpreter, -+ // so code pages don't need PROT_EXEC. -+ PROT_READ, -+#else -+ PROT_READ | PROT_EXEC, -+#endif -+ MAP_PRIVATE, fileno(f), 0); -+ DCHECK_NE(MAP_FAILED, addr); - OS::Free(addr, size); - fclose(f); - } - - -- - // Constants used for mmap. - static const int kMmapFd = -1; - static const int kMmapFdOffset = 0; -@@ -170,7 +253,7 @@ VirtualMemory::VirtualMemory(size_t size, size_t align - void* reservation = mmap(OS::GetRandomMmapAddr(), - request_size, - PROT_NONE, -- MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, - kMmapFd, - kMmapFdOffset); - if (reservation == MAP_FAILED) return; -@@ -199,6 +282,9 @@ VirtualMemory::VirtualMemory(size_t size, size_t align - - address_ = static_cast(aligned_base); - size_ = aligned_size; -+#if defined(LEAK_SANITIZER) -+ __lsan_register_root_region(address_, size_); -+#endif - } - - -@@ -223,16 +309,19 @@ void VirtualMemory::Reset() { - - - bool VirtualMemory::Commit(void* address, size_t size, bool is_executable) { -+ CHECK(InVM(address, size)); - return CommitRegion(address, size, is_executable); - } - - - bool VirtualMemory::Uncommit(void* address, size_t size) { -+ CHECK(InVM(address, size)); - return UncommitRegion(address, size); - } - - - bool VirtualMemory::Guard(void* address) { -+ CHECK(InVM(address, OS::CommitPageSize())); - OS::Guard(address, OS::CommitPageSize()); - return true; - } -@@ -242,26 +331,36 @@ void* VirtualMemory::ReserveRegion(size_t size) { - void* result = mmap(OS::GetRandomMmapAddr(), - size, - PROT_NONE, -- MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, - kMmapFd, - kMmapFdOffset); - - if (result == MAP_FAILED) return NULL; - -+#if defined(LEAK_SANITIZER) -+ __lsan_register_root_region(result, size); -+#endif - return result; - } - - - bool VirtualMemory::CommitRegion(void* base, size_t size, bool is_executable) { -+#if V8_OS_NACL -+ // The Native Client port of V8 uses an interpreter, -+ // so code pages don't need PROT_EXEC. -+ int prot = PROT_READ | PROT_WRITE; -+#else - int prot = PROT_READ | PROT_WRITE | (is_executable ? PROT_EXEC : 0); -+#endif - if (MAP_FAILED == mmap(base, - size, - prot, -- MAP_PRIVATE | MAP_ANON | MAP_FIXED, -+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, - kMmapFd, - kMmapFdOffset)) { - return false; - } -+ - return true; - } - -@@ -270,20 +369,22 @@ bool VirtualMemory::UncommitRegion(void* base, size_t - return mmap(base, - size, - PROT_NONE, -- MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED, -+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_FIXED, - kMmapFd, - kMmapFdOffset) != MAP_FAILED; - } - - - bool VirtualMemory::ReleaseRegion(void* base, size_t size) { -+#if defined(LEAK_SANITIZER) -+ __lsan_unregister_root_region(base, size); -+#endif - return munmap(base, size) == 0; - } - - - bool VirtualMemory::HasLazyCommits() { -- // TODO(alph): implement for the platform. -- return false; -+ return true; - } - - } // namespace base diff --git a/www/iridium/patches/patch-v8_src_base_platform_platform-posix_cc b/www/iridium/patches/patch-v8_src_base_platform_platform-posix_cc index 77ed83a5949..8d065888198 100644 --- a/www/iridium/patches/patch-v8_src_base_platform_platform-posix_cc +++ b/www/iridium/patches/patch-v8_src_base_platform_platform-posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-v8_src_base_platform_platform-posix_cc,v 1.4 2016/05/28 14:49:39 robert Exp $ ---- v8/src/base/platform/platform-posix.cc.orig.port Wed May 25 21:02:49 2016 -+++ v8/src/base/platform/platform-posix.cc Thu May 26 08:09:50 2016 -@@ -347,6 +347,8 @@ int OS::GetCurrentThreadId() { +$OpenBSD: patch-v8_src_base_platform_platform-posix_cc,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- v8/src/base/platform/platform-posix.cc.orig.port Wed Oct 12 21:05:51 2016 ++++ v8/src/base/platform/platform-posix.cc Wed Oct 19 12:56:13 2016 +@@ -333,6 +333,8 @@ int OS::GetCurrentThreadId() { return static_cast(thread_self()); #elif V8_OS_SOLARIS return static_cast(pthread_self()); diff --git a/www/iridium/patches/patch-v8_src_globals_h b/www/iridium/patches/patch-v8_src_globals_h index a908c14c215..db8d5197561 100644 --- a/www/iridium/patches/patch-v8_src_globals_h +++ b/www/iridium/patches/patch-v8_src_globals_h @@ -1,18 +1,15 @@ -$OpenBSD: patch-v8_src_globals_h,v 1.2 2016/05/28 14:49:39 robert Exp $ - -Try to pre-allocate less memory on OpenBSD in the v8 engine. - ---- v8/src/globals.h.orig.port Wed May 25 21:02:49 2016 -+++ v8/src/globals.h Thu May 26 08:09:50 2016 -@@ -156,7 +156,11 @@ const bool kRequiresCodeRange = true; - // region. Used only for large object space. - const size_t kMaximalCodeRangeSize = 256 * MB; +$OpenBSD: patch-v8_src_globals_h,v 1.3 2016/10/27 18:30:41 robert Exp $ +--- v8/src/globals.h.orig.port Thu Sep 1 11:40:44 2016 ++++ v8/src/globals.h Thu Sep 1 11:41:23 2016 +@@ -155,7 +155,11 @@ const size_t kCodeRangeAreaAlignment = 256 * MB; + const size_t kMaximalCodeRangeSize = 512 * MB; + const size_t kCodeRangeAreaAlignment = 64 * KB; // OS page on PPC Linux #else +#if defined(__OpenBSD__) +const size_t kMaximalCodeRangeSize = 256 * MB; +#else const size_t kMaximalCodeRangeSize = 512 * MB; +#endif + const size_t kCodeRangeAreaAlignment = 4 * KB; // OS page. #endif #if V8_OS_WIN - const size_t kMinimumCodeRangeSize = 4 * MB; diff --git a/www/iridium/patches/patch-v8_src_log-utils_h b/www/iridium/patches/patch-v8_src_log-utils_h index c9bc91033c9..e791a325bd3 100644 --- a/www/iridium/patches/patch-v8_src_log-utils_h +++ b/www/iridium/patches/patch-v8_src_log-utils_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-v8_src_log-utils_h,v 1.4 2016/02/15 18:07:53 robert Exp $ ---- v8/src/log-utils.h.orig.port Wed Jan 20 21:02:45 2016 -+++ v8/src/log-utils.h Fri Jan 22 19:58:59 2016 -@@ -13,6 +13,8 @@ +$OpenBSD: patch-v8_src_log-utils_h,v 1.5 2016/10/27 18:30:41 robert Exp $ +--- v8/src/log-utils.h.orig.port Wed Jul 20 21:05:13 2016 ++++ v8/src/log-utils.h Thu Jul 21 10:25:33 2016 +@@ -14,6 +14,8 @@ #include "src/base/platform/mutex.h" #include "src/flags.h" diff --git a/www/iridium/pkg/PLIST b/www/iridium/pkg/PLIST index cc1bdcf93b3..5af54eb549d 100644 --- a/www/iridium/pkg/PLIST +++ b/www/iridium/pkg/PLIST @@ -1,11 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.11 2016/05/28 14:49:39 robert Exp $ +@comment $OpenBSD: PLIST,v 1.12 2016/10/27 18:30:42 robert Exp $ bin/iridium iridium/ iridium/chrome_100_percent.pak iridium/chrome_200_percent.pak -iridium/chrome_material_100_percent.pak -iridium/chrome_material_200_percent.pak -iridium/content_resources.pak iridium/icudtl.dat @bin iridium/iridium iridium/keyboard_resources.pak @@ -25,6 +22,7 @@ iridium/locales/es-419.pak iridium/locales/es.pak iridium/locales/et.pak iridium/locales/fa.pak +iridium/locales/fake-bidi.pak iridium/locales/fi.pak iridium/locales/fil.pak iridium/locales/fr.pak @@ -64,17 +62,22 @@ iridium/locales/vi.pak iridium/locales/zh-CN.pak iridium/locales/zh-TW.pak iridium/mksnapshot +iridium/mus_app_resources_100.pak +iridium/mus_app_resources_200.pak +iridium/mus_app_resources_strings.pak +iridium/natives_blob.bin iridium/product_logo_48.png iridium/protoc -iridium/pseudo_locales/ -iridium/pseudo_locales/fake-bidi.pak iridium/resources/ iridium/resources.pak -iridium/resources/extension/ -iridium/resources/extension/demo/ -iridium/resources/extension/demo/library.js iridium/resources/inspector/ iridium/resources/inspector/Images/ +iridium/resources/inspector/Images/accelerometer-back.png +iridium/resources/inspector/Images/accelerometer-bottom.png +iridium/resources/inspector/Images/accelerometer-front.png +iridium/resources/inspector/Images/accelerometer-left.png +iridium/resources/inspector/Images/accelerometer-right.png +iridium/resources/inspector/Images/accelerometer-top.png iridium/resources/inspector/Images/applicationCache.png iridium/resources/inspector/Images/breakpoint.png iridium/resources/inspector/Images/breakpointConditional.png @@ -88,9 +91,6 @@ iridium/resources/inspector/Images/chromeMiddle.png iridium/resources/inspector/Images/chromeRight.png iridium/resources/inspector/Images/chromeSelect.png iridium/resources/inspector/Images/chromeSelect_2x.png -iridium/resources/inspector/Images/cookie.png -iridium/resources/inspector/Images/database.png -iridium/resources/inspector/Images/databaseTable.png iridium/resources/inspector/Images/deleteIcon.png iridium/resources/inspector/Images/domain.png iridium/resources/inspector/Images/errorWave.png @@ -102,10 +102,6 @@ iridium/resources/inspector/Images/graphLabelCalloutLeft.png iridium/resources/inspector/Images/graphLabelCalloutRight.png iridium/resources/inspector/Images/ic_info_black_18dp.svg iridium/resources/inspector/Images/ic_warning_black_18dp.svg -iridium/resources/inspector/Images/indexedDB.png -iridium/resources/inspector/Images/indexedDBIndex.png -iridium/resources/inspector/Images/indexedDBObjectStore.png -iridium/resources/inspector/Images/localStorage.png iridium/resources/inspector/Images/navigationControls.png iridium/resources/inspector/Images/navigationControls_2x.png iridium/resources/inspector/Images/paneAddButtons.png @@ -125,24 +121,20 @@ iridium/resources/inspector/Images/resizeVertical_2x.png iridium/resources/inspector/Images/resourceCSSIcon.png iridium/resources/inspector/Images/resourceDocumentIcon.png iridium/resources/inspector/Images/resourceDocumentIconSmall.png +iridium/resources/inspector/Images/resourceGlyphs.png +iridium/resources/inspector/Images/resourceGlyphs_2x.png iridium/resources/inspector/Images/resourceJSIcon.png iridium/resources/inspector/Images/resourcePlainIcon.png iridium/resources/inspector/Images/resourcePlainIconSmall.png iridium/resources/inspector/Images/resourcesTimeGraphIcon.png iridium/resources/inspector/Images/searchNext.png iridium/resources/inspector/Images/searchPrev.png -iridium/resources/inspector/Images/securityPropertyInfo.svg -iridium/resources/inspector/Images/securityPropertyInsecure.svg -iridium/resources/inspector/Images/securityPropertySecure.svg -iridium/resources/inspector/Images/securityPropertyUnknown.svg -iridium/resources/inspector/Images/securityPropertyWarning.svg -iridium/resources/inspector/Images/securityStateInsecure.svg -iridium/resources/inspector/Images/securityStateNeutral.svg -iridium/resources/inspector/Images/securityStateSecure.svg -iridium/resources/inspector/Images/serviceWorker.svg -iridium/resources/inspector/Images/sessionStorage.png +iridium/resources/inspector/Images/securityIcons.png +iridium/resources/inspector/Images/securityIcons_2x.png iridium/resources/inspector/Images/settingsListRemove.png iridium/resources/inspector/Images/settingsListRemove_2x.png +iridium/resources/inspector/Images/smallIcons.png +iridium/resources/inspector/Images/smallIcons_2x.png iridium/resources/inspector/Images/speech.png iridium/resources/inspector/Images/toolbarButtonGlyphs.png iridium/resources/inspector/Images/toolbarButtonGlyphs_2x.png @@ -154,18 +146,32 @@ iridium/resources/inspector/Images/touchCursor_2x.png iridium/resources/inspector/InspectorBackendCommands.js iridium/resources/inspector/SupportedCSSProperties.js iridium/resources/inspector/Tests.js -iridium/resources/inspector/accessibility_module.js -iridium/resources/inspector/animation_module.js -iridium/resources/inspector/audits_module.js -iridium/resources/inspector/cm_modes_module.js -iridium/resources/inspector/components_lazy_module.js -iridium/resources/inspector/console_module.js -iridium/resources/inspector/devices_module.js +iridium/resources/inspector/accessibility/ +iridium/resources/inspector/accessibility/accessibility_module.js +iridium/resources/inspector/animation/ +iridium/resources/inspector/animation/animation_module.js +iridium/resources/inspector/audits/ +iridium/resources/inspector/audits/audits_module.js +iridium/resources/inspector/cm_modes/ +iridium/resources/inspector/cm_modes/cm_modes_module.js +iridium/resources/inspector/components_lazy/ +iridium/resources/inspector/components_lazy/components_lazy_module.js +iridium/resources/inspector/console/ +iridium/resources/inspector/console/console_module.js +iridium/resources/inspector/devices/ +iridium/resources/inspector/devices/devices_module.js iridium/resources/inspector/devtools.js iridium/resources/inspector/devtools_extension_api.js -iridium/resources/inspector/diff_module.js -iridium/resources/inspector/elements_module.js +iridium/resources/inspector/diff/ +iridium/resources/inspector/diff/diff_module.js +iridium/resources/inspector/elements/ +iridium/resources/inspector/elements/elements_module.js iridium/resources/inspector/emulated_devices/ +iridium/resources/inspector/emulated_devices/Nexus5X-landscape.svg +iridium/resources/inspector/emulated_devices/Nexus5X-portrait.svg +iridium/resources/inspector/emulated_devices/Nexus6P-landscape.svg +iridium/resources/inspector/emulated_devices/Nexus6P-portrait.svg +iridium/resources/inspector/emulated_devices/emulated_devices_module.js iridium/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png iridium/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-2x.png iridium/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-1x.png @@ -190,29 +196,55 @@ iridium/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-1 iridium/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-2x.png iridium/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-1x.png iridium/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-2x.png -iridium/resources/inspector/emulated_devices_module.js -iridium/resources/inspector/es_tree_module.js -iridium/resources/inspector/formatter_worker_module.js -iridium/resources/inspector/heap_snapshot_worker_module.js +iridium/resources/inspector/emulated_devices/iPad-landscape.svg +iridium/resources/inspector/emulated_devices/iPad-portrait.svg +iridium/resources/inspector/emulated_devices/iPhone5-landscape.svg +iridium/resources/inspector/emulated_devices/iPhone5-portrait.svg +iridium/resources/inspector/emulated_devices/iPhone6-landscape.svg +iridium/resources/inspector/emulated_devices/iPhone6-portrait.svg +iridium/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg +iridium/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg +iridium/resources/inspector/es_tree/ +iridium/resources/inspector/es_tree/es_tree_module.js +iridium/resources/inspector/formatter_worker.js +iridium/resources/inspector/gonzales/ +iridium/resources/inspector/gonzales/gonzales_module.js +iridium/resources/inspector/heap_snapshot_worker.js iridium/resources/inspector/inspector.html iridium/resources/inspector/inspector.js -iridium/resources/inspector/layers_module.js -iridium/resources/inspector/network_module.js -iridium/resources/inspector/profiler_module.js -iridium/resources/inspector/resources_module.js -iridium/resources/inspector/sass_module.js -iridium/resources/inspector/screencast_module.js -iridium/resources/inspector/security_module.js -iridium/resources/inspector/settings_module.js -iridium/resources/inspector/snippets_module.js -iridium/resources/inspector/source_frame_module.js -iridium/resources/inspector/sources_module.js -iridium/resources/inspector/temp_storage_shared_worker_module.js -iridium/resources/inspector/timeline_module.js +iridium/resources/inspector/layers/ +iridium/resources/inspector/layers/layers_module.js +iridium/resources/inspector/network/ +iridium/resources/inspector/network/network_module.js +iridium/resources/inspector/profiler/ +iridium/resources/inspector/profiler/profiler_module.js +iridium/resources/inspector/resources/ +iridium/resources/inspector/resources/resources_module.js +iridium/resources/inspector/sass/ +iridium/resources/inspector/sass/sass_module.js +iridium/resources/inspector/screencast/ +iridium/resources/inspector/screencast/screencast_module.js +iridium/resources/inspector/security/ +iridium/resources/inspector/security/security_module.js +iridium/resources/inspector/settings/ +iridium/resources/inspector/settings/settings_module.js +iridium/resources/inspector/snippets/ +iridium/resources/inspector/snippets/snippets_module.js +iridium/resources/inspector/source_frame/ +iridium/resources/inspector/source_frame/source_frame_module.js +iridium/resources/inspector/sources/ +iridium/resources/inspector/sources/sources_module.js +iridium/resources/inspector/temp_storage_shared_worker.js +iridium/resources/inspector/timeline/ +iridium/resources/inspector/timeline/timeline_module.js +iridium/resources/inspector/timeline_model/ +iridium/resources/inspector/timeline_model/timeline_model_module.js iridium/resources/inspector/toolbox.html iridium/resources/inspector/toolbox.js -iridium/resources/inspector/ui_lazy_module.js -iridium/shell_resources.pak +iridium/resources/inspector/ui_lazy/ +iridium/resources/inspector/ui_lazy/ui_lazy_module.js +iridium/snapshot_blob.bin +iridium/views_mus_resources.pak @man man/man1/iridium.1 share/applications/iridium-browser.desktop share/icons/hicolor/128x128/apps/iridium.png