diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 9c289ae227fb3c7477c4599787788a5fb090857c..933f8ccab7eceafb83d88c863591ac5b6075ddab 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -27,7 +27,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.5.2 -Release: 7 +Release: 8 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://qt-project.org/ @@ -78,9 +78,7 @@ Patch58: qtbase-libglvnd.patch Patch90: qtbase-gcc11.patch # fix riscv test -%ifarch riscv64 Patch100: fix-riscv-configure-tests.patch -%endif Patch102: fix-build-error-of-libxkbcommon-1.6.0.patch @@ -286,7 +284,12 @@ Qt6 libraries used for drawing widgets and OpenGL items. %prep -%autosetup -n %{qt_module}-everywhere-src-%{version} -p1 +%setup -n %{qt_module}-everywhere-src-%{version} +%autopatch -M99 -p1 +%ifarch riscv64 +%patch -P 100 -p1 +%endif +%autopatch -m101 -p1 # move some bundled libs to ensure they're not accidentally used pushd src/3rdparty @@ -803,6 +806,9 @@ make check -k ||: %changelog +* Tue Dec 17 2024 shenzhongwei - 6.5.2-8 +- include all patches in the source package. + * Thu Dec 12 2024 Funda Wang - 6.5.2-7 - fix CVE-2023-45935, CVE-2024-25580