From 052d6d36fcd09e5f93e6727a2e753641e20df26f Mon Sep 17 00:00:00 2001 From: weidong Date: Wed, 11 Aug 2021 14:25:26 +0800 Subject: [PATCH] Fix build failure with gcc-10 --- Fix-build-failure-with-gcc-10.patch | 52 +++++++++++++++++++++++++++++ deepin-screen-recorder.spec | 8 +++-- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 Fix-build-failure-with-gcc-10.patch diff --git a/Fix-build-failure-with-gcc-10.patch b/Fix-build-failure-with-gcc-10.patch new file mode 100644 index 0000000..4f36a24 --- /dev/null +++ b/Fix-build-failure-with-gcc-10.patch @@ -0,0 +1,52 @@ +From 3f17a452b635bae79ceff14a8a66cdf433fe8626 Mon Sep 17 00:00:00 2001 +From: weidong +Date: Wed, 11 Aug 2021 13:57:28 +0800 +Subject: [PATCH] Fix build failure with gcc-10 + +--- + src/event_monitor.cpp | 7 ++++++- + src/screen_shot_event.cpp | 4 ++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/event_monitor.cpp b/src/event_monitor.cpp +index 2b72f18..95c4259 100755 +--- a/src/event_monitor.cpp ++++ b/src/event_monitor.cpp +@@ -22,14 +22,19 @@ + */ + + #include "event_monitor.h" ++#include "keydefine.h" + #include ++// gcc 版本大于10时,取消min 宏定义 ++#if __GNUC__ == 10 ++#undef min ++#endif + #include + #include + #include + #include + #include +-#include "keydefine.h" + #include ++#include + + EventMonitor::EventMonitor(QObject *parent) : QThread(parent) + { +diff --git a/src/screen_shot_event.cpp b/src/screen_shot_event.cpp +index 05dfbb5..02e9ab8 100755 +--- a/src/screen_shot_event.cpp ++++ b/src/screen_shot_event.cpp +@@ -1,5 +1,9 @@ + #include "screen_shot_event.h" + #include ++// gcc 版本大于10时,取消min 宏定义 ++#if __GNUC__ == 10 ++#undef min ++#endif + #include + #include + #include +-- +2.20.1 + diff --git a/deepin-screen-recorder.spec b/deepin-screen-recorder.spec index 6dee26c..d4b6bf5 100644 --- a/deepin-screen-recorder.spec +++ b/deepin-screen-recorder.spec @@ -1,10 +1,11 @@ Name: deepin-screen-recorder Version: 5.8.0.52 -Release: 1 +Release: 2 Summary: Deepin Screen Recorder License: GPLv3+ URL: https://github.com/linuxdeepin/deepin-screen-recorder Source0: %{name}_%{version}.orig.tar.xz +Patch0: Fix-build-failure-with-gcc-10.patch 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) @@ -20,7 +21,7 @@ Obsoletes: deepin-screenshot %{summary}. %prep -%autosetup +%autosetup -p1 %build export PATH=%{_qt5_bindir}:$PATH @@ -49,5 +50,8 @@ popd %{_datarootdir}/dbus-1/services/com.deepin.Screenshot.service %changelog +* Wed Aug 11 2021 weidong - 5.8.0.52-2 +- Fix build failure with gcc-10. + * Sat May 08 2021 weidong - 5.8.0.52-1 - Initial package. -- Gitee