diff --git a/backport-gperf-3.2.patch b/backport-gperf-3.2.patch deleted file mode 100644 index 46707bd83ebbacd6e6b891ad56e697b183ce1736..0000000000000000000000000000000000000000 --- a/backport-gperf-3.2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From https://chromium-review.googlesource.com/c/chromium/src/+/6445471 - -Don't apply /*FALLTHROUGH*/ edit to gperf 3.2 output - -The gperf issue at https://savannah.gnu.org/bugs/index.php?53029 -has been resolved as of the 3.2 release, and not only is the -/*FALLTHROUGH*/ comment replacement no longer needed, it now -breaks the build with "error: fallthrough annotation does not -directly precede switch label". Only do the edit for 3.1. - ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py -@@ -35,10 +35,11 @@ def generate_gperf(gperf_path, gperf_input, gperf_args): - # https://savannah.gnu.org/bugs/index.php?53028 - gperf_output = re.sub(r'\bregister ', '', gperf_output) - # -Wimplicit-fallthrough needs an explicit fallthrough statement, -- # so replace gperf's /*FALLTHROUGH*/ comment with the statement. -- # https://savannah.gnu.org/bugs/index.php?53029 -- gperf_output = gperf_output.replace('/*FALLTHROUGH*/', -- ' [[fallthrough]];') -+ # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement. -+ # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2) -+ if '/* C++ code produced by gperf version 3.1 */' in gperf_output: -+ gperf_output = gperf_output.replace('/*FALLTHROUGH*/', -+ ' [[fallthrough]];') - # -Wpointer-to-int-cast warns about casting pointers to smaller ints - # Replace {(int)(long)&(foo), bar} with - # {static_cast(reinterpret_cast(&(foo)), bar} diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 04a68843f21620197a940f0c517b4577aaecc197..aa195bc6a6776d59e96954b579c4b71bb99c7deb 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -37,8 +37,8 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine -Version: 6.9.1 -Release: 2 +Version: 6.9.2 +Release: 1 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -63,8 +63,6 @@ Patch1: qtwebengine-SIOCGSTAMP.patch Patch2: qtwebengine-link-pipewire.patch # Fix/workaround FTBFS on aarch64 with newer glibc Patch3: qtwebengine-aarch64-new-stat.patch -# From https://chromium-review.googlesource.com/c/chromium/src/+/6445471 -Patch4: backport-gperf-3.2.patch # FTBS warning: elaborated-type-specifier for a scoped enum must not # use the 'class' keyword @@ -667,9 +665,15 @@ done %changelog -* Thu Aug 14 2025 Xuhai Chang - 6.9.1-2 +* Tue Aug 26 2025 Funda Wang - 6.9.2-1 +- update to 6.9.2 + +* Thu Aug 14 2025 Xuhai Chang - 6.9.1-3 - only disable pdf v8 for riscv64 +* Tue Aug 12 2025 misaka00251 - 6.9.1-2 +- Fix build on riscv64 + * Tue Jun 03 2025 Funda Wang - 6.9.1-1 - update to version 6.9.1 diff --git a/qtwebengine-everywhere-src-6.9.1.tar.xz b/qtwebengine-everywhere-src-6.9.2.tar.xz similarity index 32% rename from qtwebengine-everywhere-src-6.9.1.tar.xz rename to qtwebengine-everywhere-src-6.9.2.tar.xz index 22c46930dd4379fecba140775dca450958acc64b..c59d8f7f7509116a9ccc108c79f6e7bf700bd17b 100644 --- a/qtwebengine-everywhere-src-6.9.1.tar.xz +++ b/qtwebengine-everywhere-src-6.9.2.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:787dfde22b348f6d620f2207ed7e32ad0a5389373182614272de28ff3f91c26c -size 672204388 +oid sha256:99cb0792abc2e39b299d73d8e2aa076b9ebcd55c3f4a4b5fd514eef5a62d03ab +size 672191852 diff --git a/riscv-sandbox.patch b/riscv-sandbox.patch index 5bc5603149a02e4ea9a8cb79e191be57e9c2a094..46921f7df66762a4d000bba3754053835482a3ce 100644 --- a/riscv-sandbox.patch +++ b/riscv-sandbox.patch @@ -295,9 +295,9 @@ Index: chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc @@ -623,7 +623,7 @@ bool SyscallSets::IsAllowedGeneralIo(int case __NR_send: #endif - #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ -- defined(__aarch64__) -+ defined(__aarch64__) || defined(__riscv) + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \ +- defined(__mips__) || defined(__aarch64__) ++ defined(__mips__) || defined(__aarch64__) || defined(__riscv) case __NR_sendmsg: // Could specify destination. case __NR_sendto: // Could specify destination. #endif