packages/peony-extensions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!13 sync

Browse Source 
From: @myshow2258
Reviewed-by: @dou33
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2021-01-28 17:12:03 +08:00 committed by Gitee
commit f5efaf1e2e
4 changed files with 273 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
0001-fix-peony-share-failed-issue.patch Normal file
View File

@ -0,0 +1,233 @@
diff -ur peony-extensions-3.0.1/peony-share/peony-share.pro peony-extensions-3.0.1~/peony-share/peony-share.pro
--- peony-extensions-3.0.1/peony-share/peony-share.pro 2019-05-27 15:48:18.000000000 +0800
+++ peony-extensions-3.0.1~/peony-share/peony-share.pro 2020-12-08 10:21:43.000000000 +0800
@@ -22,8 +22,8 @@
share-properties-page-plugin.h
TRANSLATIONS += translations/peony-share-extension_cs.ts \
- translations/peony-admin-extension_tr.ts \
- translations/peony-admin-extension_zh_CN.ts
+ translations/peony-share-extension_tr.ts \
+ translations/peony-share-extension_zh_CN.ts
RESOURCES += resources.qrc
diff -ur peony-extensions-3.0.1/peony-share/share-page.cpp peony-extensions-3.0.1~/peony-share/share-page.cpp
--- peony-extensions-3.0.1/peony-share/share-page.cpp 2019-05-27 15:48:18.000000000 +0800
+++ peony-extensions-3.0.1~/peony-share/share-page.cpp 2020-12-08 10:08:13.000000000 +0800
@@ -34,6 +34,7 @@
#include <QTextEdit>
#include <QDebug>
+#include <QMessageBox>
SharePage::SharePage(const QString &uri, QWidget *parent) : QWidget(parent)
{
@@ -125,6 +126,9 @@
add emblem info to peony-qt's tags(emblems) & cloumns extensions frameworks.
before do it, i have to implement that frameworks first...
*/
+ } else {
+ //when have errors like samba config has issue or other errors, m_share_info.isShared could be false and return a warning.
+ QMessageBox::information(nullptr,tr("Error"),tr("Share failed. Please check samba config."));
}
} else {
s->setVisible(false);
diff -ur peony-extensions-3.0.1/peony-share/translations/peony-share-extension_cs.ts peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_cs.ts
--- peony-extensions-3.0.1/peony-share/translations/peony-share-extension_cs.ts 2019-05-27 15:48:18.000000000 +0800
+++ peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_cs.ts 2020-12-08 10:58:55.000000000 +0800
@@ -11,12 +11,12 @@
<context>
<name>Peony::SharePropertiesPagePlugin</name>
<message>
- <location filename="../share-properties-page-plugin.h" line="26"/>
+ <location filename="../share-properties-page-plugin.h" line="48"/>
<source>Peony Qt Share Extension</source>
<translation>Rozšíření do Peony Qt pro správu sdílení</translation>
</message>
<message>
- <location filename="../share-properties-page-plugin.h" line="27"/>
+ <location filename="../share-properties-page-plugin.h" line="49"/>
<source>Allow user share folders</source>
<translation>Umožnit uživateli sdílet složku</translation>
</message>
@@ -24,29 +24,39 @@
<context>
<name>SharePage</name>
<message>
- <location filename="../share-page.cpp" line="50"/>
+ <location filename="../share-page.cpp" line="73"/>
<source>Share folder</source>
<translation>Sdílet složku</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="52"/>
+ <location filename="../share-page.cpp" line="75"/>
<source>Share:</source>
<translation>Zdroj:</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="58"/>
+ <location filename="../share-page.cpp" line="81"/>
<source>Read Only</source>
<translation>Pouze pro čtení</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="61"/>
+ <location filename="../share-page.cpp" line="84"/>
<source>Allow Anonymous</source>
<translation>Umožnit anonymní</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="73"/>
+ <location filename="../share-page.cpp" line="96"/>
<source>Comment:</source>
<translation>Komentář:</translation>
</message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Share failed. Please check samba config.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff -ur peony-extensions-3.0.1/peony-share/translations/peony-share-extension_tr.ts peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_tr.ts
--- peony-extensions-3.0.1/peony-share/translations/peony-share-extension_tr.ts 2019-05-27 15:48:18.000000000 +0800
+++ peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_tr.ts 2020-12-08 10:58:55.000000000 +0800
@@ -11,12 +11,12 @@
<context>
<name>Peony::SharePropertiesPagePlugin</name>
<message>
- <location filename="../share-properties-page-plugin.h" line="26"/>
+ <location filename="../share-properties-page-plugin.h" line="48"/>
<source>Peony Qt Share Extension</source>
<translation>Peony Qt Share Eklentisi</translation>
</message>
<message>
- <location filename="../share-properties-page-plugin.h" line="27"/>
+ <location filename="../share-properties-page-plugin.h" line="49"/>
<source>Allow user share folders</source>
<translation>Kullanıcı paylaşım klasörlerine izin ver</translation>
</message>
@@ -24,29 +24,39 @@
<context>
<name>SharePage</name>
<message>
- <location filename="../share-page.cpp" line="50"/>
+ <location filename="../share-page.cpp" line="73"/>
<source>Share folder</source>
<translation>Klasör paylaş</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="52"/>
+ <location filename="../share-page.cpp" line="75"/>
<source>Share:</source>
<translation>Paylaş:</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="58"/>
+ <location filename="../share-page.cpp" line="81"/>
<source>Read Only</source>
<translation>Sadece Okunabilir</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="61"/>
+ <location filename="../share-page.cpp" line="84"/>
<source>Allow Anonymous</source>
<translation>Herkese İzin Ver</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="73"/>
+ <location filename="../share-page.cpp" line="96"/>
<source>Comment:</source>
<translation>Yorum yap:</translation>
</message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Share failed. Please check samba config.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
二进制文件 peony-extensions-3.0.1/peony-share/translations/peony-share-extension_zh_CN.qm 和 peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_zh_CN.qm 不同
diff -ur peony-extensions-3.0.1/peony-share/translations/peony-share-extension_zh_CN.ts peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_zh_CN.ts
--- peony-extensions-3.0.1/peony-share/translations/peony-share-extension_zh_CN.ts 2019-05-27 15:48:18.000000000 +0800
+++ peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_zh_CN.ts 2020-12-08 11:04:22.000000000 +0800
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
+<TS version="2.1" language="zh_CN">
<context>
<name>NetUsershareHelper</name>
<message>
@@ -11,12 +11,12 @@
<context>
<name>Peony::SharePropertiesPagePlugin</name>
<message>
- <location filename="../share-properties-page-plugin.h" line="26"/>
+ <location filename="../share-properties-page-plugin.h" line="48"/>
<source>Peony Qt Share Extension</source>
<translation>共享</translation>
</message>
<message>
- <location filename="../share-properties-page-plugin.h" line="27"/>
+ <location filename="../share-properties-page-plugin.h" line="49"/>
<source>Allow user share folders</source>
<translation>允许共享文件夹</translation>
</message>
@@ -24,29 +24,39 @@
<context>
<name>SharePage</name>
<message>
- <location filename="../share-page.cpp" line="50"/>
+ <location filename="../share-page.cpp" line="73"/>
<source>Share folder</source>
<translation>共享文件夹</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="52"/>
+ <location filename="../share-page.cpp" line="75"/>
<source>Share:</source>
<translation>共享:</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="58"/>
+ <location filename="../share-page.cpp" line="81"/>
<source>Read Only</source>
<translation>只读</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="61"/>
+ <location filename="../share-page.cpp" line="84"/>
<source>Allow Anonymous</source>
<translation>允许游客访问</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="73"/>
+ <location filename="../share-page.cpp" line="96"/>
<source>Comment:</source>
<translation>注释:</translation>
</message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Share failed. Please check samba config.</source>
+ <translation>分享失败。请检查samba设置。</translation>
+ </message>
</context>
</TS>

BIN
peony-extensions-2.1.2.tar.gz
View File

Binary file not shown.

BIN
peony-extensions-3.0.1.tar.gz Normal file
View File

Binary file not shown.

58
peony-extensions.spec
View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: peony-extensions Name: peony-extensions
Version: 2.1.2 Version: 3.0.1
Release: 2 Release: 4
Summary: Peony qt extensions (common files) Summary: Peony qt extensions (common files)
License: LGPL-3.0+ License: LGPL-3.0+
URL: http://www.ukui.org URL: http://www.ukui.org
@ -14,16 +14,20 @@ BuildRequires: glib2-devel
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: qtchooser BuildRequires: qtchooser
BuildRequires: libpeony-dev BuildRequires: libpeony-dev
BuildRequires: libpeony2 #BuildRequires: libpeony3
BuildRequires: peony BuildRequires: peony
BuildRequires: poppler-qt5-devel BuildRequires: poppler-qt5-devel
BuildRequires: gsettings-qt-devel BuildRequires: gsettings-qt-devel
Requires: samba-common-tools Requires: samba-common-tools
Requires: samba Requires: samba
#Requires: engrampa Requires: engrampa
Requires: mate-terminal Requires: mate-terminal
Requires: libpeony2 Requires: libpeony3
Requires: qt5-qtimageformats
Requires: polkit
patch0: 0001-fix-peony-share-failed-issue.patch
%description %description
Peony is the official file manager for the UKUI desktop. This Peony is the official file manager for the UKUI desktop. This
@ -31,32 +35,50 @@ Requires: libpeony2
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
mkdir build && cd build export PATH=%{_qt5_bindir}:$PATH
cmake .. mkdir qmake-build
make pushd qmake-build
%{qmake_qt5} ..
%{make_build}
popd
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
pushd qmake-build
%{make_install} INSTALL_ROOT=%{buildroot}
popd
cd %{_builddir}/%{name}-%{version}/build
#make INSTALL_ROOT=/root/rpmbuild/BUILDROOT install
mkdir -p %{buildroot}/usr/lib/peony-qt-extensions
cp -rf %{_builddir}/%{name}-%{version}/peony-extensions-cmake/peony-qt-share/libpeony-qt-share.* %{buildroot}/usr/lib/peony-qt-extensions
cp -rf %{_builddir}/%{name}-%{version}/testdir/libpeony-qt-engrampa-menu-plugin.* %{buildroot}/usr/lib/peony-qt-extensions
cp -rf %{_builddir}/%{name}-%{version}/testdir/libpeony-qt-menu-plugin-mate-terminal.* %{buildroot}/usr/lib/peony-qt-extensions
cp -rf %{_builddir}/%{name}-%{version}/testdir/libpeony-qt-computer-view-plugin.so %{buildroot}/usr/lib/peony-qt-extensions
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post
%preun
%files %files
%doc debian/copyright debian/changelog %doc debian/copyright debian/changelog
%{_prefix}/lib/peony-qt-extensions %{_libdir}/peony-extensions
%{_prefix}/share/
%changelog %changelog
* Tue Dec 15 2020 douyan <douyan@kylinos.cn> - 3.0.1-4
- remove post script
* Mon Dec 14 2020 douyan <douyan@kylinos.cn> - 3.0.1-3
- fix samba configure issue
* Tue Dec 8 2020 douyan <douyan@kylinos.cn> - 3.0.1-2
- fix-peony-share-failed-issue
* Wed Nov 11 2020 douyan <douyan@kylinos.cn> - 3.0.1-1
- update to upstream version 3.0.0-1+1031.1
* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.0-1
- update to upstream version 3.0.0
* Tue Sep 22 2020 douyan <douyan@kylinos.cn> - 2.1.2-2 * Tue Sep 22 2020 douyan <douyan@kylinos.cn> - 2.1.2-2
- fix peony file share issue - fix peony file share issue