!3 fix build error
From: @ll3366 Reviewed-by: @weidongkl Signed-off-by: @weidongkl
This commit is contained in:
commit
093094b75a
@ -1,15 +1,16 @@
|
|||||||
Name: deepin-screen-recorder
|
Name: deepin-screen-recorder
|
||||||
Version: 5.8.0.52
|
Version: 5.8.0.52
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Deepin Screen Recorder
|
Summary: Deepin Screen Recorder
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://github.com/linuxdeepin/deepin-screen-recorder
|
URL: https://github.com/linuxdeepin/deepin-screen-recorder
|
||||||
Source0: %{name}_%{version}.orig.tar.xz
|
Source0: %{name}_%{version}.orig.tar.xz
|
||||||
Patch0: Fix-build-failure-with-gcc-10.patch
|
Patch0: Fix-build-failure-with-gcc-10.patch
|
||||||
|
Patch1: modify-QPainterPath-error.patch
|
||||||
|
|
||||||
BuildRequires: gcc-c++ qt5-devel dtkwidget-devel dtkcore-devel procps-ng-devel
|
BuildRequires: gcc-c++ qt5-devel dtkwidget-devel dtkcore-devel procps-ng-devel
|
||||||
BuildRequires: pkgconfig(dframeworkdbus) pkgconfig(x11) pkgconfig(xext) pkgconfig(xtst) pkgconfig(xcb) pkgconfig(xcb-util) pkgconfig(xcursor)
|
BuildRequires: pkgconfig(dframeworkdbus) pkgconfig(x11) pkgconfig(xext) pkgconfig(xtst) pkgconfig(xcb) pkgconfig(xcb-util) pkgconfig(xcursor)
|
||||||
BuildRequires: desktop-file-utils libappstream-glib
|
BuildRequires: desktop-file-utils libappstream-glib qt5-qtbase-private-devel
|
||||||
|
|
||||||
Requires: byzanz ffmpeg
|
Requires: byzanz ffmpeg
|
||||||
Requires: hicolor-icon-theme dbus deepin-turbo
|
Requires: hicolor-icon-theme dbus deepin-turbo
|
||||||
@ -50,6 +51,9 @@ popd
|
|||||||
%{_datarootdir}/dbus-1/services/com.deepin.Screenshot.service
|
%{_datarootdir}/dbus-1/services/com.deepin.Screenshot.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 08 2022 liweigang <liweiganga@uniontech.com> - 5.8.0.52-3
|
||||||
|
- fix build error
|
||||||
|
|
||||||
* Wed Aug 11 2021 weidong <weidong@uniontech.com> - 5.8.0.52-2
|
* Wed Aug 11 2021 weidong <weidong@uniontech.com> - 5.8.0.52-2
|
||||||
- Fix build failure with gcc-10.
|
- Fix build failure with gcc-10.
|
||||||
|
|
||||||
|
|||||||
33
modify-QPainterPath-error.patch
Normal file
33
modify-QPainterPath-error.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
diff --color -Naur a/src/utils.cpp b/src/utils.cpp
|
||||||
|
--- a/src/utils.cpp 2022-02-08 14:08:43.636030491 +0800
|
||||||
|
+++ b/src/utils.cpp 2022-02-08 14:09:31.072168635 +0800
|
||||||
|
@@ -27,6 +27,7 @@
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QFontMetrics>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QDBusInterface>
|
||||||
|
#include <QtX11Extras/QX11Info>
|
||||||
|
#include <X11/extensions/shape.h>
|
||||||
|
diff --color -Naur a/src/widgets/shapeswidget.cpp b/src/widgets/shapeswidget.cpp
|
||||||
|
--- a/src/widgets/shapeswidget.cpp 2022-02-08 14:08:43.644030514 +0800
|
||||||
|
+++ b/src/widgets/shapeswidget.cpp 2022-02-08 14:10:40.828372491 +0800
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
#include "shapeswidget.h"
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
|
#include "../utils/calculaterect.h"
|
||||||
|
diff --color -Naur a/src/widgets/tooltips.cpp b/src/widgets/tooltips.cpp
|
||||||
|
--- a/src/widgets/tooltips.cpp 2022-02-08 14:08:43.644030514 +0800
|
||||||
|
+++ b/src/widgets/tooltips.cpp 2022-02-08 14:10:07.160273998 +0800
|
||||||
|
@@ -33,6 +33,7 @@
|
||||||
|
#include <QHBoxLayout>
|
||||||
|
#include <QLabel>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QGraphicsDropShadowEffect>
|
||||||
|
#include <QPropertyAnimation>
|
||||||
|
#include <QGraphicsOpacityEffect>
|
||||||
Loading…
x
Reference in New Issue
Block a user