diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..05a0e946187b8160d0c54c23a9f8100f44e0f43b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..906f16d3993cc8930f32c2905aa6751be06744bb --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/qt6-qtwebengine diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 372b908b5d776625eaf60b53d369402bd0e63d9a..f9033d9863b4ac2210df04bc3678851c66412308 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -39,7 +39,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine Version: 6.5.2 -Release: 4 +Release: 5 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -51,8 +51,6 @@ URL: http://www.qt.io # ./clean_qtwebengine.sh 6.4.1 # remove Source0 file for fix Eulermaker failure Source0: qtwebengine-everywhere-src-%{version}-clean.tar.xz -Source100: qtwebengine-everywhere-src-%{version}-clean.tar.xz.0 -Source101: qtwebengine-everywhere-src-%{version}-clean.tar.xz.1 # cleanup scripts used above Source2: clean_qtwebengine.sh @@ -70,6 +68,7 @@ Patch2: qtwebengine-link-pipewire.patch # Fix/workaround FTBFS on aarch64 with newer glibc Patch3: qtwebengine-aarch64-new-stat.patch Patch4: qtwebengine-ffmpeg-first_dts.patch +Patch5: qtwebengine-p20240322-ninja1.12.patch # FTBS warning: elaborated-type-specifier for a scoped enum must not # use the 'class' keyword @@ -356,7 +355,6 @@ Summary: Example files for qt6-qtpdf %{summary}. %prep -cat %{SOURCE100} %{SOURCE101} > %{SOURCE0} %setup -q -n %{qt_module}-everywhere-src-%{version} -a20 mv pulse src/3rdparty/chromium/ @@ -368,6 +366,7 @@ popd %patch -P2 -p1 -b .link-pipewire %patch -P3 -p1 -b .aarch64-new-stat %patch -P4 -p1 -b .qtwebengine-ffmpeg-first_dts +%patch -P5 -p1 -b .ninja %patch -P50 -p1 -b .fix-build.patch @@ -666,6 +665,9 @@ done %changelog +* Tue Apr 22 2025 Funda Wang - 6.5.2-5 +- fix build with ninja 1.12 + * Mon Feb 17 2025 peijiankang - 6.5.2-4 - qtwebengine fix build error with ffmpeg-7.1 diff --git a/qtwebengine-everywhere-src-6.5.2-clean.tar.xz b/qtwebengine-everywhere-src-6.5.2-clean.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..d9b3b5a10e34ccdbc510a1f9313da9dff6702911 --- /dev/null +++ b/qtwebengine-everywhere-src-6.5.2-clean.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4e5fe901bcb92bd97a8bbee24ee7613b423460fb3056082444d9473fe19f793 +size 390411432 diff --git a/qtwebengine-everywhere-src-6.5.2-clean.tar.xz.0 b/qtwebengine-everywhere-src-6.5.2-clean.tar.xz.0 deleted file mode 100644 index a237aae3c4867a3f2d8b74584943f71b0d5edd15..0000000000000000000000000000000000000000 Binary files a/qtwebengine-everywhere-src-6.5.2-clean.tar.xz.0 and /dev/null differ diff --git a/qtwebengine-everywhere-src-6.5.2-clean.tar.xz.1 b/qtwebengine-everywhere-src-6.5.2-clean.tar.xz.1 deleted file mode 100644 index dfda535b42f9db5ff4ce6678b08d1fe84302a685..0000000000000000000000000000000000000000 Binary files a/qtwebengine-everywhere-src-6.5.2-clean.tar.xz.1 and /dev/null differ diff --git a/qtwebengine-p20240322-ninja1.12.patch b/qtwebengine-p20240322-ninja1.12.patch new file mode 100644 index 0000000000000000000000000000000000000000..0fdf13e32950d65ecac8edd188cab083b25762d6 --- /dev/null +++ b/qtwebengine-p20240322-ninja1.12.patch @@ -0,0 +1,27 @@ +Quoting the description from qtwebengine-6.7.0-ninja1.12.patch: +""" +Patch status: pending being looked at upstream + +Issue[1][2][3] also exist in chromium itself[4], and unclear +why this started happening only with ninja-1.12.0 at the moment. + +Just a quickfix, likely not fully correct and seems there may +be further unresolved race issues. + +[1] https://bugs.gentoo.org/930107 +[2] https://bugreports.qt.io/browse/QTBUG-124375 +[3] https://github.com/ninja-build/ninja/issues/2417 +[4] https://bugs.gentoo.org/930112 +""" + +This has a hunk removed but is otherwise the same. +--- ./src/3rdparty/chromium/content/browser/BUILD.gn.orig 2024-03-26 14:47:34.000000000 +0000 ++++ ./src/3rdparty/chromium/content/browser/BUILD.gn 2024-06-24 04:57:25.108720935 +0100 +@@ -196,6 +196,7 @@ jumbo_static_library("browser") { + "//content/common", + "//content/common:buildflags", + "//content/common:mojo_bindings", ++ "//components/spellcheck:buildflags", + "//content/public/browser:proto", + "//content/public/common:common_sources", + "//content/public/common:content_descriptor_keys",