Skip to content

Commit

Permalink
Changing default tag.
Browse files Browse the repository at this point in the history
CI says Mac builds passed then.
Reduced the patch file.
  • Loading branch information
John-LittleBearLabs committed Apr 18, 2023
1 parent c03b710 commit ce86b68
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 34 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set(CHROMIUM_SOURCE_TREE "${CMAKE_CURRENT_BINARY_DIR}/chromium/src" CACHE PATH
"Path to chromium/src. If DOWNLOAD_CHROMIUM=TRUE, and it does not exist, it will be created."
)
set(CHROMIUM_PROFILE "${CMAKE_BUILD_TYPE}" CACHE STRING "The profile of the current Chromium build.")
set(CHROMIUM_TAG "114.0.5696.1" CACHE STRING "The git ref of the Chromium tree you want your patch file to be relative to.")
set(CHROMIUM_TAG "113.0.5656.0" CACHE STRING "The git ref of the Chromium tree you want your patch file to be relative to.")
set(CXX_VERSION "17" CACHE STRING "The numeric part (year % 100) of the version of the C++ standard to be used. Must be at least 17 (for C++17). Must be one CMake knows about.")
if(DOWNLOAD_CHROMIUM)
set(default_dt "${CMAKE_CURRENT_BINARY_DIR}/depot_tools")
Expand Down
1 change: 1 addition & 0 deletions component/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ if(DEPOT_TOOLS_NINJA_PY)
TARGET chrome_browser
POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E create_symlink "${CHROMIUM_SOURCE_TREE}/out/${CHROMIUM_PROFILE}/chrome" "${CMAKE_BINARY_DIR}/chrome_browser"
COMMENT "Symlinking... your browser can be found here: ${CMAKE_BINARY_DIR}/chrome_browser or ${CHROMIUM_SOURCE_TREE}/out/${CHROMIUM_PROFILE}/chrome"
)
add_custom_target(package
DEPENDS chrome_browser
Expand Down
10 changes: 5 additions & 5 deletions component/crypto_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int ToEvpKeyType(ipfs::ipns::KeyType t) {
}
} // namespace

