Compare commits
No commits in common. "cb04bda2799ead98bda33b31b643cc52fb05d651" and "093094b75aba41271eb9676a97506e3b68bef55d" have entirely different histories.
cb04bda279
...
093094b75a
@ -1,39 +0,0 @@
|
|||||||
From 560cf079f03b8b2ebb5ef03cd654a632b50553eb Mon Sep 17 00:00:00 2001
|
|
||||||
From: leeffo <leeffo@yeah.net>
|
|
||||||
Date: Wed, 16 Nov 2022 17:39:22 +0800
|
|
||||||
Subject: [PATCH] delete <proc/readproc.h>
|
|
||||||
|
|
||||||
---
|
|
||||||
src/process_tree.h | 2 +-
|
|
||||||
src/voice_record_process.h | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/process_tree.h b/src/process_tree.h
|
|
||||||
index b156911..32acff6 100755
|
|
||||||
--- a/src/process_tree.h
|
|
||||||
+++ b/src/process_tree.h
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
|
|
||||||
#include <QMap>
|
|
||||||
#include <QObject>
|
|
||||||
-#include <proc/readproc.h>
|
|
||||||
+//#include <proc/readproc.h>
|
|
||||||
#include <proc/sysinfo.h>
|
|
||||||
|
|
||||||
class ProcessTree : public QObject
|
|
||||||
diff --git a/src/voice_record_process.h b/src/voice_record_process.h
|
|
||||||
index c021f20..b17375c 100755
|
|
||||||
--- a/src/voice_record_process.h
|
|
||||||
+++ b/src/voice_record_process.h
|
|
||||||
@@ -9,7 +9,7 @@
|
|
||||||
#include <QProcess>
|
|
||||||
#include <QThread>
|
|
||||||
#include <QRect>
|
|
||||||
-#include <proc/readproc.h>
|
|
||||||
+//#include <proc/readproc.h>
|
|
||||||
#include <proc/sysinfo.h>
|
|
||||||
#include <QAudioProbe>
|
|
||||||
#include <QAudioRecorder>
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
52
Fix-build-failure-with-gcc-10.patch
Normal file
52
Fix-build-failure-with-gcc-10.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
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
|
||||||
|
|
||||||
|
---
|
||||||
|
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 <X11/Xlibint.h>
|
||||||
|
+// gcc 版本大于10时,取消min 宏定义
|
||||||
|
+#if __GNUC__ == 10
|
||||||
|
+#undef min
|
||||||
|
+#endif
|
||||||
|
#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
|
||||||
|
--- a/src/screen_shot_event.cpp
|
||||||
|
+++ b/src/screen_shot_event.cpp
|
||||||
|
@@ -1,5 +1,9 @@
|
||||||
|
#include "screen_shot_event.h"
|
||||||
|
#include <X11/Xlibint.h>
|
||||||
|
+// gcc 版本大于10时,取消min 宏定义
|
||||||
|
+#if __GNUC__ == 10
|
||||||
|
+#undef min
|
||||||
|
+#endif
|
||||||
|
#include <X11/Xutil.h>
|
||||||
|
#include <X11/cursorfont.h>
|
||||||
|
#include <X11/keysymdef.h>
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
Binary file not shown.
@ -1,53 +1,22 @@
|
|||||||
Name: deepin-screen-recorder
|
Name: deepin-screen-recorder
|
||||||
Version: 5.11.15
|
Version: 5.8.0.52
|
||||||
Release: 1
|
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: https://github.com/linuxdeepin/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
Source0: %{name}_%{version}.orig.tar.xz
|
||||||
Patch0: 0001-delete-proc-readproc.h.patch
|
Patch0: Fix-build-failure-with-gcc-10.patch
|
||||||
|
Patch1: modify-QPainterPath-error.patch
|
||||||
|
|
||||||
BuildRequires: qt5-devel
|
BuildRequires: gcc-c++ qt5-devel dtkwidget-devel dtkcore-devel procps-ng-devel
|
||||||
BuildRequires: dtkcore-devel
|
BuildRequires: pkgconfig(dframeworkdbus) pkgconfig(x11) pkgconfig(xext) pkgconfig(xtst) pkgconfig(xcb) pkgconfig(xcb-util) pkgconfig(xcursor)
|
||||||
BuildRequires: qt5-linguist
|
BuildRequires: desktop-file-utils libappstream-glib qt5-qtbase-private-devel
|
||||||
BuildRequires: dtkwidget-devel
|
|
||||||
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
|
|
||||||
BuildRequires: libusbx-devel
|
|
||||||
BuildRequires: gstreamer1-plugins-base-devel
|
|
||||||
BuildRequires: v4l-utils-devel
|
|
||||||
BuildRequires: systemd-devel
|
|
||||||
BuildRequires: ffmpeg-devel
|
|
||||||
BuildRequires: portaudio-devel
|
|
||||||
BuildRequires: ffmpegthumbnailer-devel
|
|
||||||
BuildRequires: libimagevisualresult-devel
|
|
||||||
Requires: byzanz
|
|
||||||
Requires: ffmpeg
|
|
||||||
Requires: hicolor-icon-theme
|
|
||||||
Requires: dbus
|
|
||||||
Requires: gstreamer1-plugins-good
|
|
||||||
Requires: deepin-turbo
|
|
||||||
Recommends: gstreamer1-plugins-ugly-free
|
|
||||||
|
|
||||||
|
Requires: byzanz ffmpeg
|
||||||
|
Requires: hicolor-icon-theme dbus deepin-turbo
|
||||||
|
|
||||||
|
Provides: deepin-screenshot
|
||||||
|
Obsoletes: deepin-screenshot
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{summary}.
|
%{summary}.
|
||||||
@ -55,51 +24,33 @@ Recommends: gstreamer1-plugins-ugly-free
|
|||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
sed -i 's|/lib|/%{_lib}|' src/dde-dock-plugins/recordtime/recordtime.pro
|
|
||||||
sed -i 's|/lib|/%{_lib}|' src/dde-dock-plugins/shotstart/shotstart.pro
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export PATH=%{_qt5_bindir}:$PATH
|
export PATH=%{_qt5_bindir}:$PATH
|
||||||
CFLAGS="${CFLAGS:-%optflags} -I/usr/include/ffmpeg"
|
mkdir build && pushd build
|
||||||
CXXFLAGS="${CXXFLAGS:-%optflags} -I/usr/include/ffmpeg"
|
%qmake_qt5 ../ VERSION=%{version} DEFINES+="VERSION=%{version}"
|
||||||
%qmake_qt5 PREFIX=%{_prefix}
|
|
||||||
%make_build
|
%make_build
|
||||||
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install INSTALL_ROOT=%{buildroot}
|
%make_install -C build INSTALL_ROOT="%buildroot"
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc README.md
|
%doc README.md
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
%{_bindir}/deepin-pin-screenshots
|
|
||||||
%{_datadir}/%{name}/
|
%{_datadir}/%{name}/
|
||||||
%{_datadir}/deepin-manual/manual-assets/application/%{name}/
|
%{_datadir}/dman/%{name}/
|
||||||
|
|
||||||
%{_datadir}/applications/%{name}.desktop
|
%{_datadir}/applications/%{name}.desktop
|
||||||
%{_datadir}/icons/hicolor/*/apps/%{name}.svg
|
%{_datadir}/icons/hicolor/*/apps/%{name}.svg
|
||||||
%{_datadir}/icons/hicolor/scalable/apps/deepin-screenshot.svg
|
|
||||||
%{_datadir}/dbus-1/services/com.deepin.ScreenRecorder.service
|
%{_datadir}/dbus-1/services/com.deepin.ScreenRecorder.service
|
||||||
%{_datadir}/dbus-1/services/com.deepin.PinScreenShots.service
|
|
||||||
%{_libdir}/dde-dock/plugins/libdeepin-screen-recorder-plugin.so
|
%{_sysconfdir}/modprobe.d/deepin-screen-recorder.conf
|
||||||
%{_libdir}/dde-dock/plugins/libshot-start-plugin.so
|
%{_sysconfdir}/modules-load.d/deepin-screen-recorder.conf
|
||||||
%{_datadir}/dbus-1/services/com.deepin.Screenshot.service
|
%{_datarootdir}/dbus-1/services/com.deepin.Screenshot.service
|
||||||
%{_datadir}/glib-2.0/schemas/com.deepin.dde.dock.module.shot-start-plugin.gschema.xml
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jul 25 2023 leeffo <liweiganga@uniontech.com> - 5.11.15-1
|
|
||||||
- upgrade to version 5.11.15
|
|
||||||
|
|
||||||
* Wed Nov 16 2022 liweiganga <liweiganga@uniontech.com> - 5.11.12-1
|
|
||||||
- update to 5.11.12
|
|
||||||
|
|
||||||
* Wed Aug 03 2022 liweiganga <liweiganga@uniontech.com> - 5.9.13-2
|
|
||||||
- modify installation dependency type
|
|
||||||
|
|
||||||
* 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
|
* Tue Feb 08 2022 liweigang <liweiganga@uniontech.com> - 5.8.0.52-3
|
||||||
- fix build error
|
- fix build error
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: github
|
|
||||||
src_repo: linuxdeepin/deepin-screen-recorder
|
|
||||||
tag_prefix: ^v
|
|
||||||
seperator: .
|
|
||||||
BIN
deepin-screen-recorder_5.8.0.52.orig.tar.xz
Normal file
BIN
deepin-screen-recorder_5.8.0.52.orig.tar.xz
Normal file
Binary file not shown.
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