diff --git a/chromium-131-qt-ui.patch b/chromium-131-qt-ui.patch deleted file mode 100644 index a8343477..00000000 --- a/chromium-131-qt-ui.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-131.0.6778.85/ui/qt/qt_shim.cc.me chromium-131.0.6778.85/ui/qt/qt_shim.cc ---- chromium-131.0.6778.85/ui/qt/qt_shim.cc.me 2024-11-23 10:04:16.789121846 +0100 -+++ chromium-131.0.6778.85/ui/qt/qt_shim.cc 2024-11-23 11:40:02.905064702 +0100 -@@ -265,7 +265,7 @@ FontRenderParams QtShim::GetFontRenderPa - FontDescription QtShim::GetFontDescription() const { - QFont font = app_.font(); - return { -- .family = String(font.family().toStdString().c_str()), -+ .family = String(font.family().toUtf8().constData()), - .size_pixels = font.pixelSize(), - .size_points = font.pointSize(), - .is_italic = IsStyleItalic(font.style()), diff --git a/chromium-134-clang-unknown-option.patch b/chromium-134-clang-unknown-option.patch new file mode 100644 index 00000000..fcf82b4b --- /dev/null +++ b/chromium-134-clang-unknown-option.patch @@ -0,0 +1,14 @@ +Fix warning: unknown warning option '-Wno-nontrivial-memcall' + +diff -up chromium-134.0.6998.23/build/config/compiler/BUILD.gn.than chromium-134.0.6998.23/build/config/compiler/BUILD.gn +--- chromium-134.0.6998.23/build/config/compiler/BUILD.gn.than 2025-02-24 09:59:50.096821901 +0100 ++++ chromium-134.0.6998.23/build/config/compiler/BUILD.gn 2025-02-24 10:01:12.160253620 +0100 +@@ -1982,7 +1982,7 @@ config("default_warnings") { + cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ] + + # TODO(crbug.com/376641662): Fix and re-enable. +- cflags += [ "-Wno-nontrivial-memcall" ] ++ # cflags += [ "-Wno-nontrivial-memcall" ] + } + } + diff --git a/chromium.spec b/chromium.spec index 7310c8d1..8e2a5310 100644 --- a/chromium.spec +++ b/chromium.spec @@ -141,12 +141,6 @@ %global __provides_exclude_from ^(%{chromium_path}/.*\\.so|%{chromium_path}/.*\\.so.*)$ %global __requires_exclude ^(%{chromium_path}/.*\\.so|%{chromium_path}/.*\\.so.*)$ -# enable|disable use_custom_libcxx -%global use_custom_libcxx 0 -%if 0%{?rhel} || 0%{?fedora} == 40 -%global use_custom_libcxx 1 -%endif - # enable|disable control flow integrity support %global cfi 0 %ifarch x86_64 aarch64 @@ -267,7 +261,7 @@ %endif Name: chromium -Version: 133.0.6943.126 +Version: 133.0.6943.141 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -317,7 +311,6 @@ Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch # add correct path for Qt6Gui header and libs Patch150: chromium-124-qt6.patch -Patch151: chromium-131-qt-ui.patch # revert, it causes ramdom crash on aarch64 Patch300: chromium-131-revert-decommit-pooled-pages-by-default.patch @@ -340,6 +333,9 @@ Patch312: chromium-123-fstack-protector-strong.patch # build error stdarch_arm_crc32 Patch313: chromium-133-rust-crc32fast.patch +# warning: unknown warning option '-Wno-nontrivial-memcall' +Patch314: chromium-134-clang-unknown-option.patch + # add -ftrivial-auto-var-init=zero and -fwrapv Patch316: chromium-122-clang-build-flags.patch @@ -353,12 +349,12 @@ Patch353: chromium-127-aarch64-duplicate-case-value.patch # remove flag split-threshold-for-reg-with-hint, it's not supported in clang <= 17 Patch354: chromium-126-split-threshold-for-reg-with-hint.patch -# fix build error with new pipewire in f43 -Patch356: chromium-133-pipewire-cast.patch - # fix build error: no member named 'hardware_destructive_interference_size' in namespace 'std' Patch355: chromium-130-hardware_destructive_interference_size.patch +# fix build error with new pipewire in f43 +Patch356: chromium-133-pipewire-cast.patch + # set clang_lib path Patch358: chromium-127-rust-clanglib.patch @@ -608,10 +604,6 @@ BuildRequires: libappstream-glib BuildRequires: libstdc++-static %endif -%if ! %{use_custom_libcxx} -BuildRequires: libcxx-devel -%endif - # Fedora tries to use system libs whenever it can. BuildRequires: bzip2-devel BuildRequires: dbus-glib-devel @@ -1012,10 +1004,7 @@ Qt6 UI for chromium. %patch -P141 -p1 -b .dma_buf_export_sync_file-conflict %endif -%if 0%{?rhel} > 9 || 0%{?fedora} > 39 %patch -P150 -p1 -b .qt6 -%patch -P151 -p1 -b .qt-ui -%endif %ifarch aarch64 ppc64le %patch -P300 -p1 -R -b .revert-decommit-pooled-pages-by-default @@ -1039,10 +1028,11 @@ Qt6 UI for chromium. %ifarch aarch64 %if 0%{?rhel} == 8 || 0%{?rhel} == 9 -%patch -P313 -p1 -b .rust-crc32fast.patch +%patch -P313 -p1 -b .rust-crc32fast %endif %endif +%patch -P314 -p1 -b .clang-unknown-option %patch -P316 -p1 -b .clang-build-flags %if %{disable_bti} @@ -1208,24 +1198,10 @@ CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" %endif -%if ! %{use_custom_libcxx} -CXXFLAGS="$FLAGS -stdlib=libc++" -LDFLAGS="$LDFLAGS -stdlib=libc++" -%endif - %ifarch ppc64le CXXFLAGS+=' -faltivec-src-compat=mixed -Wno-deprecated-altivec-src-compat' %endif -# reduce the size of relocations -%if 0%{?fedora} || 0%{?rhel} > 9 -LDFLAGS="$LDFLAGS -Wl,-z,pack-relative-relocs" -RUSTFLAGS=${RUSTFLAGS/--cap-lints/-Clink-arg=-Wl,-z,pack-relative-relocs --cap-lints} -%if ! %{enable_debug} -RUSTFLAGS=${RUSTFLAGS/debuginfo=?/debuginfo=0} -%endif -%endif - export CC=clang export CXX=clang++ export AR=llvm-ar @@ -1233,8 +1209,6 @@ export NM=llvm-nm export READELF=llvm-readelf export CFLAGS export CXXFLAGS -export LDFLAGS -export RUSTFLAGS # need for error: the option `Z` is only accepted on the nightly compiler export RUSTC_BOOTSTRAP=1 @@ -1309,9 +1283,6 @@ CHROMIUM_CORE_GN_DEFINES+=' icu_use_data_file=true' CHROMIUM_CORE_GN_DEFINES+=' target_os="linux"' CHROMIUM_CORE_GN_DEFINES+=' current_os="linux"' CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false' -%if ! %{use_custom_libcxx} -CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=false' -%endif CHROMIUM_CORE_GN_DEFINES+=' enable_iterator_debugging=false' CHROMIUM_CORE_GN_DEFINES+=' enable_vr=false' CHROMIUM_CORE_GN_DEFINES+=' build_dawn_tests=false enable_perfetto_unittests=false' @@ -1781,6 +1752,9 @@ fi %endif %changelog +* Wed Feb 26 2025 Than Ngo - 133.0.6943.141-1 +- Update to 133.0.6943.141 + * Wed Feb 19 2025 Than Ngo - 133.0.6943.126-1 - Update to 133.0.6943.126 * CVE-2025-0999: Heap buffer overflow in V8 diff --git a/sources b/sources index 8901a96c..ca2a4a00 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ SHA512 (node-v20.6.1-linux-arm64.tar.xz) = adfcaf2c22614797fd69fb46d94c1cbf64dea SHA512 (node-v20.6.1-linux-x64.tar.xz) = 7e15c05041a9a50f0046266aadb2e092a5aefbec19be1c7c809471add520cb57c7df3c47d88b1888b29bf2979dca3c92adddfd965370fa2a9da4ea02186464fd SHA512 (linux-arm64-0.19.2.tgz) = 8a0d8fec6786fffcd6954d00820037a55d61e60762c74300df0801f8db27057562c221a063bedfb8df56af9ba80abb366336987e881782c5996e6f871abd3dc6 SHA512 (linux-x64-0.19.2.tgz) = a31cc74c4bfa54f9b75d735a1cfc944d3b5efb7c06bfba9542da9a642ae0b2d235ea00ae84d3ad0572c406405110fe7b61377af0fd15803806ef78d20fc6f05d -SHA512 (chromium-133.0.6943.126-clean.tar.xz) = 7c818a6fa2ffed20ca1c11eee8d7fc8e09e53efbf6f21c40f67b781f0737a8b7dd1ee09a79f823b28fe0dd234c2faf920680db387fd3caa5c8db0699c170b100 +SHA512 (chromium-133.0.6943.141-clean.tar.xz) = 3e9a04b9168db93a523d538bdff0b9f35dc697b0006dd0e74e897f5f2df5a9e461e9c6067fadbb6ec907ee31edcf80f3f95ef19750bf12961b3f20436f91fe46