!9 update to 2.2.2 from master

From: @yuan__xing 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02

0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch

@@ -1,64 +0,0 @@
-From 8cd5a1483f08aab72e8638e98558968863bdb493 Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Tue, 25 Jan 2022 20:14:23 +0800
-Subject: [PATCH] fix(build): fix  incomplete type 'class QPainterPath' build 
- error
-
----
- src/third-party/Qt-Color-Widgets/src/color_wheel.cpp | 1 +
- src/tools/arrow/arrowtool.cpp                        | 1 +
- src/widgets/capture/capturewidget.h                  | 1 +
- src/widgets/capture/formtip.cpp                      | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp
-index 335b29c..222a7eb 100644
---- a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp
-+++ b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp
-@@ -28,6 +28,7 @@
- #include <QDragEnterEvent>
- #include <QMimeData>
- #include "color_utils.hpp"
-+#include <QPainterPath>
- 
- namespace color_widgets {
- 
-diff --git a/src/tools/arrow/arrowtool.cpp b/src/tools/arrow/arrowtool.cpp
-index 8037b1a..c9e6737 100644
---- a/src/tools/arrow/arrowtool.cpp
-+++ b/src/tools/arrow/arrowtool.cpp
-@@ -17,6 +17,7 @@
- 
- #include "arrowtool.h"
- #include <QDebug>
-+#include <QPainterPath>
- 
- namespace {
- 
-diff --git a/src/widgets/capture/capturewidget.h b/src/widgets/capture/capturewidget.h
-index 0cc148a..79246e4 100644
---- a/src/widgets/capture/capturewidget.h
-+++ b/src/widgets/capture/capturewidget.h
-@@ -47,6 +47,7 @@
- #include <QHBoxLayout>
- #include <QStackedWidget>
- #include <QLabel>
-+#include <QPainterPath>
- 
- 
- 
-diff --git a/src/widgets/capture/formtip.cpp b/src/widgets/capture/formtip.cpp
-index f3de166..27a6d29 100644
---- a/src/widgets/capture/formtip.cpp
-+++ b/src/widgets/capture/formtip.cpp
-@@ -2,6 +2,7 @@
- 
- #include <QPainter>
- #include <QMouseEvent>
-+#include <QPainterPath>
- 
- FormTip::FormTip(QWidget *parent) : QWidget(parent)
- {
--- 
-2.33.0
-

kiran-flameshot.spec

@@ -1,6 +1,6 @@
 Name: kiran-flameshot
-Version: 2.2.1
+Version: 2.2.2
-Release: 1.kb2
+Release: 2
 
 # Main code: GPLv3
 # Logo: Free Art License v1.3
@@ -9,13 +9,12 @@ Release: 1.kb2
 # regiongrabber.cpp: LGPL
 # Qt-Color-Widgets: LGPL/GPL
 # More information: https://github.com/lupoDharkael/flameshot#license
-License: GPLv3+ and ASL 2.0 and GPLv2 and LGPLv3 and Free Art
+License: GPL-3.0-only
 Summary: Powerful and simple to use screenshot software
 
 URL: https://github.com/lupoDharkael/flameshot
 Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-Patch0:  0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch
 
 BuildRequires: pkgconfig(Qt5Widgets)
 BuildRequires: pkgconfig(Qt5Network)
@@ -29,7 +28,11 @@ BuildRequires: libappstream-glib
 BuildRequires: qt5-linguist
 BuildRequires: gcc-c++
 BuildRequires: gcc
+BuildRequires: kiran-log-qt5-devel
+BuildRequires: kiran-qt5-integration-devel
 
+Requires: kiran-qt5-integration
+Requires: kiran-log-qt5
 Requires: hicolor-icon-theme
 Requires: qt5-qtsvg%{?_isa}
 
@@ -73,6 +76,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/*.*
 
 %changelog
+* Thu Aug 04 2022 luoqing <luoqing@kylinsec.com.cn> - 2.2.2-2
+- KYOS-F: Modify license
+- KYOS-F: Add yaml file 
+
+* Thu Aug 04 2022 luoqing <luoqing@kylinsec.com.cn> - 2.2.2-1
+- KYOS-B: To modify settings, the undo button is turned on by default and the redo last modification button is turned off (#I5IFM8)
+- KYOS-B: Fix launcher theme colors and translations  (#I5GYNH)
+- KYOS-B: Temporarily specify the color of the option menu of the screenshot interface under the dark theme (#I5IBR3)
+
 * Wed Jan 26 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.1-1.kb2
 - KYOS-B: fix compilation errors on OpenEuler 
 

kiran-flameshot.yaml

@@ -0,0 +1,4 @@
+version_control: gitee
+src_repo: https://gitee.com/openeuler/kiran-flameshot.git
+tag_prefix: "v"
+seperator: "."