packages/kylin-screenshot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!31 fix kylin-screenshot not work

Browse Source 
From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2023-01-04 06:47:43 +00:00 committed by Gitee
commit 6e5a441ed8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 87 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
0001-fix-kylin-screenshot-not-work.patch Normal file
View 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

83
kylin-screenshot.spec
View File

@ -1,11 +1,13 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: kylin-screenshot Name: kylin-screenshot
Version: 1.0.5 Version: 1.0.5
Release: 1 Release: 2
Summary: a powerful screenshot and screen recording tool Summary: a powerful screenshot and screen recording tool
License: GPL-3+ License: GPL-3+
URL: https://github.com/ubuntukylin URL: https://github.com/ubuntukylin
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch01: 0001-fix-kylin-screenshot-not-work.patch
BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtx11extras-devel
BuildRequires: qt5-qtx11extras BuildRequires: qt5-qtx11extras
@ -23,9 +25,10 @@ BuildRequires: ffmpeg-devel
BuildRequires: kf5-kwindowsystem-devel BuildRequires: kf5-kwindowsystem-devel
BuildRequires: kf5-kwindowsystem BuildRequires: kf5-kwindowsystem
BuildRequires: gsettings-qt-devel BuildRequires: gsettings-qt-devel
BuildRequires: ukui-interface
# Requires: NetworkManager Suggests: ca-certificates, openssl
%description %description
@ -38,10 +41,11 @@ BuildRequires: gsettings-qt-devel
%prep %prep
%setup -q %setup -q
%patch01 -p1
%build %build
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-screenshot.pro %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-screenshot.pro
%{make_build} %{make_build} -j4
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -51,43 +55,46 @@ make INSTALL_ROOT=%{buildroot} install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %files
/usr/local/bin/kylin-screenshot %{_bindir}/kylin-screenshot
/usr/local/share/applications/kylin-screenshot.desktop %{_datadir}/applications/kylin-screenshot.desktop
/usr/local/share/dbus-1/interfaces/org.dharkael.kylinscreenshot.xml %{_datadir}/dbus-1/interfaces/org.dharkael.kylinscreenshot.xml
/usr/local/share/dbus-1/services/org.dharkael.kylinscreenshot.service %{_datadir}/dbus-1/services/org.dharkael.kylinscreenshot.service
/usr/local/share/glib-2.0/schemas/org.ukui.screenshot.gschema.xml %{_datadir}/glib-2.0/schemas/org.ukui.screenshot.gschema.xml
/usr/local/share/icons/hicolor/128x128/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/128x128/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/128x128@2x/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/128x128@2x/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/16x16/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/16x16/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/16x16@2x/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/16x16@2x/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/24x24/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/24x24/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/256x256/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/256x256/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/256x256@2x/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/256x256@2x/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/32x32/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/32x32/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/32x32@2x/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/32x32@2x/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/48x48/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/48x48/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/48x48@2x/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/48x48@2x/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/64x64@2x/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/64x64@2x/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/96x96/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/96x96/apps/kylin-screenshot.png
/usr/local/share/icons/hicolor/96x96@2x/apps/kylin-screenshot.png %{_datadir}/icons/hicolor/96x96@2x/apps/kylin-screenshot.png
/usr/local/share/kylin-screenshot/translations/Internationalization_ca.qm %{_datadir}/kylin-screenshot/translations/Internationalization_ca.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_de_DE.qm %{_datadir}/kylin-screenshot/translations/Internationalization_de_DE.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_es.qm %{_datadir}/kylin-screenshot/translations/Internationalization_es.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_fr.qm %{_datadir}/kylin-screenshot/translations/Internationalization_fr.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_ja.qm %{_datadir}/kylin-screenshot/translations/Internationalization_ja.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_ka.qm %{_datadir}/kylin-screenshot/translations/Internationalization_ka.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_pl.qm %{_datadir}/kylin-screenshot/translations/Internationalization_pl.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_pt_br.qm %{_datadir}/kylin-screenshot/translations/Internationalization_pt_br.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_ru.qm %{_datadir}/kylin-screenshot/translations/Internationalization_ru.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_sk.qm %{_datadir}/kylin-screenshot/translations/Internationalization_sk.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_sr.qm %{_datadir}/kylin-screenshot/translations/Internationalization_sr.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_tr.qm %{_datadir}/kylin-screenshot/translations/Internationalization_tr.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_uk.qm %{_datadir}/kylin-screenshot/translations/Internationalization_uk.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_zh_CN.qm %{_datadir}/kylin-screenshot/translations/Internationalization_zh_CN.qm
/usr/local/share/kylin-screenshot/translations/Internationalization_zh_TW.qm %{_datadir}/kylin-screenshot/translations/Internationalization_zh_TW.qm
/usr/local/share/metainfo/kylinscreenshot.appdata.xml %{_datadir}/metainfo/kylinscreenshot.appdata.xml
%changelog %changelog
* Tue Jan 3 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.5-2
- fix kylin-screenshot not work
* Mon Oct 24 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.5-1 * Mon Oct 24 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.5-1
- update upstream version 1.0.5 - update upstream version 1.0.5