fix share error of peony
(cherry picked from commit 2acc50a893c9e5599500db4f52b5324a12c42422)
This commit is contained in:
parent
7a049a47e7
commit
a91d1dbc1e
28
0001-fix-share-error-of-peony.patch
Normal file
28
0001-fix-share-error-of-peony.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From cd35751b5c23c0ed0b2e81026619fd2750ad19d9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: peijiankang <peijiankang@kylinos.cn>
|
||||||
|
Date: Tue, 6 Jun 2023 17:26:46 +0800
|
||||||
|
Subject: [PATCH] fix share error of peony
|
||||||
|
|
||||||
|
---
|
||||||
|
libpeony-qt/usershare-manager.cpp | 5 +++--
|
||||||
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libpeony-qt/usershare-manager.cpp b/libpeony-qt/usershare-manager.cpp
|
||||||
|
index 48c719d..0849dc7 100644
|
||||||
|
--- a/libpeony-qt/usershare-manager.cpp
|
||||||
|
+++ b/libpeony-qt/usershare-manager.cpp
|
||||||
|
@@ -84,8 +84,9 @@ QString UserShareInfoManager::exectueCommand (QStringList& args, bool* retb /* o
|
||||||
|
proc.open();
|
||||||
|
|
||||||
|
// Check whether sambashare exists and contains the current user
|
||||||
|
- QProcess::execute ("bash pkexec /usr/bin/peony-share.sh", QStringList() << g_get_user_name () << sharedPath);
|
||||||
|
-
|
||||||
|
+ QString cmdtest = QString("pkexec /usr/bin/peony-share.sh %1 %2").arg(g_get_user_name()).arg(sharedPath);
|
||||||
|
+ QProcess::execute (cmdtest);
|
||||||
|
+
|
||||||
|
// Shared folder
|
||||||
|
args.prepend ("net");
|
||||||
|
proc.start("bash");
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,10 +1,11 @@
|
|||||||
Name: peony
|
Name: peony
|
||||||
Version: 3.10.0
|
Version: 3.10.0
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: file Manager for the UKUI desktop
|
Summary: file Manager for the UKUI desktop
|
||||||
License: GPL-3.0-or-later and MIT and BSD-3-Clause
|
License: GPL-3.0-or-later and MIT and BSD-3-Clause
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
|
Patch01: 0001-fix-share-error-of-peony.patch
|
||||||
|
|
||||||
BuildRequires: libudisks2-devel
|
BuildRequires: libudisks2-devel
|
||||||
BuildRequires: libnotify-devel
|
BuildRequires: libnotify-devel
|
||||||
@ -77,6 +78,7 @@ Provides: libpeony
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch01 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{qmake_qt5}
|
%{qmake_qt5}
|
||||||
@ -133,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_prefix}/%{_lib}/*.so
|
%{_prefix}/%{_lib}/*.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 06 2023 peijiankang <peijiankang@kylinos.cn> - 3.10.0-3
|
||||||
|
- fix share error of peony
|
||||||
|
|
||||||
* Tue Feb 07 2023 peijiankang <peijiankang@kylinos.cn> - 3.10.0-2
|
* Tue Feb 07 2023 peijiankang <peijiankang@kylinos.cn> - 3.10.0-2
|
||||||
- add build debuginfo and debugsource
|
- add build debuginfo and debugsource
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user