Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
015e4573b1
!40 Fix build on riscv64
From: @misaka00251 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
2024-04-23 14:19:25 +00:00
misaka00251
19e573598d
Fix build on riscv64 2024-04-23 16:33:49 +08:00
openeuler-ci-bot
41a8f28794
!39 fix build error
From: @lliuzhi 
Reviewed-by: @ut-layne-yang 
Signed-off-by: @ut-layne-yang
2024-04-18 02:57:45 +00:00
liuzhilin
2840de40fa fix build error 2024-04-18 10:03:02 +08:00
openeuler-ci-bot
f973f117dc
!31 [sync] PR-30: upgrade to version 5.7.8.1
From: @openeuler-sync-bot 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
2023-08-23 08:20:28 +00:00
leeffo
25b4b5362c upgrade to version 5.7.8.1
(cherry picked from commit e3eef34d866a202d5f787c42adf6e6a85f9f4e81)
2023-08-16 09:17:39 +08:00
openeuler-ci-bot
2a2cc5d726
!27 update to 5.2.63
From: @leeffo 
Reviewed-by: @HelloWorld_lvcongqing 
Signed-off-by: @HelloWorld_lvcongqing
2023-04-07 09:38:51 +00:00
liweiganga
0d9b920dd9 update: update to 5.2.63 2023-04-04 15:05:30 +08:00
openeuler-ci-bot
1eaa437cb1
!26 fix build errors
From: @leeffo 
Reviewed-by: @panchenbo 
Signed-off-by: @panchenbo
2022-11-30 02:37:00 +00:00
liweiganga
dcdab4f3ac add BR:pcre-devel 2022-11-11 16:56:27 +08:00
6 changed files with 165 additions and 40 deletions

View File

@ -0,0 +1,67 @@
From 30420e17378d6c2b2b557fd53e973f5a8ad8ad8d Mon Sep 17 00:00:00 2001
From: liuzhilin <liuzhilin@uniontech.com>
Date: Thu, 18 Apr 2024 09:58:54 +0800
Subject: [PATCH] fix-build-error
---
src/dde-desktop/data/applications/dde-computer.desktop | 2 +-
src/dde-desktop/data/applications/dde-home.desktop | 2 +-
src/dde-desktop/data/applications/dde-trash.desktop | 2 +-
src/dde-file-manager/mips/dde-file-manager.desktop | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/dde-desktop/data/applications/dde-computer.desktop b/src/dde-desktop/data/applications/dde-computer.desktop
index 7a2ff03..b8f6c5f 100644
--- a/src/dde-desktop/data/applications/dde-computer.desktop
+++ b/src/dde-desktop/data/applications/dde-computer.desktop
@@ -5,7 +5,7 @@ Exec=gio open computer:///
GenericName=Computer
Icon=computer
Name=Computer
-OnlyShowIn=Deepin;
+##OnlyShowIn=Deepin;
Terminal=false
Type=Application
X-AppStream-Ignore=true
diff --git a/src/dde-desktop/data/applications/dde-home.desktop b/src/dde-desktop/data/applications/dde-home.desktop
index 0c0f35c..1a37a47 100644
--- a/src/dde-desktop/data/applications/dde-home.desktop
+++ b/src/dde-desktop/data/applications/dde-home.desktop
@@ -6,7 +6,7 @@ GenericName=Home
Icon=user-home
Name=Home
NoDisplay=true
-OnlyShowIn=Deepin;
+##OnlyShowIn=Deepin;
Terminal=false
Type=Application
X-AppStream-Ignore=true
diff --git a/src/dde-desktop/data/applications/dde-trash.desktop b/src/dde-desktop/data/applications/dde-trash.desktop
index f2524b6..c7b0c01 100644
--- a/src/dde-desktop/data/applications/dde-trash.desktop
+++ b/src/dde-desktop/data/applications/dde-trash.desktop
@@ -5,7 +5,7 @@ Exec=gio open trash:///
GenericName=Open Trash.
Icon=user-trash
Name=Trash
-OnlyShowIn=Deepin;
+##OnlyShowIn=Deepin;
Terminal=false
Type=Application
X-AppStream-Ignore=true
diff --git a/src/dde-file-manager/mips/dde-file-manager.desktop b/src/dde-file-manager/mips/dde-file-manager.desktop
index 259d50e..4213f23 100644
--- a/src/dde-file-manager/mips/dde-file-manager.desktop
+++ b/src/dde-file-manager/mips/dde-file-manager.desktop
@@ -7,7 +7,7 @@ GenericName=File Manager
Icon=dde-file-manager
MimeType=inode/directory;
Name=Deepin File Manager
-OnlyShowIn=Deepin;
+##OnlyShowIn=Deepin;
StartupNotify=false
Terminal=false
Type=Application
--
2.39.3

