From e469326ed904d7b5db842181922d1b0c5d1acd7a Mon Sep 17 00:00:00 2001 From: s Date: Thu, 31 Aug 2023 11:16:46 +0800 Subject: [PATCH] fix clang build error --- 0002-fix-clang.patch | 13 +++++++++++++ kylin-recorder.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) 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..53c11b8 --- /dev/null +++ b/0002-fix-clang.patch @@ -0,0 +1,13 @@ +Binary files kylin-recorder-1.3.0/.git/index and kylin-recorder-1.3.0/.git/index differ +diff -u -r kylin-recorder-1.3.0/src/menumodule.cpp kylin-recorder-1.3.0/src/menumodule.cpp +--- kylin-recorder-1.3.0/src/menumodule.cpp 2021-12-27 11:36:58.000000000 +0800 ++++ kylin-recorder-1.3.0/src/menumodule.cpp 2023-08-31 11:14:08.000000000 +0800 +@@ -1,7 +1,7 @@ + #include "menumodule.h" + #include "mainwindow.h" + #include "xatom-helper.h" +-menuModule::menuModule(QWidget *parent = nullptr) : QWidget(parent) ++menuModule::menuModule(QWidget *parent) : QWidget(parent) + { + init(); + } diff --git a/kylin-recorder.spec b/kylin-recorder.spec index 6be9a1b..722eb66 100644 --- a/kylin-recorder.spec +++ b/kylin-recorder.spec @@ -1,11 +1,12 @@ Name: kylin-recorder Version: 1.3.0 -Release: 4 +Release: 5 Summary: kylin-recorder License: GPL-3.0-or-later URL: https://github.com/UbuntuKylin/kylin-recorder Source0: %{name}-%{version}.tar.gz Patch01: 0001-add-user-guide-for-kylin-recorder.patch +Patch02: 0002-fix-clang.patch BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtscript-devel @@ -40,6 +41,7 @@ kylin-recording %prep %setup -q %patch01 -p1 +%patch02 -p1 %build @@ -66,6 +68,9 @@ popd %{_datadir}/kylin-user-guide/data/guide/kylin-recorder %changelog +* Thu Aug 31 2023 yoo - 1.3.0-5 +- fix clang build error + * Wed Mar 22 2023 peijiankang - 1.3.0-4 - fix user-guide for kylin-recorder in English -- Gitee