!33 Synchronize master branch, update to 1.0.5
From: @hua_yadong Reviewed-by: @dou33 Signed-off-by: @dou33
This commit is contained in:
commit
641ce38dcb
42
0001-fix-kylin-screenshot-not-work.patch
Normal file
42
0001-fix-kylin-screenshot-not-work.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From fc30d3083853ae169ec983459bb4db23421e3338 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Fri, 30 Dec 2022 15:02:23 +0800
|
||||
Subject: [PATCH] fix kylin-screenshot not work
|
||||
|
||||
---
|
||||
kylin-screenshot.pro | 11 +----------
|
||||
1 file changed, 1 insertion(+), 10 deletions(-)
|
||||
|
||||
diff --git a/kylin-screenshot.pro b/kylin-screenshot.pro
|
||||
index 471f9d1..37d73f0 100644
|
||||
--- a/kylin-screenshot.pro
|
||||
+++ b/kylin-screenshot.pro
|
||||
@@ -281,11 +281,7 @@ RESOURCES += \
|
||||
# installs
|
||||
unix:!macx {
|
||||
isEmpty(PREFIX) {
|
||||
- packaging {
|
||||
PREFIX = /usr
|
||||
- } else {
|
||||
- PREFIX = /usr/local
|
||||
- }
|
||||
}
|
||||
|
||||
DEFINES += APP_PREFIX=\\\"$$PREFIX\\\"
|
||||
@@ -314,12 +310,7 @@ unix:!macx {
|
||||
desktopentry.files = docs/desktopEntry/package/kylin-screenshot.desktop
|
||||
|
||||
servicedbus.path = $${PREFIX}/share/dbus-1/services/
|
||||
-
|
||||
- packaging {
|
||||
- servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service
|
||||
- } else {
|
||||
- servicedbus.files = dbus/make/org.dharkael.kylinscreenshot.service
|
||||
- }
|
||||
+ servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service
|
||||
|
||||
INSTALLS += target \
|
||||
icon \
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From e1632e6d4f5f2aeb995b56101251325bc4c04dd1 Mon Sep 17 00:00:00 2001
|
||||
From: tanyulong2021 <tanyulong@kylinos.cn>
|
||||
Date: Fri, 4 Mar 2022 15:53:31 +0800
|
||||
Subject: [PATCH] fxi screenshot not work
|
||||
|
||||
---
|
||||
kylin-screenshot.pro | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/kylin-screenshot.pro b/kylin-screenshot.pro
|
||||
index f372c46..3083cb4 100644
|
||||
--- a/kylin-screenshot.pro
|
||||
+++ b/kylin-screenshot.pro
|
||||
@@ -315,11 +315,7 @@ unix:!macx {
|
||||
|
||||
servicedbus.path = $${PREFIX}/share/dbus-1/services/
|
||||
|
||||
- packaging {
|
||||
- servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service
|
||||
- } else {
|
||||
- servicedbus.files = dbus/make/org.dharkael.kylinscreenshot.service
|
||||
- }
|
||||
+ servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service
|
||||
|
||||
INSTALLS += target \
|
||||
icon \
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Binary file not shown.
BIN
kylin-screenshot-1.0.5.tar.gz
Normal file
BIN
kylin-screenshot-1.0.5.tar.gz
Normal file
Binary file not shown.
@ -1,11 +1,12 @@
|
||||
%define debug_package %{nil}
|
||||
Name: kylin-screenshot
|
||||
Version: 1.0.3
|
||||
Release: 1
|
||||
Version: 1.0.5
|
||||
Release: 3
|
||||
Summary: a powerful screenshot and screen recording tool
|
||||
License: GPL-3+
|
||||
URL: https://github.com/ubuntukylin
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch01: 0001-fix-kylin-screenshot-not-work.patch
|
||||
|
||||
|
||||
BuildRequires: qt5-qtx11extras-devel
|
||||
BuildRequires: qt5-qtx11extras
|
||||
@ -23,10 +24,10 @@ BuildRequires: ffmpeg-devel
|
||||
BuildRequires: kf5-kwindowsystem-devel
|
||||
BuildRequires: kf5-kwindowsystem
|
||||
BuildRequires: gsettings-qt-devel
|
||||
BuildRequires: ukui-interface
|
||||
|
||||
Patch0: 0001-fxi-screenshot-not-work.patch
|
||||
|
||||
# Requires: NetworkManager
|
||||
Suggests: ca-certificates, openssl
|
||||
|
||||
|
||||
%description
|
||||
@ -39,7 +40,7 @@ Patch0: 0001-fxi-screenshot-not-work.patch
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch01 -p1
|
||||
|
||||
%build
|
||||
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-screenshot.pro
|
||||
@ -90,14 +91,47 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/metainfo/kylinscreenshot.appdata.xml
|
||||
|
||||
%changelog
|
||||
* Fri Mar 04 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.3-1
|
||||
- update upstream version 1.0.3
|
||||
* Mon Feb 06 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.5-3
|
||||
- add build debuginfo and debugsource
|
||||
|
||||
* Tue Feb 22 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.0-6
|
||||
- fix screenshot not show
|
||||
* Tue Jan 3 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.5-2
|
||||
- fix kylin-screenshot not work
|
||||
|
||||
* Fri Feb 10 2022 douyan <douyan@kylinos.cn> - 1.0.0-5
|
||||
- add BuildRequires pulseaudio-libs-devel
|
||||
* Mon Oct 24 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.5-1
|
||||
- update upstream version 1.0.5
|
||||
|
||||
* Wed Jul 13 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-15
|
||||
- change coloeFontWidget some ui options
|
||||
|
||||
* Wed Jul 13 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-14
|
||||
- pin windget windowIcon follow theme
|
||||
|
||||
* Mon Jul 11 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-13
|
||||
- add changelog for 1.0.1
|
||||
|
||||
* Wed Jun 29 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-12
|
||||
- change notify information about application name
|
||||
|
||||
* Wed Jun 29 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-11
|
||||
- change text property in time
|
||||
|
||||
* Tue Jun 28 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-10
|
||||
- change markertool opacity
|
||||
|
||||
* Tue Jun 28 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-9
|
||||
- fixed wayland cannot screenshot top widget
|
||||
|
||||
* Mon Jun 27 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-8
|
||||
- add log
|
||||
|
||||
* Fri Jun 24 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-7
|
||||
- change kylin-screenshot to screenshot
|
||||
|
||||
* Wed May 18 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.0-6
|
||||
- Improve the project according to the requirements of compliance improvement
|
||||
|
||||
* Tue Apr 12 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.0-5
|
||||
- add pulseaduio-libs-devel requires
|
||||
|
||||
* Wed Dec 8 2021 douyan <douyan@kylinos.cn> - 1.0.0-4
|
||||
- optimize the undo buttion function
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
version_control: github
|
||||
src_repo: UbuntuKylin/kylin-screenshot
|
||||
tag_prefix: "kylin-screenshot-"
|
||||
seperator: "."
|
||||
src_repo: https://github.com/UbuntuKylin/kylin-screenshot
|
||||
tag_prefix: "v"
|
||||
separator: "."
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user