From 11dcb119b0a6b0c63792b30503466cc16defa847 Mon Sep 17 00:00:00 2001 From: s Date: Fri, 8 Sep 2023 19:41:09 +0800 Subject: [PATCH] fix clang build error --- 0002-fix-clang.patch | 12 ++++++++++++ kylin-calculator.spec | 12 +++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 0002-fix-clang.patch diff --git a/0002-fix-clang.patch b/0002-fix-clang.patch new file mode 100644 index 0000000..1c9d626 --- /dev/null +++ b/0002-fix-clang.patch @@ -0,0 +1,12 @@ +diff -u -r kylin-calculator-1.1.0/src/menumodule/menumodule.cpp kylin-calculator-1.1.0/src/menumodule/menumodule.cpp +--- kylin-calculator-1.1.0/src/menumodule/menumodule.cpp 2022-03-31 15:50:21.000000000 +0800 ++++ kylin-calculator-1.1.0/src/menumodule/menumodule.cpp 2023-06-15 23:45:53.000000000 +0800 +@@ -20,7 +20,7 @@ + #include "menumodule.h" + #include "xatom-helper.h" + +-menuModule::menuModule(QWidget *parent = nullptr) : QWidget(parent) ++menuModule::menuModule(QWidget *parent) : QWidget(parent) + { + init(); + } diff --git a/kylin-calculator.spec b/kylin-calculator.spec index 14f857c..e8cc804 100644 --- a/kylin-calculator.spec +++ b/kylin-calculator.spec @@ -1,11 +1,12 @@ Name: kylin-calculator Version: 1.1.0 -Release: 3 +Release: 4 Summary: Calculator tool for UKUI License: LGPL-3.0-or-later and GPL-3.0-or-later URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz Patch01: 0001-update-kylin-calculator.desktop.patch +Patch02: 0002-fix-clang.patch BuildRequires: qt5-qtbase-devel BuildRequires: qtchooser @@ -30,8 +31,7 @@ modes, with simple to use, friendly interface and other advantages. %prep -%setup -q -%patch01 -p1 +%autosetup -p1 %build %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-calculator.pro @@ -66,6 +66,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kylin-user-guide/data/guide/kylin-calculator/* %changelog +* Fri Sep 08 2023 yoo - 1.1.0-4 +- Type:bugfix +- CVE: +- SUG:NA +- DESC: fix clang build error + * Wed Jun 14 2023 peijiankang - 1.1.0-3 - Type:bugfix - CVE: -- Gitee