View File

@ -1,30 +1,26 @@
From b791b385720b4ecac58cd0771e32f8606dbe9e3b Mon Sep 17 00:00:00 2001
From: loong ci <loong_c@yeah.net>
Date: Fri, 5 Aug 2022 09:55:37 +0800
From fca58228ea9d31e01dd6e24bee944cebf7df9622 Mon Sep 17 00:00:00 2001
From: leeffo <liweiganga@uniontech.com>
Date: Wed, 2 Aug 2023 14:13:35 +0800
Subject: [PATCH] hide authorized watermask
---
src/dde-desktop/view/watermaskframe.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
src/dde-desktop/view/watermaskframe.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/dde-desktop/view/watermaskframe.cpp b/src/dde-desktop/view/watermaskframe.cpp
index 45efe3a..c6bd12e 100644
index e36d97b..2d0e72a 100644
--- a/src/dde-desktop/view/watermaskframe.cpp
+++ b/src/dde-desktop/view/watermaskframe.cpp
@@ -341,9 +341,10 @@ void WaterMaskFrame::initUI()
bool WaterMaskFrame::isNeedState()
{
DSysInfo::DeepinType deepinType = DSysInfo::deepinType();
- return (DSysInfo::DeepinType::DeepinProfessional == deepinType
- || DSysInfo::DeepinType::DeepinPersonal == deepinType
- || DSysInfo::DeepinType::DeepinServer == deepinType );
+ //return (DSysInfo::DeepinType::DeepinProfessional == deepinType
+ // || DSysInfo::DeepinType::DeepinPersonal == deepinType
+ // || DSysInfo::DeepinType::DeepinServer == deepinType );
+ return 0;
}
@@ -98,7 +98,8 @@ void WaterMaskFrame::stateChanged(int state, int prop)
return;
}
bool WaterMaskFrame::parseJson(QString key)
- bool showSate = showLicenseState();
+ //bool showSate = showLicenseState();
+ bool showSate = 0;
bool cn = usingCn();
qInfo() << "reply ActiveState is" << state << prop << "show" << showSate
<< "cn" << cn << this;
--
2.20.1

View File

@ -0,0 +1,37 @@
From 340b1be4850c8316ee858f597bcb729363f142b7 Mon Sep 17 00:00:00 2001
From: leeffo <liweiganga@uniontech.com>
Date: Thu, 3 Aug 2023 10:15:30 +0800
Subject: [PATCH] fix undefined std::array
---
.../dialogs/private/ddesktoprenamedialog_p.h | 1 +
src/dde-file-manager-lib/views/drenamebar.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h b/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h
index 80c5c20..f018762 100644
--- a/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h
+++ b/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h
@@ -23,6 +23,7 @@
#ifndef DDESKTOPRENAMEDIALOG_P_H
#define DDESKTOPRENAMEDIALOG_P_H
+#include <array>
#include <QString>
#include <QLineEdit>
#include <QLabel>
diff --git a/src/dde-file-manager-lib/views/drenamebar.h b/src/dde-file-manager-lib/views/drenamebar.h
index 45f3b09..b59fa8f 100644
--- a/src/dde-file-manager-lib/views/drenamebar.h
+++ b/src/dde-file-manager-lib/views/drenamebar.h
@@ -26,6 +26,7 @@
#define DRENAMEBAR_H
+#include <array>
#include <QList>
#include <QFrame>
#include <memory>
--
2.20.1

