!29 fix some build warnings and possible integer overflows
From: @hou-hongxun Reviewed-by: @peijiankang Signed-off-by: @peijiankang
This commit is contained in:
commit
f2ad596849
@ -0,0 +1,30 @@
|
|||||||
|
From d3df65ab2644e1ebbf748a6cca541336b014a0ec Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
|
||||||
|
Date: Thu, 18 Apr 2024 16:17:04 +0800
|
||||||
|
Subject: [PATCH] kylin-calculator: fix some build warnings and possible
|
||||||
|
integer overflows
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
|
||||||
|
---
|
||||||
|
calc_programmer/calc/conversion.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/calc_programmer/calc/conversion.h b/calc_programmer/calc/conversion.h
|
||||||
|
index f15caf3..98f9d92 100644
|
||||||
|
--- a/calc_programmer/calc/conversion.h
|
||||||
|
+++ b/calc_programmer/calc/conversion.h
|
||||||
|
@@ -30,7 +30,7 @@
|
||||||
|
#define UNSIGNED_CHAR_MAX 255
|
||||||
|
#define UNSIGNED_INT_MAX 65535
|
||||||
|
#define UNSIGNED_LONG_MAX 4294967295
|
||||||
|
-#define UNSIGNED_LLONG_MAX 18446744073709551615
|
||||||
|
+#define UNSIGNED_LLONG_MAX 18446744073709551615ULL
|
||||||
|
|
||||||
|
#include <QList>
|
||||||
|
#include <QString>
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -1,11 +1,12 @@
|
|||||||
Name: kylin-calculator
|
Name: kylin-calculator
|
||||||
Version: 1.1.0
|
Version: 1.1.0
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Calculator tool for UKUI
|
Summary: Calculator tool for UKUI
|
||||||
License: LGPL-3.0-or-later and GPL-3.0-or-later
|
License: LGPL-3.0-or-later and GPL-3.0-or-later
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch01: 0001-update-kylin-calculator.desktop.patch
|
Patch01: 0001-update-kylin-calculator.desktop.patch
|
||||||
|
Patch02: 0001-kylin-calculator-fix-some-build-warnings-and-possibl.patch
|
||||||
|
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: qt5-qtbase-devel
|
||||||
BuildRequires: qtchooser
|
BuildRequires: qtchooser
|
||||||
@ -32,6 +33,7 @@ and other advantages.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch01 -p1
|
%patch01 -p1
|
||||||
|
%patch02 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-calculator.pro
|
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-calculator.pro
|
||||||
@ -66,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/kylin-user-guide/data/guide/kylin-calculator/*
|
%{_datadir}/kylin-user-guide/data/guide/kylin-calculator/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 18 2024 houhongxun <houhongxun@kylinos.cn> - 1.1.0-4
|
||||||
|
- fix some build warnings and possible integer overflows
|
||||||
|
|
||||||
* Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.0-3
|
* Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.0-3
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:
|
- CVE:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user