From 7f690379cd30727ba4141dba2bab74120941c9e7 Mon Sep 17 00:00:00 2001 From: s Date: Thu, 31 Aug 2023 11:04:33 +0800 Subject: [PATCH] fix clang build error --- 0003-fix-clang.patch | 12 ++++++++++++ kylin-usb-creator.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 0003-fix-clang.patch diff --git a/0003-fix-clang.patch b/0003-fix-clang.patch new file mode 100644 index 0000000..062ad54 --- /dev/null +++ b/0003-fix-clang.patch @@ -0,0 +1,12 @@ +diff -u -r kylin-usb-creator-1.1.2/UIControl/src/include/menumodule.cpp kylin-usb-creator-1.1.2/UIControl/src/include/menumodule.cpp +--- kylin-usb-creator-1.1.2/UIControl/src/include/menumodule.cpp 2022-03-17 10:32:06.000000000 +0800 ++++ kylin-usb-creator-1.1.2/UIControl/src/include/menumodule.cpp 2023-08-31 11:02:28.000000000 +0800 +@@ -17,7 +17,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-usb-creator.spec b/kylin-usb-creator.spec index 4675992..c933313 100644 --- a/kylin-usb-creator.spec +++ b/kylin-usb-creator.spec @@ -1,12 +1,13 @@ Name: kylin-usb-creator Version: 1.1.2 -Release: 1 +Release: 2 Summary: kylin-usb-creator License: GPL-3+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz Patch01: 0001-fix-version-of-kylin-usb-creator.patch Patch02: 0002-add-kylin-user-guide-of-kylin-usb-creator.patch +Patch03: 0003-fix-clang.patch BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtscript-devel @@ -27,6 +28,7 @@ BuildRequires: ukui-interface %setup -q %patch01 -p1 %patch02 -p1 +%patch03 -p1 %build %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-usb-creator.pro @@ -62,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 31 2023 yoo - 1.1.2-2 +- fix clang build error + * Mon May 08 2023 peijiankang - 1.1.2-1 - update to upstream version 1.1.2