View File

@ -1,24 +1,19 @@
%define specrelease 8%{?dist}
%if 0%{?openeuler}
%define specrelease 4
%endif
Name: dde-file-manager
Version: 5.2.39
Release: %{specrelease}
Version: 5.7.8.1
Release: 3
Summary: Deepin File Manager
License: GPLv3
URL: https://github.com/linuxdeepin/dde-file-manager
Source0: %{name}_%{version}.orig.tar.xz
Patch0: 0001-hide-authorized-watermask.patch
Patch1: 0002-fix-undefined-std-array.patch
Patch2: 0001-fix-build-error.patch
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: deepin-gettext-tools
BuildRequires: dde-dock-devel
BuildRequires: file-devel
#BuildRequires: jemalloc-devel
#BuildRequires: cmake(KF5Codecs)
BuildRequires: pkgconfig(atk)
BuildRequires: dtkgui-devel
BuildRequires: pkgconfig(dtkwidget) >= 5.1
@ -52,13 +47,16 @@ BuildRequires: openssl-devel
BuildRequires: libqtxdg-devel
BuildRequires: libmediainfo-devel
BuildRequires: kf5-kcodecs-devel
#BuildRequires: libudisks2-qt5-devel
BuildRequires: lucene++-devel
BuildRequires: htmlcxx-devel
BuildRequires: libgsf-devel
BuildRequires: mimetic-devel
BuildRequires: boost-devel
BuildRequires: deepin-anything-devel deepin-anything-server
BuildRequires: deepin-anything-devel
BuildRequires: deepin-anything-server
BuildRequires: pcre-devel
BuildRequires: docparser-devel
BuildRequires: cryptsetup-devel
# run command by QProcess
#Requires: deepin-shortcut-viewer
@ -68,13 +66,13 @@ Requires: dde-desktop
Requires: jemalloc
Requires: libglvnd-glx
Requires: libdde-file-manager
Requires: deepin-anything-dkms deepin-anything-server
Requires: deepin-anything-dkms
Requires: deepin-anything-server
#Requires: gvfs-client
#Requires: samba
#Requires: xdg-user-dirs
#Requires: gstreamer-plugins-good
Recommends: deepin-manual
Recommends: cryfs
%description
File manager front end of Deepin OS.
@ -97,7 +95,7 @@ Requires: libzen
Requires: udisks2-qt5
Requires: taglib
Requires: libgio-qt
Requires: deepin-anything-libs
Requires: deepin-anything-libs
%description -n libdde-file-manager
@ -116,14 +114,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: dde-dock
Requires: dde-launcher
Requires: dde-session-ui
Requires: tinyxml2
%description -n dde-desktop
Deepin desktop environment - desktop module.
%prep
%setup -q -n %{name}-%{version}
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
# fix file permissions
find -type f -perm 775 -exec chmod 644 {} \;
@ -156,11 +155,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:
%{_bindir}/%{name}
%{_bindir}/%{name}-daemon
%{_bindir}/%{name}-pkexec
%ifnarch x86_64
%ifnarch x86_64 riscv64
%{_bindir}/*.sh
%{_sysconfdir}/xdg/autostart/dde-file-manager-autostart.desktop
%endif
%{_bindir}/dde-property-dialog
%{_bindir}/dde-select-dialog-wayland
%{_bindir}/dde-select-dialog-x11
/usr/lib/systemd/system/dde-filemanager-daemon.service
%{_datadir}/applications/dde-open.desktop
@ -168,19 +169,25 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:
%{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialog.xml
%{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialogmanager.xml
%{_datadir}/dbus-1/services/com.deepin.filemanager.filedialog.service
%{_datadir}/dbus-1/services/com.deepin.filemanager.filedialog_wayland.service
%{_datadir}/dbus-1/services/com.deepin.filemanager.filedialog_x11.service
%{_datadir}/dbus-1/services/org.freedesktop.FileManager.service
%{_datadir}/dbus-1/system-services/com.deepin.filemanager.daemon.service
%{_datadir}/polkit-1/actions/com.deepin.filemanager.daemon.policy
%{_datadir}/polkit-1/actions/com.deepin.pkexec.dde-file-manager.policy
%{_datadir}/deepin-manual/manual-assets/application/dde-file-manager
%{_datadir}/applications/context-menus/.readme
%{_libdir}/%{name}/plugins/extensions/.readme
%{_datadir}/%{name}/extensions/appEntry/.readme
%files -n libdde-file-manager
%{_libdir}/dde-file-manager/plugins/previews/libdde-image-preview-plugin.so
%{_libdir}/dde-file-manager/plugins/previews/libdde-music-preview-plugin.so
%{_libdir}/dde-file-manager/plugins/previews/libdde-pdf-preview-plugin.so
%{_libdir}/dde-file-manager/plugins/previews/libdde-text-preview-plugin.so
%{_libdir}/dde-file-manager/plugins/extensions/libdde-eetrust-emblem-plugin.so
%{_libdir}/libdde-file-manager.so.1.8.2
%{_datadir}/dsg/configs/org.deepin.dde.file-manager/org.deepin.dde.file-manager.json
%{_datadir}/dde-file-manager/mimetypeassociations/mimetypeassociations.json
%{_datadir}/dde-file-manager/mimetypes/archive.mimetype
%{_datadir}/dde-file-manager/mimetypes/audio.mimetype
@ -202,6 +209,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:
%{_datadir}/icons/hicolor/scalable/apps/dde-file-manager.svg
%{_libdir}/libdde-file-manager.so.1
%{_libdir}/libdde-file-manager.so.1.8
%{_libdir}/libdfm-extension.so.1
%{_libdir}/libdfm-extension.so.1.8
%{_libdir}/libdfm-extension.so.1.8.2
%ifarch x86_64
%{_libdir}/deepin-anything-server-lib/plugins/handlers/libdde-anythingmonitor.so
%endif
@ -212,12 +222,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:
%{_datadir}/glib-2.0/schemas/com.deepin.dde.dock.module.disk-mount.gschema.xml
%files devel
%{_includedir}/%{name}/*.h
%{_includedir}/%{name}/gvfs/
%{_includedir}/%{name}/%{name}-plugins/
%{_includedir}/%{name}/private/
%{_includedir}/%{name}/
%{_includedir}/dfm-extension/
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/dfm-extension.pc
%{_libdir}/lib%{name}.so
%{_libdir}/libdfm-extension.so
%files -n dde-desktop
%{_bindir}/dde-desktop
@ -229,6 +239,21 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:
%{_datadir}/dbus-1/services/com.deepin.dde.desktop.service
%changelog
* Tue Apr 23 2024 misaka00251 <liuxin@iscas.ac.cn> - 5.7.8.1-3
- Fix build on riscv64
* Wed Apr 17 2024 liuzhilin <liuzhilin@uniontech.com> - 5.7.8.1-2
- fix build error
* Tue Aug 15 2023 leeffo <liweiganga@uniontech.com> - 5.7.8.1-1
- upgrade to version 5.7.8.1
* Wed Mar 29 2023 liweiganga <liweiganga@uniontech.com> - 5.2.63-1
- update: update to 5.2.63
* Fri Nov 11 2022 liweiganga <liweiganga@uniontech.com> - 5.2.39-5
- add BR pcre-devel
* Fri Aug 05 2022 liweiganga <liweiganga@uniontech.com> - 5.2.39-4
- delete authorized watermask

Binary file not shown.

Binary file not shown.