diff --git a/chromium-131-qt-ui.patch b/chromium-131-qt-ui.patch new file mode 100644 index 00000000..a8343477 --- /dev/null +++ b/chromium-131-qt-ui.patch @@ -0,0 +1,12 @@ +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.spec b/chromium.spec index 1bc48554..c983e6f5 100644 --- a/chromium.spec +++ b/chromium.spec @@ -157,7 +157,7 @@ %endif # enable qt backend -%global enable_qt 0 +%global enable_qt 1 %global use_qt6 0 %global use_qt 0 @@ -280,7 +280,7 @@ Name: chromium%{chromium_channel} Version: 131.0.6778.85 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) @@ -337,6 +337,7 @@ 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 # disable memory tagging (epel8 on aarch64) due to new feature IFUNC-Resolver # it is not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found @@ -1053,6 +1054,7 @@ Qt6 UI for chromium. %if 0%{?rhel} > 9 || 0%{?fedora} > 39 %patch -P150 -p1 -b .qt6 +%patch -P151 -p1 -b .qt-ui %endif %if 0%{?rhel} == 8 @@ -1930,6 +1932,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %endif %changelog +* Sat Nov 23 2024 Than Ngo - 131.0.6778.85-2 +- Enable qt-ui + * Wed Nov 20 2024 Than Ngo - 131.0.6778.85-1 - Update to 131.0.6778.85 * High CVE-2024-11395: Type Confusion in V8