namespace crypt = ipfs::crypto_api;
namespace cpto = ipfs::crypto_api;
/*
auto crypt::GetAlgo(ipfs::ipns::KeyType t) -> Algo {
switch (t) {
Expand All @@ -40,10 +40,10 @@ auto crypt::GetAlgo(ipfs::ipns::KeyType t) -> Algo {
}
}
*/
bool crypt::VerifySignature(ipfs::ipns::KeyType key_type,
ipfs::ByteView signature,
ipfs::ByteView data,
ipfs::ByteView key_bytes) {
bool cpto::VerifySignature(ipfs::ipns::KeyType key_type,
ipfs::ByteView signature,
ipfs::ByteView data,
ipfs::ByteView key_bytes) {
auto* key_p = reinterpret_cast<unsigned char const*>(key_bytes.data());
auto* data_p = reinterpret_cast<unsigned char const*>(data.data());
auto* sig_p = reinterpret_cast<unsigned char const*>(signature.data());
Expand Down
2 changes: 1 addition & 1 deletion component/gateway_requests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ auto ipfs::GatewayRequests::InitiateGatewayRequest(BusyGateway assigned)
// out->listener = listener;
auto cb = base::BindOnce(&ipfs::GatewayRequests::OnResponse,
base::Unretained(this), shared_from_this(), out);
LOG(INFO) << "InitiateGatewayRequest(" << url << ")";
// LOG(INFO) << "InitiateGatewayRequest(" << url << ")";
DCHECK(loader_factory_);
// TODO - proper requesting with full features (SetPriority, etc.).
out->loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie(loader_factory_,
Expand Down
34 changes: 12 additions & 22 deletions component/rest_of_chromium.patch
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ index ed99410ea8a31..d89d48ba981ab 100644
const CheckedThreadLocalOwnedPointer<T>&) = delete;

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 47689ecf0ca32..b64e6f28542ba 100644
index f5019bd840afc..12b08b48e4d2c 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2107,6 +2107,7 @@ static_library("browser") {
@@ -2159,6 +2159,7 @@ static_library("browser") {
"//components/infobars/content",
"//components/infobars/core",
"//components/invalidation/impl",
Expand All @@ -37,7 +37,7 @@ index 47689ecf0ca32..b64e6f28542ba 100644
"//components/keyed_service/content",
"//components/language/content/browser",
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index bdd121f180802..91e6a1aa1fddb 100644
index 3800b8fd8d098..91c60b9d097c2 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -215,6 +215,8 @@
Expand All @@ -49,7 +49,7 @@ index bdd121f180802..91e6a1aa1fddb 100644
#include "components/keep_alive_registry/keep_alive_types.h"
#include "components/keep_alive_registry/scoped_keep_alive.h"
#include "components/language/core/browser/pref_names.h"
@@ -5873,13 +5875,17 @@ void ChromeContentBrowserClient::
@@ -5764,13 +5766,17 @@ void ChromeContentBrowserClient::
int render_frame_id,
const absl::optional<url::Origin>& request_initiator_origin,
NonNetworkURLLoaderFactoryMap* factories) {
Expand All @@ -71,7 +71,7 @@ index bdd121f180802..91e6a1aa1fddb 100644

#if BUILDFLAG(IS_CHROMEOS_ASH)
if (web_contents) {
@@ -6016,8 +6022,8 @@ std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
@@ -5915,8 +5921,8 @@ std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
ChromeContentBrowserClient::WillCreateURLLoaderRequestInterceptors(
content::NavigationUIData* navigation_ui_data,
int frame_tree_node_id) {
Expand All @@ -83,26 +83,26 @@ index bdd121f180802..91e6a1aa1fddb 100644
interceptors.push_back(
std::make_unique<offline_pages::OfflinePageURLLoaderRequestInterceptor>(
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ea6e974a5889a..dc51892350f33 100644
index 3826c517befda..dd9316492eeff 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -110,6 +110,7 @@
@@ -108,6 +108,7 @@
#include "components/invalidation/impl/fcm_invalidation_service.h"
#include "components/invalidation/impl/invalidator_registrar_with_memory.h"
#include "components/invalidation/impl/per_user_topic_subscription_manager.h"
+#include "components/ipfs/profile_prefs.h"
#include "components/language/content/browser/geo_language_provider.h"
#include "components/language/content/browser/ulp_language_code_locator/ulp_language_code_locator.h"
#include "components/language/core/browser/language_prefs.h"
@@ -1120,6 +1121,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1143,6 +1144,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
invalidation::FCMInvalidationService::RegisterPrefs(registry);
invalidation::InvalidatorRegistrarWithMemory::RegisterPrefs(registry);
invalidation::PerUserTopicSubscriptionManager::RegisterPrefs(registry);
+ ipfs::RegisterProfilePrefs(registry);
language::GeoLanguageProvider::RegisterLocalStatePrefs(registry);
language::UlpLanguageCodeLocator::RegisterLocalStatePrefs(registry);
memory::EnterpriseMemoryLimitPrefObserver::RegisterPrefs(registry);
@@ -1344,6 +1346,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1367,6 +1369,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
// Register prefs applicable to all profiles.
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
const std::string& locale) {
Expand All @@ -128,20 +128,10 @@ index db08f6151229e..e63c004ec6398 100644

std::u16string ChromeContentClient::GetLocalizedString(int message_id) {
diff --git a/net/dns/dns_config_service_linux.cc b/net/dns/dns_config_service_linux.cc
index 5273da5190277..d95544c64d213 100644
index 5273da5190277..51a53c7f39eba 100644
--- a/net/dns/dns_config_service_linux.cc
+++ b/net/dns/dns_config_service_linux.cc
@@ -93,6 +93,9 @@ absl::optional<DnsConfig> ConvertResStateToDnsConfig(
// cannot be overwritten by /etc/resolv.conf
const unsigned kRequiredOptions = RES_RECURSE | RES_DEFNAMES | RES_DNSRCH;
if ((res.options & kRequiredOptions) != kRequiredOptions) {
+ if (!dns_config.unhandled_options) {
+ LOG(ERROR) << "unhandled_options set to true bec " << res.options;
+ }
dns_config.unhandled_options = true;
return dns_config;
}
@@ -206,9 +209,12 @@ void RecordIncompatibleNsswitchReason(
@@ -206,9 +206,12 @@ void RecordIncompatibleNsswitchReason(
IncompatibleNsswitchReason reason,
absl::optional<NsswitchReader::Service> service_token) {
if (service_token) {
Expand All @@ -154,7 +144,7 @@ index 5273da5190277..d95544c64d213 100644
}
}

@@ -272,11 +278,11 @@ bool IsNsswitchConfigCompatible(
@@ -272,11 +275,11 @@ bool IsNsswitchConfigCompatible(
// Ignore any entries after `kDns` because Chrome will fallback to the
// system resolver if a result was not found in DNS.
return true;
Expand Down
1 change: 1 addition & 0 deletions library/include/ipfs_client/scheduler.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class Scheduler {
long under_target() const;
};
std::map<std::string, Todo> task2todo_;
bool loaded_ = false;

void Issue(std::shared_ptr<NetworkingApi>,
std::shared_ptr<DagListener>&,
Expand Down
14 changes: 9 additions & 5 deletions library/src/ipfs_client/scheduler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ void ipfs::Scheduler::IssueRequests(std::shared_ptr<NetworkingApi> api) {
auto req =
api->InitiateGatewayRequest(BusyGateway{gw.url_prefix(), task, this});
todo.requests.insert(req);
LOG(INFO) << "Initiated request " << req->url() << " (" << need << ')';
// LOG(INFO) << "Initiated request " << req->url() << " (" << need <<
// ')';
return true;
}
return false;
Expand All @@ -72,11 +73,14 @@ void ipfs::Scheduler::IssueRequests(std::shared_ptr<NetworkingApi> api) {
}
}
if (unmet) {
LOG(WARNING) << "Max load.";
// auto more_list = list_gen_();
// gateways_.insert(gateways_.end(), more_list.begin(), more_list.end());
if (!loaded_) {
LOG(INFO) << "Saturated.";
loaded_ = true;
}
} else {
loaded_ = false;
}
UpdateDevPage();
// UpdateDevPage();
}

bool ipfs::Scheduler::DetectCompleteFailure(std::string task) const {
Expand Down

0 comments on commit ce86b68

Please sign in to comment.