From 0990303e4a0b31aded6f17c0131832a70518c19c Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 15 Sep 2023 10:46:02 +0200 Subject: [PATCH] - added missing typename to fix compiler error - fix compiler error, invalid operands to binary expression --- chromium-117-string-convert.patch | 21 ++++++++++ ...ename.patch => chromium-117-typename.patch | 39 +++++++++++++++++++ chromium.spec | 6 ++- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 chromium-117-string-convert.patch rename chromium-116-typename.patch => chromium-117-typename.patch (68%) diff --git a/chromium-117-string-convert.patch b/chromium-117-string-convert.patch new file mode 100644 index 00000000..cb48e4b2 --- /dev/null +++ b/chromium-117-string-convert.patch @@ -0,0 +1,21 @@ +diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.cc.me chromium-117.0.5938.62/net/dns/host_resolver_cache.cc +diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me chromium-117.0.5938.62/net/dns/host_resolver_cache.h +--- chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me 2023-09-14 15:21:24.632965004 +0200 ++++ chromium-117.0.5938.62/net/dns/host_resolver_cache.h 2023-09-15 09:15:48.511300845 +0200 +@@ -143,12 +143,14 @@ class NET_EXPORT HostResolverCache final + } + + bool operator()(const Key& lhs, const KeyRef& rhs) const { ++ const std::string rhs_domain_name{rhs.domain_name}; + return std::tie(lhs.domain_name, lhs.network_anonymization_key) < +- std::tie(rhs.domain_name, *rhs.network_anonymization_key); ++ std::tie(rhs_domain_name, *rhs.network_anonymization_key); + } + + bool operator()(const KeyRef& lhs, const Key& rhs) const { +- return std::tie(lhs.domain_name, *lhs.network_anonymization_key) < ++ const std::string lhs_domain_name{lhs.domain_name}; ++ return std::tie(lhs_domain_name, *lhs.network_anonymization_key) < + std::tie(rhs.domain_name, rhs.network_anonymization_key); + } + }; diff --git a/chromium-116-typename.patch b/chromium-117-typename.patch similarity index 68% rename from chromium-116-typename.patch rename to chromium-117-typename.patch index c58126c6..af7da9f9 100644 --- a/chromium-116-typename.patch +++ b/chromium-117-typename.patch @@ -77,3 +77,42 @@ diff -up chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_pai NodeType::AnimationState()) { // First, check if we need to add a new node. if (!nodes.HasField(node_id)) { +diff -up chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h.me chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h +--- chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h.me 2023-09-15 10:22:51.889698402 +0200 ++++ chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h 2023-09-15 10:28:26.702716224 +0200 +@@ -234,7 +234,7 @@ class TFLiteModelExecutor : public Model + // Starts the synchronous execution of the model. Returns model outputs. + // Model needs to be loaded. Synchronous calls do not load or unload model. + std::vector> SendForBatchExecutionSync( +- ModelExecutor::ConstRefInputVector inputs) ++ typename ModelExecutor::ConstRefInputVector inputs) + override { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +@@ -389,7 +389,7 @@ class TFLiteModelExecutor : public Model + // executes it on the model execution thread. + void LoadModelFileAndBatchExecute( + BatchExecutionCallback callback_on_complete, +- ModelExecutor::ConstRefInputVector inputs) { ++ typename ModelExecutor::ConstRefInputVector inputs) { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + +@@ -406,7 +406,7 @@ class TFLiteModelExecutor : public Model + + // Batch executes the loaded model for inputs. + void BatchExecuteLoadedModel( +- ModelExecutor::ConstRefInputVector inputs, ++ typename ModelExecutor::ConstRefInputVector inputs, + std::vector>* outputs) { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +@@ -466,7 +466,7 @@ class TFLiteModelExecutor : public Model + // Unloads the model if needed. + void BatchExecuteLoadedModelAndRunCallback( + BatchExecutionCallback callback_on_complete, +- ModelExecutor::ConstRefInputVector inputs, ++ typename ModelExecutor::ConstRefInputVector inputs, + ExecutionStatus execution_status) { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff --git a/chromium.spec b/chromium.spec index 21eba31e..0ae9f25d 100644 --- a/chromium.spec +++ b/chromium.spec @@ -345,7 +345,7 @@ Patch301: chromium-115-compiler-SkColor4f.patch Patch302: chromium-117-workaround_clang_bug-structured_binding.patch # missing typename -Patch303: chromium-116-typename.patch +Patch303: chromium-117-typename.patch # missing include header files Patch304: chromium-117-missing-header-files.patch @@ -358,6 +358,9 @@ Patch306: chromium-117-emplace_back_on_vector-c++20.patch # error: fatal error: 'sys/ifunc.h' file not found Patch307: chromium-116-arm64-memory_tagging.patch +# compiler error, invalid operands to binary expression +Patch308: chromium-117-string-convert.patch + # clang warnings Patch311: chromium-115-clang-warnings.patch @@ -961,6 +964,7 @@ udev. %endif %endif +%patch -P308 -p1 -b .string-convert %patch -P311 -p1 -b .clang-warnings %patch -P312 -p1 -b .python-3.12-deprecated