Updated to 2.2.1

fix compilation errors on OpenEuler

Signed-off-by: kylinsecos_admin <gitee@kylinos.com.cn>
This commit is contained in:
kylinsecos_admin 2022-01-21 14:57:26 +08:00
parent f815a2cb0d
commit 8fa5dd0e14
4 changed files with 82 additions and 16 deletions

View File

@ -0,0 +1,64 @@
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

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: kiran-flameshot
Version: 0.6.0
Release: 4.kb14
Version: 2.2.1
Release: 1.kb2
# Main code: GPLv3
# Logo: Free Art License v1.3
@ -15,10 +15,7 @@ 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
#Kylin
#Patch01: 0001-Optimize-toolbar-add-toolbar-function-optimize-line--9c2875ef.patch
#Patch02: 0001-Repair-toolbar-tools-do-not-display-problems-and-the-67b76351.patch
#endkylin
Patch0: 0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Network)
@ -76,20 +73,25 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*.*
%changelog
* Thu Oct 14 2021 xiewenhao <xiewenhao@kylinos.com.cn> - 0.6.0-4.kb14
- KYOS-B: remove Requiers fcitx-qt5 (#43502)
* Wed Jan 26 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.1-1.kb2
- KYOS-B: fix compilation errors on OpenEuler
* Mon Jun 21 2021 pengyulong <pengyulong@kylinos.com.cn> - 0.6.0-4.kb13
- KYOS-B: Fix the prompt error and fix the full screen capture.(#39996)(#39997)
* Tue Jan 04 2022 pengyulong <pengyulong@kylinos.com.cn> - 2.2.1-1.kb1
- KYOS-F: Fix the blur tool display color and brush size modification bar.(#47629)
- KYOS-F: Change all file permissions to 0644, and sort out and classify all files.(#47629)
- Updated to version 2.2.1.
* Thu May 20 2021 longcheng <longcheng@kylinos.com.cn> - 0.6.0-4.kb12
- KYOS-B: Fix install problems in KY3.3-4 (#38372)
* Wed Dec 29 2021 kpkg <kpkg@kylinos.com.cn> - 0.6.0-5.kb1
- rebuild for KY3.4-MATE-modules-dev
* Thu May 13 2021 longcheng <longcheng@kylinos.com.cn> - 0.6.0-4.kb11
- KYOS-B: change the BuildRequires cmake(Qt5Svg) to pkgconfig(Qt5Svg) (#38372)
* Wed Dec 29 2021 caoyuanji<caoyuanji@kylinos.com.cn> - 0.6.0-5
- Upgrade version number for easy upgrade
* Tue May 11 2021 kpkg <kpkg@kylinos.com.cn> - 0.6.0-4.kb11
- rebuild for KY3.4-4
* Tue Dec 21 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 0.6.0-4.kb12
- rebuild for KY3.4-4-KiranUI-2.2
* Tue Dec 21 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 0.6.0-4.kb11
- rebuild for KY3.4-4-KiranUI-2.2
* Wed Apr 21 2021 pengyulong <pengyulong@kylinos.com.cn> - 0.6.0-4.kb10
- KYOS-B: Repair toolbar tools do not display problems and the resulting edge overlay problem.