diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
| commit | 9187a6460fc419eec4dc64a4569e306722a83427 (patch) | |
| tree | b3d680efe613bd39a30a50f60bcb0ce36a78eab2 /www/chromium/files/patch-chrome_common_pref__names.h | |
| parent | Some aarch64 servers apparently have ACPI. Attempt to build on aarch64 (diff) | |
www/chromium: update to 54.0.2840.100
Submitted by: clutton <clutton@zoho.com>
Reviewed by: cpm, rene
Obtained from: https://github.com/paranormal/
MFH: 2016Q4
Security: https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html
Differential Revision: https://reviews.freebsd.org/D8517
Diffstat (limited to 'www/chromium/files/patch-chrome_common_pref__names.h')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_pref__names.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 4dc5837e22ec..fd4cd55c63f0 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,15 +1,24 @@ ---- chrome/common/pref_names.h.orig 2016-05-25 15:00:58.000000000 -0400 -+++ chrome/common/pref_names.h 2016-05-27 10:03:13.560677000 -0400 -@@ -307,7 +307,7 @@ - extern const char kDeleteTimePeriod[]; +--- chrome/common/pref_names.h.orig 2016-10-06 04:02:14.000000000 +0300 ++++ chrome/common/pref_names.h 2016-10-14 07:01:22.105649000 +0300 +@@ -315,7 +315,7 @@ + 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_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -477,7 +477,7 @@ +@@ -347,7 +347,7 @@ + #if defined(OS_MACOSX) + extern const char kShowUpdatePromotionInfoBar[]; + #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + extern const char kUseCustomChromeFrame[]; + #endif + extern const char kBackShortcutBubbleShownCount[]; +@@ -496,7 +496,7 @@ extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; |