diff options
| -rw-r--r-- | chromium/chromium/chromium-gcc-12-r1160564.patch | 35 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc-12-r1162011.patch | 31 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc-12-r1162286.patch | 38 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc-12-r1181503.patch | 30 | ||||
| -rw-r--r-- | chromium/chromium/chromium-material_color_utilities-cmath.patch | 24 | ||||
| -rw-r--r-- | chromium/chromium/chromium-use-system-zstd.patch | 46 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 24 |
7 files changed, 116 insertions, 112 deletions
diff --git a/chromium/chromium/chromium-gcc-12-r1160564.patch b/chromium/chromium/chromium-gcc-12-r1160564.patch deleted file mode 100644 index a73c4e7..0000000 --- a/chromium/chromium/chromium-gcc-12-r1160564.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6ab6fdfe3d403b6917069957c707e6822b873962 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Wed, 21 Jun 2023 11:16:26 +0000 -Subject: [PATCH] IWYU: add variant for std::variant in - object_paint_properties_sparse -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bug: 957519 -Change-Id: I04677f8837ab7c6d78497e266a5af135b40ea0ba -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4628513 -Commit-Queue: Fredrik Söderquist <fs@opera.com> -Auto-Submit: Stephan Hartmann <stha09@googlemail.com> -Reviewed-by: Fredrik Söderquist <fs@opera.com> -Cr-Commit-Position: refs/heads/main@{#1160564} ---- - .../blink/renderer/core/paint/object_paint_properties_sparse.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h b/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h -index 8bb1639676cd6..79c60feca0456 100644 ---- a/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h -+++ b/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h -@@ -8,6 +8,7 @@ - #include <array> - #include <memory> - #include <utility> -+#include <variant> - - #include "base/dcheck_is_on.h" - #include "base/memory/ptr_util.h" --- -2.41.0 - diff --git a/chromium/chromium/chromium-gcc-12-r1162011.patch b/chromium/chromium/chromium-gcc-12-r1162011.patch deleted file mode 100644 index bf76433..0000000 --- a/chromium/chromium/chromium-gcc-12-r1162011.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a818a8afbb4e21efb3f261543ccd83081fc30636 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Fri, 23 Jun 2023 23:57:28 +0000 -Subject: [PATCH] IWYU: add vector for std::vector in profile_view_utils - -Bug: 957519 -Change-Id: I7d720a44deeb4743ecb4abeef11f841cc39249c4 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4628731 -Auto-Submit: Stephan Hartmann <stha09@googlemail.com> -Commit-Queue: Peter Kasting <pkasting@chromium.org> -Reviewed-by: Peter Kasting <pkasting@chromium.org> -Cr-Commit-Position: refs/heads/main@{#1162011} ---- - chrome/browser/ui/profile_view_utils.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chrome/browser/ui/profile_view_utils.h b/chrome/browser/ui/profile_view_utils.h -index 4aa53f094c2d5..5a7250f387610 100644 ---- a/chrome/browser/ui/profile_view_utils.h -+++ b/chrome/browser/ui/profile_view_utils.h -@@ -7,6 +7,7 @@ - - #include <string> - #include <utility> -+#include <vector> - - class Profile; - class ProfileAttributesEntry; --- -2.41.0 - diff --git a/chromium/chromium/chromium-gcc-12-r1162286.patch b/chromium/chromium/chromium-gcc-12-r1162286.patch deleted file mode 100644 index 730ffe4..0000000 --- a/chromium/chromium/chromium-gcc-12-r1162286.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ddfcc907907a20d9f8fbc1416492e2093b339b22 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Mon, 26 Jun 2023 08:46:26 +0000 -Subject: [PATCH] IWYU: add cstddef for size_t in bookmarks::UrlLoadStats - -Bug: 957519 -Change-Id: Ic58b8b6adc001f0931c2d1d74b7ac1ac3014fbc1 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4644168 -Auto-Submit: Stephan Hartmann <stha09@googlemail.com> -Reviewed-by: Mikel Astiz <mastiz@chromium.org> -Commit-Queue: Mikel Astiz <mastiz@chromium.org> -Cr-Commit-Position: refs/heads/main@{#1162286} ---- - components/bookmarks/common/url_load_stats.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/components/bookmarks/common/url_load_stats.h b/components/bookmarks/common/url_load_stats.h -index b4d975b896bfa..b5ddece1fb353 100644 ---- a/components/bookmarks/common/url_load_stats.h -+++ b/components/bookmarks/common/url_load_stats.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_ - #define COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_ - -+#include <cstddef> - #include <cstdint> - #include <vector> - -@@ -51,4 +52,4 @@ struct UrlLoadStats { - - } // namespace bookmarks - --#endif // COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_ -\ No newline at end of file -+#endif // COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_ --- -2.41.0 - diff --git a/chromium/chromium/chromium-gcc-12-r1181503.patch b/chromium/chromium/chromium-gcc-12-r1181503.patch new file mode 100644 index 0000000..de097cf --- /dev/null +++ b/chromium/chromium/chromium-gcc-12-r1181503.patch @@ -0,0 +1,30 @@ +From 5a8dfcaf84b5af5aeb738702651e98bfc43d6d45 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Wed, 9 Aug 2023 15:36:26 +0000 +Subject: [PATCH] IWYU: add memory for std::unique_ptr in //third_party/ipcz + +Bug: 957519 +Change-Id: I600f415a59206da283046b638a4f68eda0892ac7 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4754274 +Commit-Queue: Stephan Hartmann <stha09@googlemail.com> +Reviewed-by: Robert Sesek <rsesek@chromium.org> +Cr-Commit-Position: refs/heads/main@{#1181503} +--- + third_party/ipcz/src/ipcz/router_link.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/ipcz/src/ipcz/router_link.h b/third_party/ipcz/src/ipcz/router_link.h +index 09bc5626d9956..619638cc7f18b 100644 +--- a/third_party/ipcz/src/ipcz/router_link.h ++++ b/third_party/ipcz/src/ipcz/router_link.h +@@ -7,6 +7,7 @@ + + #include <cstddef> + #include <functional> ++#include <memory> + #include <string> + #include <utility> + +-- +2.41.0 + diff --git a/chromium/chromium/chromium-material_color_utilities-cmath.patch b/chromium/chromium/chromium-material_color_utilities-cmath.patch new file mode 100644 index 0000000..cc5410a --- /dev/null +++ b/chromium/chromium/chromium-material_color_utilities-cmath.patch @@ -0,0 +1,24 @@ +Add missing cmath import in material-color-utilities + +See: https://github.com/material-foundation/material-color-utilities/blob/main/cpp/palettes/tones.cc + +--- a/third_party/material_color_utilities/src/cpp/palettes/tones.cc ++++ b/third_party/material_color_utilities/src/cpp/palettes/tones.cc +@@ -19,6 +19,8 @@ + #include "cpp/cam/cam.h" + #include "cpp/cam/hct.h" + ++#include <cmath> ++ + namespace material_color_utilities { + + TonalPalette::TonalPalette(Argb argb) : key_color_(0.0, 0.0, 0.0) { +@@ -67,7 +69,7 @@ Hct TonalPalette::createKeyColor(double hue, double chroma) { + // case where requested chroma is 16.51, and the closest chroma is 16.49. + // Error is minimized, but when rounded and displayed, requested chroma + // is 17, key color's chroma is 16. +- if (round(chroma) == round(smallest_delta_hct.get_chroma())) { ++ if (std::round(chroma) == std::round(smallest_delta_hct.get_chroma())) { + return smallest_delta_hct; + } + Hct hct_add(hue, chroma, start_tone + delta); diff --git a/chromium/chromium/chromium-use-system-zstd.patch b/chromium/chromium/chromium-use-system-zstd.patch new file mode 100644 index 0000000..0fcd3ef --- /dev/null +++ b/chromium/chromium/chromium-use-system-zstd.patch @@ -0,0 +1,46 @@ +From ae3ae3711784865bdc38bf119a6182a7b8dae91c Mon Sep 17 00:00:00 2001 +From: Matt Jolly <Matt.Jolly@footclan.ninja> +Date: Sun, 17 Sep 2023 16:51:42 +1000 +Subject: [PATCH] Add system-zstd + +--- a/build/linux/unbundle/replace_gn_files.py ++++ b/build/linux/unbundle/replace_gn_files.py +@@ -74,6 +74,7 @@ REPLACEMENTS = { + # + 'woff2': 'third_party/woff2/BUILD.gn', + 'zlib': 'third_party/zlib/BUILD.gn', ++ 'zstd': 'third_party/zstd/BUILD.gn', + } + + +--- /dev/null ++++ b/build/linux/unbundle/zstd.gn +@@ -0,0 +1,25 @@ ++import("//build/config/linux/pkg_config.gni") ++import("//build/shim_headers.gni") ++ ++pkg_config("system_zstd") { ++ packages = [ "libzstd" ] ++} ++ ++shim_headers("zstd_shim") { ++ root_path = "src/lib" ++ headers = [ ++ "zdict.h", ++ "zstd.h", ++ "zstd_errors.h", ++ ] ++} ++ ++source_set("zstd") { ++ deps = [ ":zstd_shim" ] ++ public_configs = [ ":system_zstd" ] ++} ++ ++source_set("decompress") { ++ deps = [ ":zstd_shim" ] ++ public_configs = [ ":system_zstd" ] ++} +-- +2.42.0 + diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index f9fff28..94669f5 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -71,7 +71,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 116.0.5845.187 +Version: 117.0.5938.88 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -119,15 +119,19 @@ Patch1: chromium-gn-no-static-libstdc++-allow-warnings.patch Patch2: chromium-python3.patch # Pull upstream patches -Patch10: chromium-gcc-12-r1162286.patch -Patch11: chromium-gcc-12-r1162011.patch -Patch12: chromium-gcc-12-r1160564.patch -Patch13: chromium-vulkan_memory_allocator-gcc-13.patch +Patch10: chromium-gcc-12-r1181503.patch +Patch11: chromium-vulkan_memory_allocator-gcc-13.patch # Fix missing includes Patch20: chromium-maldoca-cstdint.patch Patch21: chromium-ruy-string.patch +# Pull patches from Matt.Jolly +# https://gitlab.com/Matt.Jolly/chromium-patches/-/commit/9f0846cc290d5d11 +# https://gitlab.com/Matt.Jolly/chromium-patches/-/commit/55f31e3ac9880a09 +Patch30: chromium-use-system-zstd.patch +Patch31: chromium-material_color_utilities-cmath.patch + # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -180,6 +184,7 @@ BuildRequires: pkgconfig(dav1d) %endif BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(libzstd) BuildRequires: opus-devel BuildRequires: re2-devel BuildRequires: snappy-devel @@ -262,7 +267,6 @@ find -type f -exec \ third_party/angle/src/common/third_party/xxhash \ third_party/angle/src/third_party/ceval \ third_party/angle/src/third_party/libXNVCtrl \ - third_party/angle/src/third_party/systeminfo \ third_party/angle/src/third_party/volk \ third_party/apple_apsl \ third_party/axe-core \ @@ -321,6 +325,7 @@ find -type f -exec \ third_party/devtools-frontend/src/front_end/third_party/marked \ third_party/devtools-frontend/src/front_end/third_party/puppeteer \ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt \ + third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs \ third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data \ third_party/devtools-frontend/src/front_end/third_party/wasmparser \ third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n \ @@ -422,7 +427,6 @@ find -type f -exec \ third_party/pdfium/third_party/lcms \ third_party/pdfium/third_party/libopenjpeg \ third_party/pdfium/third_party/libtiff \ - third_party/pdfium/third_party/skia_shared \ third_party/perfetto \ third_party/perfetto/protos/third_party/chromium \ third_party/pffft \ @@ -532,7 +536,8 @@ find -type f -exec \ re2 \ %endif snappy \ - zlib + zlib \ + zstd sed -i 's|//third_party/usb_ids|/usr/share/hwdata|g' \ services/device/public/cpp/usb/BUILD.gn @@ -764,6 +769,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Sep 20 2023 - Ting-Wei Lan <lantw44@gmail.com> - 117.0.5938.88-100 +- Update to 117.0.5938.88 + * Sun Sep 17 2023 - Ting-Wei Lan <lantw44@gmail.com> - 116.0.5845.187-100 - Update to 116.0.5845.187 |