1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
diff -ru a/brave/BUILD.gn b/brave/BUILD.gn
--- a/brave/BUILD.gn 2020-09-25 22:55:12.193333434 +0200
+++ b/brave/BUILD.gn 2020-10-01 12:15:47.486663146 +0200
@@ -4,6 +4,7 @@
import("//ui/base/ui_features.gni")
import("//third_party/icu/config.gni")
import("//build/config/locales.gni")
+import("//build/config/sysroot.gni")
import("//build/util/process_version.gni")
import("//extensions/buildflags/buildflags.gni")
import("//media/cdm/library_cdm/cdm_paths.gni")
@@ -238,8 +239,11 @@
}
}
if (is_linux) {
+ if (use_sysroot) {
+ deps += [ "//chrome/installer/linux:$linux_channel" ]
+ }
+
deps += [
- "//chrome/installer/linux:$linux_channel",
"//brave/app/linux:dist_resources",
":theme_files",
]
@@ -336,9 +340,12 @@
":packed_resources",
"build/$target_os:brave",
"//chrome:packed_resources",
- "//third_party/icu:icudata",
]
+ if (icu_use_data_file) {
+ deps += [ "//third_party/icu:icudata" ]
+ }
+
if (!is_mac) {
sources += [
"$root_out_dir/brave_resources.pak",
@@ -347,10 +354,13 @@
"$root_out_dir/$brave_exe",
"$root_out_dir/chrome_100_percent.pak",
"$root_out_dir/chrome_200_percent.pak",
- "$root_out_dir/icudtl.dat",
"$root_out_dir/resources.pak",
]
+ if (icu_use_data_file) {
+ sources += [ "$root_out_dir/icudtl.dat" ]
+ }
+
if (v8_use_external_startup_data) {
deps += [ "//v8" ]
diff -ru a/brave/components/brave_rewards/browser/logging.h b/brave/components/brave_rewards/browser/logging.h
--- a/brave/components/brave_rewards/browser/logging.h 2020-09-25 22:55:11.176666768 +0200
+++ b/brave/components/brave_rewards/browser/logging.h 2020-10-01 12:16:30.493329812 +0200
@@ -11,7 +11,7 @@
namespace brave_rewards {
#define BLOG(verbose_level, stream) Log(__FILE__, __LINE__, \
- verbose_level, (std::ostringstream() << stream).str());
+ verbose_level, static_cast<std::ostringstream &>(std::ostringstream() << stream).str());
#define BLOG_IF(verbose_level, condition, stream) \
!(condition) ? (void) 0 : BLOG(verbose_level, stream)
diff -ru a/brave/vendor/adblock_rust_ffi/src/wrapper.cpp b/brave/vendor/adblock_rust_ffi/src/wrapper.cpp
--- a/brave/vendor/adblock_rust_ffi/src/wrapper.cpp 2020-09-26 00:29:10.890000602 +0200
+++ b/brave/vendor/adblock_rust_ffi/src/wrapper.cpp 2020-10-01 12:15:47.649996482 +0200
@@ -1,4 +1,5 @@
#include "wrapper.hpp"
+#include <cstring>
#include <iostream>
using namespace std;
diff -ru a/brave/vendor/bat-native-ads/src/bat/ads/internal/logging.h b/brave/vendor/bat-native-ads/src/bat/ads/internal/logging.h
--- a/brave/vendor/bat-native-ads/src/bat/ads/internal/logging.h 2020-09-25 22:55:11.660000101 +0200
+++ b/brave/vendor/bat-native-ads/src/bat/ads/internal/logging.h 2020-10-01 12:15:47.669996481 +0200
@@ -52,7 +52,7 @@
// 8 Database queries
#define BLOG(verbose_level, stream) ads::Log(__FILE__, __LINE__, \
- verbose_level, (std::ostringstream() << stream).str());
+ verbose_level, static_cast<std::ostringstream &>(std::ostringstream() << stream).str());
// You can also do conditional verbose logging when some extra computation and
// preparation for logs is not needed:
diff -ru a/brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc b/brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc
--- a/brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc 2020-09-25 22:55:12.273333434 +0200
+++ b/brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc 2020-10-01 12:15:47.663329814 +0200
@@ -7,6 +7,7 @@
#include <algorithm>
#include <cmath>
+#include <ctime>
#include <memory>
#include <utility>
#include <vector>
diff -ru a/brave/vendor/bat-native-ledger/src/bat/ledger/internal/logging/logging.h b/brave/vendor/bat-native-ledger/src/bat/ledger/internal/logging/logging.h
--- a/brave/vendor/bat-native-ledger/src/bat/ledger/internal/logging/logging.h 2020-09-25 22:55:11.680000101 +0200
+++ b/brave/vendor/bat-native-ledger/src/bat/ledger/internal/logging/logging.h 2020-10-01 12:38:06.619996468 +0200
@@ -53,7 +53,7 @@
// 9 Detailed debugging (response headers, etc)
#define BLOG(verbose_level, stream) ledger::Log(__FILE__, __LINE__, \
- verbose_level, (std::ostringstream() << stream).str());
+ verbose_level, static_cast<std::ostringstream &>(std::ostringstream() << stream).str());
// You can also do conditional verbose logging when some extra computation and
// preparation for logs is not needed:
diff -ru a/brave/vendor/bat-native-usermodel/src/transformation.cc b/brave/vendor/bat-native-usermodel/src/transformation.cc
--- a/brave/vendor/bat-native-usermodel/src/transformation.cc 2020-09-26 00:30:07.446667262 +0200
+++ b/brave/vendor/bat-native-usermodel/src/transformation.cc 2020-10-01 12:15:47.669996481 +0200
@@ -4,6 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "transformation.h"
+#include <algorithm>
#include <codecvt>
#include <math.h>
namespace usermodel {
--- a/brave/vendor/bat-native-ads/src/bat/ads/internal/classification/classification_util.cc 2020-10-01 16:12:59.776666163 +0200
+++ b/brave/vendor/bat-native-ads/src/bat/ads/internal/classification/classification_util.cc 2020-10-01 17:26:05.076665847 +0200
@@ -5,6 +5,7 @@
#include "bat/ads/internal/classification/classification_util.h"
+#include <algorithm>
#include "base/strings/string_split.h"
namespace ads {
diff --git a/brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_filter.cc b/brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_filter.cc
index 67bd13c94d..5e8e8736f5 100644
--- a/brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_filter.cc
+++ b/brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_filter.cc
@@ -4,6 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "bat/ads/internal/filters/ads_history_conversion_filter.h"
+#include <algorithm>
namespace ads {
diff --git a/brave/components/ipfs/ipfs_utils.cc b/brave/components/ipfs/ipfs_utils.cc
index de984233dc..9414da92a3 100644
--- a/brave/components/ipfs/ipfs_utils.cc
+++ b/brave/components/ipfs/ipfs_utils.cc
@@ -6,6 +6,7 @@
#include "brave/components/ipfs/ipfs_utils.h"
#include <vector>
+#include <algorithm>
#include "url/gurl.h"
#include "extensions/common/url_pattern.h"
diff --git a/brave/components/ipfs/translate_ipfs_uri.cc b/brave/components/ipfs/translate_ipfs_uri.cc
index d3bf012a5f..794ba63eb7 100644
--- a/brave/components/ipfs/translate_ipfs_uri.cc
+++ b/brave/components/ipfs/translate_ipfs_uri.cc
@@ -6,6 +6,7 @@
#include "brave/components/ipfs/translate_ipfs_uri.h"
#include <string>
+#include <algorithm>
#include "base/logging.h"
#include "brave/components/ipfs/common/ipfs_constants.h"
diff --git a/brave/browser/brave_stats/brave_stats_updater.cc b/brave/browser/brave_stats/brave_stats_updater.cc
index e4e9a0668f..20493aa078 100644
--- a/brave/browser/brave_stats/brave_stats_updater.cc
+++ b/brave/browser/brave_stats/brave_stats_updater.cc
@@ -171,9 +171,6 @@ void BraveStatsUpdater::SetStatsThresholdCallback(
GURL BraveStatsUpdater::BuildStatsEndpoint(const std::string& path) {
auto stats_updater_url = GURL(usage_server_ + path);
-#if defined(OFFICIAL_BUILD)
- CHECK(stats_updater_url.is_valid());
-#endif
return stats_updater_url;
}
|