Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile +++ head/www/chromium/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 84.0.4147.125 +PORTVERSION= 84.0.4147.135 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts Index: head/www/chromium/distinfo =================================================================== --- head/www/chromium/distinfo +++ head/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1597145794 -SHA256 (chromium-84.0.4147.125.tar.xz) = 98439626cf2d8d3d8f9486d08a99cbc1e4981b3f3427a072d5eaaf6ded4daff5 -SIZE (chromium-84.0.4147.125.tar.xz) = 846433536 -SHA256 (chromium-84.0.4147.125-testdata.tar.xz) = 7058620db4c8b20034fa3d9416046366921971c77e71c5d65697453d0ce7b3a5 -SIZE (chromium-84.0.4147.125-testdata.tar.xz) = 257151900 +TIMESTAMP = 1597780235 +SHA256 (chromium-84.0.4147.135.tar.xz) = dd41001596d0e17051ddcece3db6c0cdbe92fe23375d56fbcfba624a5f4996d8 +SIZE (chromium-84.0.4147.135.tar.xz) = 815136236 +SHA256 (chromium-84.0.4147.135-testdata.tar.xz) = cef39a11f7df8ff9655b9e70b9d774dc65cf6a15a726c048389eb87613d80ef2 +SIZE (chromium-84.0.4147.135-testdata.tar.xz) = 257190224 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 Index: head/www/chromium/files/patch-chrome_browser_about__flags.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_about__flags.cc +++ head/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/about_flags.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/about_flags.cc.orig 2020-08-18 18:40:04 UTC +++ chrome/browser/about_flags.cc @@ -179,7 +179,7 @@ #include "ui/gl/gl_switches.h" @@ -77,7 +77,7 @@ {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -3399,7 +3399,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3403,7 +3403,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( omnibox::kHistoryQuickProviderAllowMidwordContinuations)}, @@ -86,7 +86,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -3454,7 +3454,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3458,7 +3458,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kRichAutocompletion, kOmniboxRichAutocompletionVariations, "OmniboxBundledExperimentV1")}, @@ -95,7 +95,7 @@ {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3670,13 +3670,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3674,13 +3674,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -111,7 +111,7 @@ #if !defined(OS_ANDROID) {"ntp-confirm-suggestion-removals", -@@ -4361,7 +4361,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4365,7 +4365,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(kClickToCallUI)}, #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -120,7 +120,7 @@ defined(OS_CHROMEOS) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -4378,7 +4378,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4382,7 +4382,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, @@ -129,7 +129,7 @@ // defined(OS_CHROMEOS) {"shared-clipboard-ui", flag_descriptions::kSharedClipboardUIName, -@@ -4404,7 +4404,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4408,7 +4408,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( send_tab_to_self::kSendTabToSelfOmniboxSendingAnimation)}, @@ -138,7 +138,7 @@ defined(OS_CHROMEOS) {"sharing-peer-connection-receiver", flag_descriptions::kSharingPeerConnectionReceiverName, -@@ -4415,7 +4415,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4419,7 +4419,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSharingPeerConnectionSenderName, flag_descriptions::kSharingPeerConnectionSenderDescription, kOsDesktop, FEATURE_VALUE_TYPE(kSharingPeerConnectionSender)}, @@ -147,7 +147,7 @@ // defined(OS_CHROMEOS) {"sharing-prefer-vapid", flag_descriptions::kSharingPreferVapidName, -@@ -4490,13 +4490,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4494,13 +4494,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, #endif @@ -163,7 +163,7 @@ // defined(OS_CHROMEOS) {"enable-audio-focus-enforcement", -@@ -4937,7 +4937,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4941,7 +4941,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, @@ -172,7 +172,7 @@ {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, kOsWin | kOsMac | kOsLinux, -@@ -4954,7 +4954,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4958,7 +4958,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsPictureInPictureDescription, kOsWin | kOsMac | kOsLinux | kOsCrOS, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsPictureInPicture)}, Index: head/www/chromium/files/patch-chrome_browser_flag__descriptions.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ head/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,4 +1,4 @@ ---- chrome/browser/flag_descriptions.h.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/flag_descriptions.h.orig 2020-08-18 18:40:05 UTC +++ chrome/browser/flag_descriptions.h @@ -19,9 +19,9 @@ #include "ppapi/buildflags/buildflags.h" @@ -12,7 +12,7 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2303,14 +2303,14 @@ extern const char kZeroStateFilesDescription[]; +@@ -2306,14 +2306,14 @@ extern const char kZeroStateFilesDescription[]; #endif // #if defined(OS_CHROMEOS) @@ -29,7 +29,7 @@ // All views-based platforms -------------------------------------------------- -@@ -2332,12 +2332,12 @@ extern const char kReopenTabInProductHelpDescription[] +@@ -2335,12 +2335,12 @@ extern const char kReopenTabInProductHelpDescription[] // Random platform combinations ----------------------------------------------- @@ -44,7 +44,7 @@ #if BUILDFLAG(ENABLE_CLICK_TO_CALL) -@@ -2346,7 +2346,7 @@ extern const char kClickToCallUIDescription[]; +@@ -2349,7 +2349,7 @@ extern const char kClickToCallUIDescription[]; #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -53,7 +53,7 @@ defined(OS_CHROMEOS) extern const char kEnableMediaFeedsName[]; -@@ -2364,15 +2364,15 @@ extern const char kRemoteCopyPersistentNotificationDes +@@ -2367,15 +2367,15 @@ extern const char kRemoteCopyPersistentNotificationDes extern const char kRemoteCopyProgressNotificationName[]; extern const char kRemoteCopyProgressNotificationDescription[]; Index: head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/flag_descriptions.cc.orig 2020-08-18 18:40:05 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3923,7 +3923,7 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -3929,7 +3929,7 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #if BUILDFLAG(USE_TCMALLOC) const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; -@@ -3932,7 +3932,7 @@ const char kDynamicTcmallocDescription[] = +@@ -3938,7 +3938,7 @@ const char kDynamicTcmallocDescription[] = "utilization."; #endif // BUILDFLAG(USE_TCMALLOC) @@ -18,7 +18,7 @@ // All views-based platforms -------------------------------------------------- -@@ -3962,13 +3962,13 @@ const char kReopenTabInProductHelpDescription[] = +@@ -3968,13 +3968,13 @@ const char kReopenTabInProductHelpDescription[] = // Random platform combinations ----------------------------------------------- @@ -34,7 +34,7 @@ #if BUILDFLAG(ENABLE_CLICK_TO_CALL) -@@ -3980,7 +3980,7 @@ const char kClickToCallUIDescription[] = +@@ -3986,7 +3986,7 @@ const char kClickToCallUIDescription[] = #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -43,7 +43,7 @@ defined(OS_CHROMEOS) const char kEnableMediaFeedsName[] = "Enables Media Feeds"; -@@ -4012,16 +4012,16 @@ const char kRemoteCopyProgressNotificationDescription[ +@@ -4018,16 +4018,16 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; Index: head/www/chromium/files/patch-components_feature__engagement_public_feature__list.h =================================================================== --- head/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ head/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2020-07-07 21:58:15 UTC +--- components/feature_engagement/public/feature_list.h.orig 2020-08-18 18:40:09 UTC +++ components/feature_engagement/public/feature_list.h -@@ -113,7 +113,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge +@@ -119,7 +119,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge "IPH_BadgedTranslateManualTrigger"); #endif // defined(OS_IOS) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); DEFINE_VARIATION_PARAM(kIPHGlobalMediaControls, "IPH_GlobalMediaControls"); -@@ -124,7 +124,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm +@@ -130,7 +130,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm DEFINE_VARIATION_PARAM(kIPHIncognitoWindowFeature, "IPH_IncognitoWindow"); DEFINE_VARIATION_PARAM(kIPHNewTabFeature, "IPH_NewTab"); #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) @@ -18,7 +18,7 @@ // defined(OS_CHROMEOS) } // namespace -@@ -176,7 +176,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -185,7 +185,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHNewIncognitoTabTipFeature), VARIATION_ENTRY(kIPHBadgedReadingListFeature), VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), @@ -27,7 +27,7 @@ defined(OS_CHROMEOS) VARIATION_ENTRY(kIPHFocusModeFeature), VARIATION_ENTRY(kIPHGlobalMediaControls), -@@ -187,7 +187,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -196,7 +196,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHIncognitoWindowFeature), VARIATION_ENTRY(kIPHNewTabFeature), #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) Index: head/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc =================================================================== --- head/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ head/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2020-07-07 21:58:15 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2020-08-18 18:40:09 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -60,7 +60,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -63,7 +63,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedReadingListFeature, &kIPHBadgedTranslateManualTriggerFeature, #endif // defined(OS_IOS) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) &kIPHFocusModeFeature, &kIPHGlobalMediaControlsFeature, -@@ -71,7 +71,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -74,7 +74,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHIncognitoWindowFeature, &kIPHNewTabFeature, #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) Index: head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h =================================================================== --- head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h +++ head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h @@ -1,5 +1,5 @@ ---- services/device/hid/hid_connection_freebsd.h.orig 2020-07-18 19:40:14.412550000 -0700 -+++ services/device/hid/hid_connection_freebsd.h 2020-07-21 19:15:28.613027000 -0700 +--- services/device/hid/hid_connection_freebsd.h.orig 2020-08-18 20:44:53 UTC ++++ services/device/hid/hid_connection_freebsd.h @@ -0,0 +1,65 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be Index: head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc =================================================================== --- head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc +++ head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc @@ -1,5 +1,5 @@ ---- services/device/hid/hid_connection_freebsd.cc.orig 2020-07-18 19:40:14.410523000 -0700 -+++ services/device/hid/hid_connection_freebsd.cc 2020-07-21 19:49:59.569331000 -0700 +--- services/device/hid/hid_connection_freebsd.cc.orig 2020-08-18 20:44:53 UTC ++++ services/device/hid/hid_connection_freebsd.cc @@ -0,0 +1,240 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be Index: head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h =================================================================== --- head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h +++ head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h @@ -1,5 +1,5 @@ ---- services/device/hid/hid_service_freebsd.h.orig 2020-07-18 19:40:14.418200000 -0700 -+++ services/device/hid/hid_service_freebsd.h 2020-07-21 19:52:08.796704000 -0700 +--- services/device/hid/hid_service_freebsd.h.orig 2020-08-18 20:44:53 UTC ++++ services/device/hid/hid_service_freebsd.h @@ -0,0 +1,46 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be Index: head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc =================================================================== --- head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc +++ head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc @@ -1,5 +1,5 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2020-07-18 19:40:14.415772000 -0700 -+++ services/device/hid/hid_service_freebsd.cc 2020-07-21 20:00:55.322907000 -0700 +--- services/device/hid/hid_service_freebsd.cc.orig 2020-08-18 20:44:53 UTC ++++ services/device/hid/hid_service_freebsd.cc @@ -0,0 +1,382 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be Index: head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h +++ head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h @@ -0,0 +1,151 @@ +--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2020-08-18 18:42:46 UTC ++++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h +@@ -9,17 +9,21 @@ + + /* Define to 1 to enable backtraces, and to 0 otherwise. */ + /* #undef ENABLE_BACKTRACES */ ++#define ENABLE_BACKTRACES 1 + + /* Define to 1 to enable crash overrides, and to 0 otherwise. */ + /* #undef ENABLE_CRASH_OVERRIDES */ ++#define ENABLE_CRASH_OVERRIDES 1 + + /* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ + #define LLVM_ENABLE_CRASH_DUMPS 0 + + /* Define to 1 if you have the `backtrace' function. */ + /* #undef HAVE_BACKTRACE */ ++#define HAVE_BACKTRACE 1 + + /* #undef BACKTRACE_HEADER */ ++#define BACKTRACE_HEADER + + /* Define to 1 if you have the header file. */ + /* #undef HAVE_CRASHREPORTERCLIENT_H */ +@@ -29,7 +33,7 @@ + + /* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +-#define HAVE_DECL_ARC4RANDOM 0 ++#define HAVE_DECL_ARC4RANDOM 1 + + /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +@@ -53,7 +57,7 @@ + #define HAVE_DLOPEN 1 + + /* Define if dladdr() is available on this platform. */ +-/* #undef HAVE_DLADDR */ ++#define HAVE_DLADDR 1 + + /* Define to 1 if you have the header file. */ + #define HAVE_ERRNO_H 1 +@@ -92,7 +96,7 @@ + #define HAVE_ISATTY 1 + + /* Define to 1 if you have the `edit' library (-ledit). */ +-/* #undef HAVE_LIBEDIT */ ++#define HAVE_LIBEDIT 1 + + /* Define to 1 if you have the `pfm' library (-lpfm). */ + /* #undef HAVE_LIBPFM */ +@@ -111,21 +115,25 @@ + + /* Define to 1 if you have the `z' library (-lz). */ + /* #undef HAVE_LIBZ */ ++#define HAVE_LIBZ 1 + + /* Define to 1 if you have the header file. */ + #define HAVE_LINK_H 1 + + /* Define to 1 if you have the `lseek64' function. */ +-#define HAVE_LSEEK64 1 ++/* #define HAVE_LSEEK64 1 */ ++/* #undef HAVE_LSEEK64 */ + + /* Define to 1 if you have the header file. */ + /* #undef HAVE_MACH_MACH_H */ + + /* Define to 1 if you have the `mallctl' function. */ + /* #undef HAVE_MALLCTL */ ++#define HAVE_MALLCTL 1 + + /* Define to 1 if you have the `mallinfo' function. */ +-#define HAVE_MALLINFO 1 ++/* #define HAVE_MALLINFO 1 */ ++/* #undef HAVE_MALLINFO */ + + /* Define to 1 if you have the header file. */ + /* #undef HAVE_MALLOC_MALLOC_H */ +@@ -137,7 +145,7 @@ + #define HAVE_POSIX_FALLOCATE 1 + + /* Define to 1 if you have the `posix_spawn' function. */ +-/* #undef HAVE_POSIX_SPAWN */ ++#define HAVE_POSIX_SPAWN 1 + + /* Define to 1 if you have the `pread' function. */ + #define HAVE_PREAD 1 +@@ -155,16 +163,16 @@ + #define HAVE_PTHREAD_RWLOCK_INIT 1 + + /* Define to 1 if you have the `sbrk' function. */ +-#define HAVE_SBRK 1 ++/* #undef HAVE_SBRK */ + + /* Define to 1 if you have the `setenv' function. */ + #define HAVE_SETENV 1 + + /* Define to 1 if you have the `sched_getaffinity' function. */ +-#define HAVE_SCHED_GETAFFINITY 1 ++/* #undef HAVE_SCHED_GETAFFINITY */ + + /* Define to 1 if you have the `CPU_COUNT' macro. */ +-#define HAVE_CPU_COUNT 1 ++/* #undef HAVE_CPU_COUNT */ + + /* Define to 1 if you have the `setrlimit' function. */ + #define HAVE_SETRLIMIT 1 +@@ -212,13 +220,13 @@ + #define HAVE_SYS_TYPES_H 1 + + /* Define if the setupterm() function is supported this platform. */ +-/* #undef HAVE_TERMINFO */ ++#define HAVE_TERMINFO 1 + + /* Define if the xar_open() function is supported this platform. */ + /* #undef HAVE_LIBXAR */ + + /* Define to 1 if you have the header file. */ +-/* #undef HAVE_TERMIOS_H */ ++#define HAVE_TERMIOS_H 1 + + /* Define to 1 if you have the header file. */ + #define HAVE_UNISTD_H 1 +@@ -227,7 +235,7 @@ + /* #undef HAVE_VALGRIND_VALGRIND_H */ + + /* Define to 1 if you have the header file. */ +-/* #undef HAVE_ZLIB_H */ ++#define HAVE_ZLIB_H 1 + + /* Have host's _alloca */ + /* #undef HAVE__ALLOCA */ +@@ -301,7 +309,7 @@ + #elif defined(__arm__) + #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf" + #elif defined(__aarch64__) +-#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu" ++#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-portbld-freebsd" + #elif defined(__mips__) + #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" + #elif defined(__mips64) +@@ -313,7 +321,7 @@ + #endif + + /* Define if zlib compression is available */ +-#define LLVM_ENABLE_ZLIB 0 ++#define LLVM_ENABLE_ZLIB 1 + + /* Define if overriding target triple is enabled */ + /* #undef LLVM_TARGET_TRIPLE_ENV */ Index: head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_llvm-config.h =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_llvm-config.h +++ head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_llvm-config.h @@ -0,0 +1,20 @@ +--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/llvm-config.h.orig 2020-08-18 18:42:46 UTC ++++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/llvm-config.h +@@ -35,7 +35,7 @@ + #elif defined(__arm__) + #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf" + #elif defined(__aarch64__) +-#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu" ++#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-portbld-freebsd" + #elif defined(__mips__) + #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" + #elif defined(__mips64) +@@ -60,7 +60,7 @@ + #elif defined(__arm__) + #define LLVM_HOST_TRIPLE "armv7-linux-gnueabihf" + #elif defined(__aarch64__) +-#define LLVM_HOST_TRIPLE "aarch64-linux-gnu" ++#define LLVM_HOST_TRIPLE "aarch64-portbld-freebsd" + #elif defined(__mips__) + #define LLVM_HOST_TRIPLE "mipsel-linux-gnu" + #elif defined(__mips64) Index: head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h +++ head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h @@ -1,152 +0,0 @@ ---- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2020-03-16 18:42:15 UTC -+++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h -@@ -8,15 +8,15 @@ - #define BUG_REPORT_URL "https://bugs.llvm.org/" - - /* Define to 1 to enable backtraces, and to 0 otherwise. */ --#define ENABLE_BACKTRACES 0 -+#define ENABLE_BACKTRACES 1 - - /* Define to 1 to enable crash overrides, and to 0 otherwise. */ --#define ENABLE_CRASH_OVERRIDES 0 -+#define ENABLE_CRASH_OVERRIDES 1 - - /* Define to 1 if you have the `backtrace' function. */ --/* #undef HAVE_BACKTRACE */ -+#define HAVE_BACKTRACE 1 - --/* #undef BACKTRACE_HEADER */ -+#define BACKTRACE_HEADER - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_CRASHREPORTERCLIENT_H */ -@@ -26,7 +26,7 @@ - - /* Define to 1 if you have the declaration of `arc4random', and to 0 if you - don't. */ --#define HAVE_DECL_ARC4RANDOM 0 -+#define HAVE_DECL_ARC4RANDOM 1 - - /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you - don't. */ -@@ -50,7 +50,7 @@ - #define HAVE_DLOPEN 1 - - /* Define if dladdr() is available on this platform. */ --/* #undef HAVE_DLADDR */ -+#define HAVE_DLADDR 1 - - /* Define to 1 if you have the header file. */ - #define HAVE_ERRNO_H 1 -@@ -89,7 +89,7 @@ - #define HAVE_ISATTY 1 - - /* Define to 1 if you have the `edit' library (-ledit). */ --/* #undef HAVE_LIBEDIT */ -+#define HAVE_LIBEDIT 1 - - /* Define to 1 if you have the `pfm' library (-lpfm). */ - /* #undef HAVE_LIBPFM */ -@@ -107,25 +107,25 @@ - /* #undef HAVE_PTHREAD_SETNAME_NP */ - - /* Define to 1 if you have the `z' library (-lz). */ --/* #undef HAVE_LIBZ */ -+#define HAVE_LIBZ 1 - - /* Define to 1 if you have the header file. */ - #define HAVE_LINK_H 1 - - /* Define to 1 if you have the `lseek64' function. */ --#define HAVE_LSEEK64 1 -+/* #undef HAVE_LSEEK64 */ - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_MACH_MACH_H */ - - /* Define to 1 if you have the `mallctl' function. */ --/* #undef HAVE_MALLCTL */ -+#define HAVE_MALLCTL 1 - - /* Define to 1 if you have the `mallinfo' function. */ --#define HAVE_MALLINFO 1 -+/* #undef HAVE_MALLINFO */ - - /* Define to 1 if you have the header file. */ --#define HAVE_MALLOC_H 1 -+/* #undef HAVE_MALLOC_H */ - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_MALLOC_MALLOC_H */ -@@ -137,7 +137,7 @@ - #define HAVE_POSIX_FALLOCATE 1 - - /* Define to 1 if you have the `posix_spawn' function. */ --/* #undef HAVE_POSIX_SPAWN */ -+#define HAVE_POSIX_SPAWN 1 - - /* Define to 1 if you have the `pread' function. */ - #define HAVE_PREAD 1 -@@ -158,16 +158,16 @@ - #define HAVE_REALPATH 1 - - /* Define to 1 if you have the `sbrk' function. */ --#define HAVE_SBRK 1 -+/* #undef HAVE_SBRK */ - - /* Define to 1 if you have the `setenv' function. */ - #define HAVE_SETENV 1 - - /* Define to 1 if you have the `sched_getaffinity' function. */ --#define HAVE_SCHED_GETAFFINITY 1 -+/* #undef HAVE_SCHED_GETAFFINITY */ - - /* Define to 1 if you have the `CPU_COUNT' macro. */ --#define HAVE_CPU_COUNT 1 -+/* #undef HAVE_CPU_COUNT */ - - /* Define to 1 if you have the `setrlimit' function. */ - #define HAVE_SETRLIMIT 1 -@@ -209,13 +209,13 @@ - #define HAVE_SYS_TYPES_H 1 - - /* Define if the setupterm() function is supported this platform. */ --/* #undef HAVE_TERMINFO */ -+#define HAVE_TERMINFO 1 - - /* Define if the xar_open() function is supported this platform. */ - /* #undef HAVE_LIBXAR */ - - /* Define to 1 if you have the header file. */ --/* #undef HAVE_TERMIOS_H */ -+#define HAVE_TERMIOS_H 1 - - /* Define to 1 if you have the header file. */ - #define HAVE_UNISTD_H 1 -@@ -224,7 +224,7 @@ - /* #undef HAVE_VALGRIND_VALGRIND_H */ - - /* Define to 1 if you have the header file. */ --/* #undef HAVE_ZLIB_H */ -+#define HAVE_ZLIB_H 1 - - /* Have host's _alloca */ - /* #undef HAVE__ALLOCA */ -@@ -298,7 +298,7 @@ - #elif defined(__arm__) - #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf" - #elif defined(__aarch64__) --#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu" -+#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-portbld-freebsd" - #elif defined(__mips__) - #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" - #elif defined(__mips64) -@@ -310,7 +310,7 @@ - #endif - - /* Define if zlib compression is available */ --#define LLVM_ENABLE_ZLIB 0 -+#define LLVM_ENABLE_ZLIB 1 - - /* Define if overriding target triple is enabled */ - /* #undef LLVM_TARGET_TRIPLE_ENV */ Index: head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h +++ head/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h @@ -1,20 +0,0 @@ ---- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h.orig 2019-09-09 21:57:03 UTC -+++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h -@@ -38,7 +38,7 @@ - #elif defined(__arm__) - #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf" - #elif defined(__aarch64__) --#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu" -+#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-portbld-freebsd" - #elif defined(__mips__) - #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" - #elif defined(__mips64) -@@ -63,7 +63,7 @@ - #elif defined(__arm__) - #define LLVM_HOST_TRIPLE "armv7-linux-gnueabihf" - #elif defined(__aarch64__) --#define LLVM_HOST_TRIPLE "aarch64-linux-gnu" -+#define LLVM_HOST_TRIPLE "aarch64-portbld-freebsd" - #elif defined(__mips__) - #define LLVM_HOST_TRIPLE "mipsel-linux-gnu" - #elif defined(__mips64) Index: head/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp +++ head/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp @@ -1,11 +0,0 @@ ---- third_party/swiftshader/third_party/marl/src/memory.cpp.orig 2019-12-22 15:09:53 UTC -+++ third_party/swiftshader/third_party/marl/src/memory.cpp -@@ -19,7 +19,7 @@ - - #include - --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) - #include - #include - namespace { Index: head/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp +++ head/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp @@ -1,23 +0,0 @@ ---- third_party/swiftshader/third_party/marl/src/thread.cpp.orig 2020-05-13 18:42:01 UTC -+++ third_party/swiftshader/third_party/marl/src/thread.cpp -@@ -31,6 +31,11 @@ - #include - #include - #include -+#elif defined(__FreeBSD__) -+#include -+#include -+#include -+#include - #else - #include - #include -@@ -211,6 +216,8 @@ void Thread::setName(const char* fmt, ...) { - - #if defined(__APPLE__) - pthread_setname_np(name); -+#elif defined(__FreeBSD__) -+ pthread_set_name_np(pthread_self(), name); - #elif !defined(__Fuchsia__) - pthread_setname_np(pthread_self(), name); - #endif