From 322d671b1500cf6c475741e075dc5d623467854d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E4=BB=B2=E4=BC=9F?= Date: Tue, 17 Dec 2024 16:53:33 +0800 Subject: [PATCH] include all patches in the source package. (cherry picked from commit c4343ce0c920096675679566dd1a0c7e42ab218d) --- qt6-qtbase.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 9c289ae..933f8cc 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 -- Gitee