From 70b740c3e7e13dd9ec9a35c611b3caa13b97be9a Mon Sep 17 00:00:00 2001 From: liuzhilin Date: Wed, 17 Apr 2024 18:11:35 +0800 Subject: [PATCH 1/2] fix build error --- 0001-fix-build-error.patch | 67 ++++++++++++++++++++++++++++++++++++++ dde-file-manager.spec | 10 ++++-- 2 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 0001-fix-build-error.patch diff --git a/0001-fix-build-error.patch b/0001-fix-build-error.patch new file mode 100644 index 0000000..f460724 --- /dev/null +++ b/0001-fix-build-error.patch @@ -0,0 +1,67 @@ +From 30420e17378d6c2b2b557fd53e973f5a8ad8ad8d Mon Sep 17 00:00:00 2001 +From: liuzhilin +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 + diff --git a/dde-file-manager.spec b/dde-file-manager.spec index 085eedf..6d78dd4 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -1,14 +1,13 @@ -%define specrelease 1 - Name: dde-file-manager Version: 5.7.8.1 -Release: %{specrelease} +Release: 2 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 @@ -123,6 +122,7 @@ Deepin desktop environment - desktop module. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # fix file permissions find -type f -perm 775 -exec chmod 644 {} \; @@ -187,6 +187,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||: %{_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 @@ -238,6 +239,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||: %{_datadir}/dbus-1/services/com.deepin.dde.desktop.service %changelog +* Wed Apr 17 2024 liuzhilin - 5.7.8.1-2 +- fix build error + * Tue Aug 15 2023 leeffo - 5.7.8.1-1 - upgrade to version 5.7.8.1 -- Gitee From e1efe8cc301634967ab501d3d5bd03adb0553677 Mon Sep 17 00:00:00 2001 From: misaka00251 Date: Tue, 23 Apr 2024 16:33:49 +0800 Subject: [PATCH 2/2] Fix build on riscv64 --- dde-file-manager.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dde-file-manager.spec b/dde-file-manager.spec index 6d78dd4..eb4a583 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -1,6 +1,6 @@ Name: dde-file-manager Version: 5.7.8.1 -Release: 2 +Release: 3 Summary: Deepin File Manager License: GPLv3 URL: https://github.com/linuxdeepin/dde-file-manager @@ -155,7 +155,7 @@ 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 @@ -239,6 +239,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||: %{_datadir}/dbus-1/services/com.deepin.dde.desktop.service %changelog +* Tue Apr 23 2024 misaka00251 - 5.7.8.1-3 +- Fix build on riscv64 + * Wed Apr 17 2024 liuzhilin - 5.7.8.1-2 - fix build error -- Gitee