sync form 24.03-LTS

0001-kylin-calculator-fix-some-build-warnings-and-possibl.patch

@@ -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
+

fix-kylin-calculator-user-guide-error.patch

@@ -0,0 +1,24 @@
+diff -Naur kylin-calculator-1.1.0/data/guide/kylin-calculator/en_US/index.md kylin-calculator-1.1.0~/data/guide/kylin-calculator/en_US/index.md
+--- kylin-calculator-1.1.0/data/guide/kylin-calculator/en_US/index.md	2022-03-31 15:51:00.000000000 +0800
++++ kylin-calculator-1.1.0~/data/guide/kylin-calculator/en_US/index.md	2024-05-13 10:56:50.478144315 +0800
+@@ -5,7 +5,7 @@
+ 
+ ### Open mode
+ 
+-"Start menu"![](./image/1.png)>"Calculator" or "taskbar">"Search"![](image/2.png)>"Calculator"
++"Start menu">"Calculator" or "taskbar">"Search"![](image/2.png)>"Calculator"
+ 
+ ### Basic operation
+ 
+diff -Naur kylin-calculator-1.1.0/data/guide/kylin-calculator/zh_CN/index.md kylin-calculator-1.1.0~/data/guide/kylin-calculator/zh_CN/index.md
+--- kylin-calculator-1.1.0/data/guide/kylin-calculator/zh_CN/index.md	2022-03-31 15:51:00.000000000 +0800
++++ kylin-calculator-1.1.0~/data/guide/kylin-calculator/zh_CN/index.md	2024-05-13 10:56:42.382095696 +0800
+@@ -5,7 +5,7 @@
+ 
+ ### 打开方式
+ 
+-“开始菜单”![](image/1.png)>“计算器”或“任务栏”>“搜索”![](image/2.png)>“计算器”
++“开始菜单”>“计算器”或“任务栏”>“搜索”![](image/2.png)>“计算器”
+ 
+ ### 基本操作
+ 

kylin-calculator.spec

@@ -1,11 +1,13 @@
 Name:           kylin-calculator
 Version:        1.1.0
-Release:        3
+Release:        5
 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:	    0001-kylin-calculator-fix-some-build-warnings-and-possibl.patch
+Patch03:	    fix-kylin-calculator-user-guide-error.patch
 
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qtchooser
@@ -30,8 +32,7 @@ modes, with simple to use, friendly interface
 and other advantages.
 
 %prep
-%setup -q
+%autosetup -n %{name}-%{version} -p1
-%patch01 -p1
 
 %build
 %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default  kylin-calculator.pro
@@ -66,6 +67,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kylin-user-guide/data/guide/kylin-calculator/*
 
 %changelog
+* Mon May 13 2024 douyan <douyan@kylinos.cn> - 1.1.0-5
+- add fix-kylin-calculator-user-guide-error.patch
+
+* 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
 - Type:bugfix
 - CVE: