update version to 5.9.13

(cherry picked from commit 286ca9984ca7610f03a0aa67422dad17e878a65e)
2022-07-19 09:32:34 +08:00 · 2022-07-19 09:32:34 +08:00 · 4c450a6085
commit 4c450a6085
parent 093094b75a
6 changed files with 87 additions and 76 deletions
--- a/0001-Fix-build-failure-with-gcc-10.patch
+++ b/0001-Fix-build-failure-with-gcc-10.patch
@ -1,22 +1,20 @@
-From 3f17a452b635bae79ceff14a8a66cdf433fe8626 Mon Sep 17 00:00:00 2001
-From: weidong <weidong@uniontech.com>
-Date: Wed, 11 Aug 2021 13:57:28 +0800
-Subject: [PATCH] Fix build failure with gcc-10
+From 668d4917a443d5197bc3d26894ac5f0a0b62ff5c Mon Sep 17 00:00:00 2001
+From: loong_C <loong_c@yeah.net>
+Date: Wed, 20 Jul 2022 10:32:33 +0800
+Subject: [PATCH] Fix-build-failure-with-gcc-10

 ---
- src/event_monitor.cpp     | 7 ++++++-
+ src/event_monitor.cpp     | 4 ++++
 src/screen_shot_event.cpp | 4 ++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
+ 2 files changed, 8 insertions(+)

 diff --git a/src/event_monitor.cpp b/src/event_monitor.cpp
-index 2b72f18..95c4259 100755
+index 5fb2d83..caaab95 100755
 --- a/src/event_monitor.cpp
 +++ b/src/event_monitor.cpp
-@@ -22,14 +22,19 @@
-  */
+@@ -23,6 +23,10 @@
+ #include "keydefine.h"
 
- #include "event_monitor.h"
-+#include "keydefine.h"
 #include <X11/Xlibint.h>
 +// gcc 版本大于10时，取消min 宏定义
 +#if __GNUC__ == 10
@ -25,20 +23,13 @@ index 2b72f18..95c4259 100755
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <X11/keysymdef.h>
- #include <X11/keysym.h>
- #include <X11/extensions/XTest.h>
-#include "keydefine.h"
- #include <iostream>
-+#include <dlfcn.h>
- 
- EventMonitor::EventMonitor(QObject *parent) : QThread(parent)
- {
 diff --git a/src/screen_shot_event.cpp b/src/screen_shot_event.cpp
-index 05dfbb5..02e9ab8 100755
+index 2ff3134..28d1360 100755
 --- a/src/screen_shot_event.cpp
 +++ b/src/screen_shot_event.cpp
-@@ -1,5 +1,9 @@
- #include "screen_shot_event.h"
+@@ -23,6 +23,10 @@
+ #include "keydefine.h"
+ 
 #include <X11/Xlibint.h>
 +// gcc 版本大于10时，取消min 宏定义
 +#if __GNUC__ == 10
--- a/0002-modify-QPainterPath-error.patch
+++ b/0002-modify-QPainterPath-error.patch
@ -0,0 +1,24 @@
+From caad1908caff790a0aee2ebb47843af40b2ea7cc Mon Sep 17 00:00:00 2001
+From: loong_C <loong_c@yeah.net>
+Date: Wed, 20 Jul 2022 10:42:30 +0800
+Subject: [PATCH] modify-QPainterPath-error
+
+---
+ src/dde-dock-plugins/recordtime/timewidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dde-dock-plugins/recordtime/timewidget.cpp b/src/dde-dock-plugins/recordtime/timewidget.cpp
+index 977df67..935a1ec 100644
+--- a/src/dde-dock-plugins/recordtime/timewidget.cpp
+++ b/src/dde-dock-plugins/recordtime/timewidget.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include <QApplication>
+ #include <QPainter>
+#include <QPainterPath>
+ #include <QDebug>
+ #include <QMouseEvent>
+ #include <QPixmap>
+-- 
+2.20.1
+
--- a/deepin-screen-recorder.spec
+++ b/deepin-screen-recorder.spec
@ -1,22 +1,48 @@
 Name:           deepin-screen-recorder
-Version:        5.8.0.52
-Release:        3
+Version:        5.9.13
+Release:        1
 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
-Patch1:         modify-QPainterPath-error.patch
+Patch0:         0001-Fix-build-failure-with-gcc-10.patch
+Patch1:         0002-modify-QPainterPath-error.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)
-BuildRequires:  desktop-file-utils libappstream-glib qt5-qtbase-private-devel
+BuildRequires:  qt5-devel
+BuildRequires:  dtkcore-devel
+BuildRequires:  qt5-linguist
+BuildRequires:  dtkwidget-devel
+#BuildRequires:  pkgconfig(dtkwm)
+#BuildRequires:  pkgconfig(libprocps)
+BuildRequires:  procps-ng-devel
+BuildRequires:  qt5-qtmultimedia-devel
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5X11Extras)
+BuildRequires:  pkgconfig(dframeworkdbus)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xtst)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-util)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  desktop-file-utils
+BuildRequires:  libappstream-glib
+BuildRequires:  gcc-c++
+BuildRequires:  gcc
+BuildRequires:  dde-dock-devel
+BuildRequires:  qt5-qtbase-private-devel
+Requires:       byzanz
+Requires:       ffmpeg
+Requires:       hicolor-icon-theme
+Requires:       dbus
+Requires:       gstreamer1-plugins-good
+Requires:       gstreamer1-plugins-ugly-free
+Requires:       deepin-turbo

