已开启
fix clang build error #27
AtomGit-Bot创建于 2023年9月8日
fix clang build error #27
已开启
从refs/pull/27/head合入到master
共 2 个文件变更+21-3
| @@ -0,0 +1,12 @@ | |||
| 1 | +diff -u -r kylin-calculator-1.1.0/src/menumodule/menumodule.cpp kylin-calculator-1.1.0/src/menumodule/menumodule.cpp | ||
| 2 | +--- kylin-calculator-1.1.0/src/menumodule/menumodule.cpp 2022-03-31 15:50:21.000000000 +0800 | ||
| 3 | ++++ kylin-calculator-1.1.0/src/menumodule/menumodule.cpp 2023-06-15 23:45:53.000000000 +0800 | ||
| 4 | +@@ -20,7 +20,7 @@ | ||
| 5 | + #include "menumodule.h" | ||
| 6 | + #include "xatom-helper.h" | ||
| 7 | + | ||
| 8 | +-menuModule::menuModule(QWidget *parent = nullptr) : QWidget(parent) | ||
| 9 | ++menuModule::menuModule(QWidget *parent) : QWidget(parent) | ||
| 10 | + { | ||
| 11 | + init(); | ||
| 12 | + } | ||
| @@ -1,11 +1,12 @@ | |||
| 1 | Name: kylin-calculator | 1 | Name: kylin-calculator |
| 2 | Version: 1.1.0 | 2 | Version: 1.1.0 |
| 3 | -Release: 3 | 3 | +Release: 4 |
| 4 | Summary: Calculator tool for UKUI | 4 | Summary: Calculator tool for UKUI |
| 5 | License: LGPL-3.0-or-later and GPL-3.0-or-later | 5 | License: LGPL-3.0-or-later and GPL-3.0-or-later |
| 6 | URL: http://www.ukui.org | 6 | URL: http://www.ukui.org |
| 7 | Source0: %{name}-%{version}.tar.gz | 7 | Source0: %{name}-%{version}.tar.gz |
| 8 | Patch01: 0001-update-kylin-calculator.desktop.patch | 8 | Patch01: 0001-update-kylin-calculator.desktop.patch |
| 9 | +Patch02: 0002-fix-clang.patch | ||
| 9 | 10 | ||
| 10 | BuildRequires: qt5-qtbase-devel | 11 | BuildRequires: qt5-qtbase-devel |
| 11 | BuildRequires: qtchooser | 12 | BuildRequires: qtchooser |
| @@ -30,8 +31,7 @@ modes, with simple to use, friendly interface | |||
| 30 | and other advantages. | 31 | and other advantages. |
| 31 | 32 | ||
| 32 | %prep | 33 | %prep |
| 33 | -%setup -q | 34 | +%autosetup -p1 |
| 34 | -%patch01 -p1 | ||
| 35 | 35 | ||
| 36 | %build | 36 | %build |
| 37 | %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-calculator.pro | 37 | %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-calculator.pro |
| @@ -66,6 +66,12 @@ rm -rf $RPM_BUILD_ROOT | |||
| 66 | %{_datadir}/kylin-user-guide/data/guide/kylin-calculator/* | 66 | %{_datadir}/kylin-user-guide/data/guide/kylin-calculator/* |
| 67 | 67 | ||
| 68 | %changelog | 68 | %changelog |
| 69 | +* Fri Sep 08 2023 yoo <sunyuechi@iscas.ac.cn> - 1.1.0-4 | ||
| 70 | +- Type:bugfix | ||
| 71 | +- CVE: | ||
| 72 | +- SUG:NA | ||
| 73 | +- DESC: fix clang build error | ||
| 74 | + | ||
| 69 | * Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.0-3 | 75 | * Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.0-3 |
| 70 | - Type:bugfix | 76 | - Type:bugfix |
| 71 | - CVE: | 77 | - CVE: |