From c74bf4e46e6c8ad9a82c81cc939819b98635dae5 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 19 Jan 2023 19:47:13 +0100 Subject: [PATCH] more fixes for gcc13 cleaned up --- chromium-109-gcc13.patch | 203 ++++++++++++++++-- ...606.71-remoting-missing-cmath-header.patch | 11 - chromium-94.0.4606.81-clang-format.patch | 37 ---- ...m-99.0.4844.84-markdownsafe-soft_str.patch | 138 ------------ chromium.spec | 31 +-- 5 files changed, 200 insertions(+), 220 deletions(-) delete mode 100644 chromium-94.0.4606.71-remoting-missing-cmath-header.patch delete mode 100644 chromium-94.0.4606.81-clang-format.patch delete mode 100644 chromium-99.0.4844.84-markdownsafe-soft_str.patch diff --git a/chromium-109-gcc13.patch b/chromium-109-gcc13.patch index 0cb23209..b29a282a 100644 --- a/chromium-109-gcc13.patch +++ b/chromium-109-gcc13.patch @@ -20,18 +20,6 @@ diff -up chromium-109.0.5414.74/base/debug/profiler.h.me chromium-109.0.5414.74/ #include #include "base/base_export.h" -diff -up chromium-109.0.5414.74/build/build_config.h.me chromium-109.0.5414.74/build/build_config.h ---- chromium-109.0.5414.74/build/build_config.h.me 2023-01-17 16:38:09.335227281 +0100 -+++ chromium-109.0.5414.74/build/build_config.h 2023-01-17 16:57:37.281446372 +0100 -@@ -49,6 +49,8 @@ - #ifndef BUILD_BUILD_CONFIG_H_ - #define BUILD_BUILD_CONFIG_H_ - -+#include -+ - #include "build/buildflag.h" // IWYU pragma: export - - // A set of macros to use for platform detection. diff -up chromium-109.0.5414.74/components/viz/common/view_transition_element_resource_id.h.me chromium-109.0.5414.74/components/viz/common/view_transition_element_resource_id.h --- chromium-109.0.5414.74/components/viz/common/view_transition_element_resource_id.h.me 2023-01-17 19:03:10.920014806 +0100 +++ chromium-109.0.5414.74/components/viz/common/view_transition_element_resource_id.h 2023-01-17 19:03:48.736395274 +0100 @@ -66,7 +54,6 @@ diff -up chromium-109.0.5414.74/net/base/net_export.h.me chromium-109.0.5414.74/ // Defines NET_EXPORT so that functionality implemented by the net module can // be exported to consumers, and NET_EXPORT_PRIVATE that allows unit tests to // access features not intended to be used directly by real consumers. -diff -up chromium-109.0.5414.74/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.cc.me chromium-109.0.5414.74/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.cc diff -up chromium-109.0.5414.74/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h.me chromium-109.0.5414.74/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h --- chromium-109.0.5414.74/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h.me 2023-01-17 17:46:30.830283261 +0100 +++ chromium-109.0.5414.74/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h 2023-01-17 17:46:40.158407274 +0100 @@ -78,7 +65,6 @@ diff -up chromium-109.0.5414.74/net/third_party/quiche/src/quiche/quic/core/quic #include #include -diff -up chromium-109.0.5414.74/net/third_party/quiche/src/quiche/quic/core/quic_versions.h.me chromium-109.0.5414.74/net/third_party/quiche/src/quiche/quic/core/quic_versions.h diff -up chromium-109.0.5414.74/sandbox/linux/syscall_broker/broker_file_permission.h.me chromium-109.0.5414.74/sandbox/linux/syscall_broker/broker_file_permission.h --- chromium-109.0.5414.74/sandbox/linux/syscall_broker/broker_file_permission.h.me 2023-01-17 17:12:34.184686515 +0100 +++ chromium-109.0.5414.74/sandbox/linux/syscall_broker/broker_file_permission.h 2023-01-17 17:13:16.537162420 +0100 @@ -200,3 +186,192 @@ diff -up chromium-109.0.5414.74/third_party/perfetto/include/perfetto/ext/base/u #include #include +diff -up chromium-109.0.5414.74/third_party/ruy/src/ruy/profiler/instrumentation.h.me chromium-109.0.5414.74/third_party/ruy/src/ruy/profiler/instrumentation.h +--- chromium-109.0.5414.74/third_party/ruy/src/ruy/profiler/instrumentation.h.me 2023-01-19 10:10:21.287876736 +0100 ++++ chromium-109.0.5414.74/third_party/ruy/src/ruy/profiler/instrumentation.h 2023-01-19 10:11:21.714778896 +0100 +@@ -17,6 +17,7 @@ limitations under the License. + #define RUY_RUY_PROFILER_INSTRUMENTATION_H_ + + #ifdef RUY_PROFILER ++#include + #include + #include + #include +diff -up chromium-109.0.5414.74/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h.me chromium-109.0.5414.74/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h +--- chromium-109.0.5414.74/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h.me 2023-01-19 10:30:27.533861985 +0100 ++++ chromium-109.0.5414.74/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h 2023-01-19 10:31:12.585554183 +0100 +@@ -31,6 +31,7 @@ limitations under the License. + #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_ + #define TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_ + ++#include + #include + #include + #include +diff -up chromium-109.0.5414.74/base/containers/flat_map.h.mee chromium-109.0.5414.74/base/containers/flat_map.h +--- chromium-109.0.5414.74/base/containers/flat_map.h.mee 2023-01-19 10:59:52.214957773 +0100 ++++ chromium-109.0.5414.74/base/containers/flat_map.h 2023-01-19 11:00:06.415215309 +0100 +@@ -5,6 +5,7 @@ + #ifndef BASE_CONTAINERS_FLAT_MAP_H_ + #define BASE_CONTAINERS_FLAT_MAP_H_ + ++#include + #include + #include + #include +diff -up chromium-109.0.5414.74/components/crash/core/app/crash_reporter_client.h.mee chromium-109.0.5414.74/components/crash/core/app/crash_reporter_client.h +--- chromium-109.0.5414.74/components/crash/core/app/crash_reporter_client.h.mee 2023-01-19 10:36:40.571422826 +0100 ++++ chromium-109.0.5414.74/components/crash/core/app/crash_reporter_client.h 2023-01-19 10:36:49.343565294 +0100 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_ + #define COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_ + ++#include + #include + + #include "build/build_config.h" +diff -up chromium-109.0.5414.74/device/bluetooth/public/cpp/bluetooth_uuid.h.mee chromium-109.0.5414.74/device/bluetooth/public/cpp/bluetooth_uuid.h +--- chromium-109.0.5414.74/device/bluetooth/public/cpp/bluetooth_uuid.h.mee 2023-01-19 10:46:54.826513707 +0100 ++++ chromium-109.0.5414.74/device/bluetooth/public/cpp/bluetooth_uuid.h 2023-01-19 10:47:11.255711472 +0100 +@@ -5,6 +5,7 @@ + #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ + #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ + ++#include + #include + #include + #include +diff -up chromium-109.0.5414.74/ui/base/prediction/kalman_filter.h.mee chromium-109.0.5414.74/ui/base/prediction/kalman_filter.h +--- chromium-109.0.5414.74/ui/base/prediction/kalman_filter.h.mee 2023-01-19 11:45:15.953159755 +0100 ++++ chromium-109.0.5414.74/ui/base/prediction/kalman_filter.h 2023-01-19 11:45:22.320246241 +0100 +@@ -5,6 +5,8 @@ + #ifndef UI_BASE_PREDICTION_KALMAN_FILTER_H_ + #define UI_BASE_PREDICTION_KALMAN_FILTER_H_ + ++#include ++ + #include "base/component_export.h" + #include "ui/gfx/geometry/matrix3_f.h" + +diff -up chromium-109.0.5414.74/components/password_manager/core/browser/generation/password_generator.h.me chromium-109.0.5414.74/components/password_manager/core/browser/generation/password_generator.h +--- chromium-109.0.5414.74/components/password_manager/core/browser/generation/password_generator.h.me 2023-01-19 15:20:07.620987949 +0100 ++++ chromium-109.0.5414.74/components/password_manager/core/browser/generation/password_generator.h 2023-01-19 15:20:18.324173702 +0100 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_ + #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_ + ++#include + #include + + +diff -up chromium-109.0.5414.74/components/feature_engagement/internal/event_storage_validator.h.me chromium-109.0.5414.74/components/feature_engagement/internal/event_storage_validator.h +--- chromium-109.0.5414.74/components/feature_engagement/internal/event_storage_validator.h.me 2023-01-19 16:00:14.350186515 +0100 ++++ chromium-109.0.5414.74/components/feature_engagement/internal/event_storage_validator.h 2023-01-19 16:00:21.643307993 +0100 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_ + #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_ + ++#include + #include + + namespace feature_engagement { +diff -up chromium-109.0.5414.74/components/feature_engagement/internal/never_event_storage_validator.h.me chromium-109.0.5414.74/components/feature_engagement/internal/never_event_storage_validator.h +--- chromium-109.0.5414.74/components/feature_engagement/internal/never_event_storage_validator.h.me 2023-01-19 15:59:18.210239416 +0100 ++++ chromium-109.0.5414.74/components/feature_engagement/internal/never_event_storage_validator.h 2023-01-19 15:59:34.513515030 +0100 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_ + #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_ + ++#include + #include + + #include "components/feature_engagement/internal/event_storage_validator.h" +diff -up chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/Signals.h.me chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/Signals.h +--- chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/Signals.h.me 2023-01-19 16:06:17.548272878 +0100 ++++ chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/Signals.h 2023-01-19 16:06:25.685410592 +0100 +@@ -14,6 +14,7 @@ + #ifndef LLVM_SUPPORT_SIGNALS_H + #define LLVM_SUPPORT_SIGNALS_H + ++#include + #include + + namespace llvm { +diff -up chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc.me chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc +--- chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc.me 2023-01-19 16:09:29.216477182 +0100 ++++ chromium-109.0.5414.74/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc 2023-01-19 16:10:05.657089208 +0100 +@@ -45,6 +45,7 @@ + #include "llvm/Support/SaveAndRestore.h" + #include "llvm/Support/raw_ostream.h" + #include ++#include + #include + #include + #ifdef HAVE_BACKTRACE +diff -up chromium-109.0.5414.74/chrome/browser/privacy_budget/encountered_surface_tracker.h.me chromium-109.0.5414.74/chrome/browser/privacy_budget/encountered_surface_tracker.h +--- chromium-109.0.5414.74/chrome/browser/privacy_budget/encountered_surface_tracker.h.me 2023-01-19 16:32:05.338160131 +0100 ++++ chromium-109.0.5414.74/chrome/browser/privacy_budget/encountered_surface_tracker.h 2023-01-19 16:32:16.213326798 +0100 +@@ -5,6 +5,7 @@ + #ifndef CHROME_BROWSER_PRIVACY_BUDGET_ENCOUNTERED_SURFACE_TRACKER_H_ + #define CHROME_BROWSER_PRIVACY_BUDGET_ENCOUNTERED_SURFACE_TRACKER_H_ + ++#include + #include + + #include "base/containers/flat_set.h" +diff -up chromium-109.0.5414.74/components/autofill/core/browser/autofill_ablation_study.h.me chromium-109.0.5414.74/components/autofill/core/browser/autofill_ablation_study.h +--- chromium-109.0.5414.74/components/autofill/core/browser/autofill_ablation_study.h.me 2023-01-19 16:47:55.548571102 +0100 ++++ chromium-109.0.5414.74/components/autofill/core/browser/autofill_ablation_study.h 2023-01-19 16:48:29.214146529 +0100 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_ + #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_ + ++#include + #include + + class GURL; +diff -up chromium-109.0.5414.74/components/omnibox/browser/on_device_head_model.h.me chromium-109.0.5414.74/components/omnibox/browser/on_device_head_model.h +--- chromium-109.0.5414.74/components/omnibox/browser/on_device_head_model.h.me 2023-01-19 16:57:29.525372814 +0100 ++++ chromium-109.0.5414.74/components/omnibox/browser/on_device_head_model.h 2023-01-19 16:58:02.667979288 +0100 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_ + #define COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_ + ++#include + #include + #include + #include +diff -up chromium-109.0.5414.74/components/payments/content/utility/fingerprint_parser.h.me chromium-109.0.5414.74/components/payments/content/utility/fingerprint_parser.h +--- chromium-109.0.5414.74/components/payments/content/utility/fingerprint_parser.h.me 2023-01-19 17:02:45.258544665 +0100 ++++ chromium-109.0.5414.74/components/payments/content/utility/fingerprint_parser.h 2023-01-19 17:02:52.577611757 +0100 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_ + #define COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_ + ++#include + #include + + #include +diff -up chromium-109.0.5414.74/pdf/document_attachment_info.h.me chromium-109.0.5414.74/pdf/document_attachment_info.h +--- chromium-109.0.5414.74/pdf/document_attachment_info.h.me 2023-01-19 17:28:28.552063534 +0100 ++++ chromium-109.0.5414.74/pdf/document_attachment_info.h 2023-01-19 17:28:48.072379953 +0100 +@@ -5,6 +5,7 @@ + #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_ + #define PDF_DOCUMENT_ATTACHMENT_INFO_H_ + ++#include + #include + + +diff -up chromium-109.0.5414.74/third_party/pdfium/constants/annotation_flags.h.me chromium-109.0.5414.74/third_party/pdfium/constants/annotation_flags.h +--- chromium-109.0.5414.74/third_party/pdfium/constants/annotation_flags.h.me 2023-01-19 18:25:47.648193710 +0100 ++++ chromium-109.0.5414.74/third_party/pdfium/constants/annotation_flags.h 2023-01-19 18:26:11.488593556 +0100 +@@ -5,6 +5,8 @@ + #ifndef CONSTANTS_ANNOTATION_FLAGS_H_ + #define CONSTANTS_ANNOTATION_FLAGS_H_ + ++#include ++ + namespace pdfium { + namespace annotation_flags { + diff --git a/chromium-94.0.4606.71-remoting-missing-cmath-header.patch b/chromium-94.0.4606.71-remoting-missing-cmath-header.patch deleted file mode 100644 index 060c71b3..00000000 --- a/chromium-94.0.4606.71-remoting-missing-cmath-header.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-94.0.4606.71/remoting/codec/codec_test.cc.missing-header chromium-94.0.4606.71/remoting/codec/codec_test.cc ---- chromium-94.0.4606.71/remoting/codec/codec_test.cc.missing-header 2021-10-07 18:01:11.846157616 +0000 -+++ chromium-94.0.4606.71/remoting/codec/codec_test.cc 2021-10-07 18:01:22.913662166 +0000 -@@ -8,6 +8,7 @@ - #include - #include - -+#include - #include - #include - diff --git a/chromium-94.0.4606.81-clang-format.patch b/chromium-94.0.4606.81-clang-format.patch deleted file mode 100644 index 960e7a47..00000000 --- a/chromium-94.0.4606.81-clang-format.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up chromium-94.0.4606.81/buildtools/linux64/clang-format.clang-format-py3 chromium-94.0.4606.81/buildtools/linux64/clang-format ---- chromium-94.0.4606.81/buildtools/linux64/clang-format.clang-format-py3 2021-10-08 11:26:16.411861005 -0400 -+++ chromium-94.0.4606.81/buildtools/linux64/clang-format 2021-10-08 11:32:16.005895508 -0400 -@@ -12,9 +12,9 @@ def main(): - args = sys.argv[1:] - inputfiles = [a for a in args if not a.startswith('-')] - -- contents = '' -+ contents = b'' - if '-' in args or not inputfiles: -- contents = sys.stdin.read() -+ contents = sys.stdin.buffer.read() - - # Tarball builds may or may not have depot_tools in $PATH. In the former case, - # running 'clang-format' will call back into this script infinitely. Strip off -@@ -37,17 +37,17 @@ def main(): - stdout, stderr = proc.communicate(input=contents) - # Ignore if clang-format fails. Eg: it may be too old to support C++14. - if proc.returncode == 0: -- sys.stdout.write(stdout) -- sys.stderr.write(stderr) -+ sys.stdout.buffer.write(stdout) -+ sys.stderr.buffer.write(stderr) - return 0 - except OSError: - # Ignore if clang-format is not installed. - pass - - # If any failure happens, continue with unformatted files. -- sys.stdout.write(contents) -+ sys.stdout.buffer.write(contents) - for inputfile in inputfiles: -- sys.stdout.write(open(inputfile).read()) -+ sys.stdout.buffer.write(open(inputfile).read()) - - return 0 - diff --git a/chromium-99.0.4844.84-markdownsafe-soft_str.patch b/chromium-99.0.4844.84-markdownsafe-soft_str.patch deleted file mode 100644 index b9ffc9b9..00000000 --- a/chromium-99.0.4844.84-markdownsafe-soft_str.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -up chromium-99.0.4844.84/third_party/jinja2/filters.py.soft_str chromium-99.0.4844.84/third_party/jinja2/filters.py ---- chromium-99.0.4844.84/third_party/jinja2/filters.py.soft_str 2022-03-28 10:33:14.979405438 -0400 -+++ chromium-99.0.4844.84/third_party/jinja2/filters.py 2022-03-28 10:33:45.934597164 -0400 -@@ -10,7 +10,7 @@ from itertools import groupby - - from markupsafe import escape - from markupsafe import Markup --from markupsafe import soft_unicode -+from markupsafe import soft_str - - from ._compat import abc - from ._compat import imap -@@ -191,18 +191,18 @@ def do_replace(eval_ctx, s, old, new, co - ): - s = escape(s) - else: -- s = soft_unicode(s) -- return s.replace(soft_unicode(old), soft_unicode(new), count) -+ s = soft_str(s) -+ return s.replace(soft_str(old), soft_str(new), count) - - - def do_upper(s): - """Convert a value to uppercase.""" -- return soft_unicode(s).upper() -+ return soft_str(s).upper() - - - def do_lower(s): - """Convert a value to lowercase.""" -- return soft_unicode(s).lower() -+ return soft_str(s).lower() - - - @evalcontextfilter -@@ -245,7 +245,7 @@ def do_capitalize(s): - """Capitalize a value. The first character will be uppercase, all others - lowercase. - """ -- return soft_unicode(s).capitalize() -+ return soft_str(s).capitalize() - - - def do_title(s): -@@ -255,7 +255,7 @@ def do_title(s): - return "".join( - [ - item[0].upper() + item[1:].lower() -- for item in _word_beginning_split_re.split(soft_unicode(s)) -+ for item in _word_beginning_split_re.split(soft_str(s)) - if item - ] - ) -@@ -495,7 +495,7 @@ def do_join(eval_ctx, value, d=u"", attr - return d.join(value) - - # no html involved, to normal joining -- return soft_unicode(d).join(imap(soft_unicode, value)) -+ return soft_str(d).join(imap(soft_str, value)) - - - def do_center(value, width=80): -@@ -761,7 +761,7 @@ def do_wordwrap( - - def do_wordcount(s): - """Count the words in that string.""" -- return len(_word_re.findall(soft_unicode(s))) -+ return len(_word_re.findall(soft_str(s))) - - - def do_int(value, default=0, base=10): -@@ -820,12 +820,12 @@ def do_format(value, *args, **kwargs): - raise FilterArgumentError( - "can't handle positional and keyword arguments at the same time" - ) -- return soft_unicode(value) % (kwargs or args) -+ return soft_str(value) % (kwargs or args) - - - def do_trim(value, chars=None): - """Strip leading and trailing characters, by default whitespace.""" -- return soft_unicode(value).strip(chars) -+ return soft_str(value).strip(chars) - - - def do_striptags(value): -@@ -1365,7 +1365,7 @@ FILTERS = { - "selectattr": do_selectattr, - "slice": do_slice, - "sort": do_sort, -- "string": soft_unicode, -+ "string": soft_str, - "striptags": do_striptags, - "sum": do_sum, - "title": do_title, -diff -up chromium-99.0.4844.84/third_party/jinja2/runtime.py.soft_str chromium-99.0.4844.84/third_party/jinja2/runtime.py ---- chromium-99.0.4844.84/third_party/jinja2/runtime.py.soft_str 2022-03-28 10:36:17.301534689 -0400 -+++ chromium-99.0.4844.84/third_party/jinja2/runtime.py 2022-03-28 10:36:33.053632253 -0400 -@@ -6,7 +6,7 @@ from types import MethodType - - from markupsafe import escape # noqa: F401 - from markupsafe import Markup --from markupsafe import soft_unicode -+from markupsafe import soft_str - - from ._compat import abc - from ._compat import imap -@@ -62,7 +62,7 @@ def identity(x): - def markup_join(seq): - """Concatenation that escapes if necessary and converts to unicode.""" - buf = [] -- iterator = imap(soft_unicode, seq) -+ iterator = imap(soft_str, seq) - for arg in iterator: - buf.append(arg) - if hasattr(arg, "__html__"): -diff -up chromium-99.0.4844.84/third_party/jinja2/utils.py.soft_str chromium-99.0.4844.84/third_party/jinja2/utils.py ---- chromium-99.0.4844.84/third_party/jinja2/utils.py.soft_str 2022-03-28 10:34:29.063864294 -0400 -+++ chromium-99.0.4844.84/third_party/jinja2/utils.py 2022-03-28 10:35:31.555251349 -0400 -@@ -725,13 +725,13 @@ except SyntaxError: - have_async_gen = False - - --def soft_unicode(s): -- from markupsafe import soft_unicode -+def soft_str(s): -+ from markupsafe import soft_str - - warnings.warn( -- "'jinja2.utils.soft_unicode' will be removed in version 3.0." -- " Use 'markupsafe.soft_unicode' instead.", -+ "'jinja2.utils.soft_str' will be removed in version 3.0." -+ " Use 'markupsafe.soft_str' instead.", - DeprecationWarning, - stacklevel=2, - ) -- return soft_unicode(s) -+ return soft_str(s) diff --git a/chromium.spec b/chromium.spec index 51c8fc9b..d6272848 100644 --- a/chromium.spec +++ b/chromium.spec @@ -114,8 +114,12 @@ # set correct toolchain %if %{clang} %global toolchain clang +%global CC clang +%global CXX clang++ %else %global toolchain gcc +%global CC gcc +%global CXX g++ %endif # enable system brotli @@ -289,25 +293,14 @@ Patch65: chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch Patch69: chromium-103.0.5060.53-update-rjsmin-to-1.2.0.patch # Update six to 1.16.0 -Patch70: chromium-105.0.5195.52-python-six-1.16.0.patch +Patch70: chromium-105.0.5195.52-python-six-1.16.0.patch # Fix crashes with components/cast_* # Thanks to Gentoo -Patch80: chromium-108-EnumTable-crash.patch +Patch80: chromium-108-EnumTable-crash.patch # Disable tests on remoting build -Patch82: chromium-98.0.4758.102-remoting-no-tests.patch - -# Add missing cmath header -Patch84: chromium-94.0.4606.71-remoting-missing-cmath-header.patch - -# Clean up clang-format for python3 -# thanks to Jon Nettleton -Patch86: chromium-94.0.4606.81-clang-format.patch - -# Markdownsafe 2.0.1 removed soft_unicode (replaced with soft_str) -# This is only in Fedora 37+ -Patch87: chromium-99.0.4844.84-markdownsafe-soft_str.patch +Patch82: chromium-98.0.4758.102-remoting-no-tests.patch # patch for using system brotli Patch89: chromium-108-system-brotli.patch @@ -627,11 +620,13 @@ BuildRequires: python3-beautifulsoup4 BuildRequires: python3-html5lib BuildRequires: python3-markupsafe BuildRequires: python3-ply +BuildRequires: python3-jinja2 %else BuildRequires: python-beautifulsoup4 BuildRequires: python-html5lib BuildRequires: python-markupsafe BuildRequires: python-ply +BuildRequires: python-jinja2 %endif %endif @@ -972,12 +967,6 @@ udev. %patch70 -p1 -b .update-six-to-1.16.0 %patch80 -p1 -b .EnumTable-crash %patch82 -p1 -b .remoting-no-tests -%patch84 -p1 -b .remoting-missing-cmath-header -%patch86 -p1 -b .clang-format-py3 - -%if 0%{?fedora} >= 37 -%patch87 -p1 -b .markdownsafe-soft_str -%endif %if ! %{bundlebrotli} %patch89 -p1 -b .system-brotli @@ -1190,6 +1179,8 @@ CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" %endif +export CC=%{CC} +export CXX=%{CXX} export CFLAGS export CXXFLAGS export AR=ar