-Requires:       byzanz ffmpeg
-Requires:       hicolor-icon-theme dbus deepin-turbo
-
-Provides:       deepin-screenshot
-Obsoletes:      deepin-screenshot

 %description
 %{summary}.
@ -24,15 +50,15 @@ Obsoletes:      deepin-screenshot
 %prep
 %autosetup -p1

+sed -i 's|/lib|/%{_lib}|' src/dde-dock-plugins/recordtime/recordtime.pro
+
 %build
 export PATH=%{_qt5_bindir}:$PATH
-mkdir build && pushd build
-%qmake_qt5 ../ VERSION=%{version} DEFINES+="VERSION=%{version}"
+%qmake_qt5 PREFIX=%{_prefix}
 %make_build
-popd

 %install
-%make_install -C build INSTALL_ROOT="%buildroot"
+%make_install INSTALL_ROOT=%{buildroot}


 %files
@ -40,17 +66,20 @@ popd
 %license LICENSE
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_datadir}/dman/%{name}/
+%{_datadir}/deepin-manual/manual-assets/application/%{name}/

 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.svg
+%{_datadir}/icons/hicolor/scalable/apps/deepin-screenshot.svg
 %{_datadir}/dbus-1/services/com.deepin.ScreenRecorder.service
-
-%{_sysconfdir}/modprobe.d/deepin-screen-recorder.conf
-%{_sysconfdir}/modules-load.d/deepin-screen-recorder.conf
-%{_datarootdir}/dbus-1/services/com.deepin.Screenshot.service
+%{_libdir}/dde-dock/plugins/libdeepin-screen-recorder-plugin.so
+%{_sysconfdir}/due-shell/json/screenRecorder.json
+%{_datadir}/dbus-1/services/com.deepin.Screenshot.service

 %changelog
+* Tue Jul 19 2022 loong_C <loong_c@yeah.net> - 5.9.13-1
+- update to 5.9.13
+
 * Tue Feb 08 2022 liweigang <liweiganga@uniontech.com> - 5.8.0.52-3
 - fix build error

--- a/deepin-screen-recorder_5.8.0.52.orig.tar.xz
+++ b/deepin-screen-recorder_5.8.0.52.orig.tar.xz
--- a/deepin-screen-recorder_5.9.13.orig.tar.xz
+++ b/deepin-screen-recorder_5.9.13.orig.tar.xz
--- a/modify-QPainterPath-error.patch
+++ b/modify-QPainterPath-error.patch
@ -1,33 +0,0 @@
-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>