diff --git a/deepin-editor-6.0.6-FilePermission.patch b/deepin-editor-6.0.6-FilePermission.patch new file mode 100644 index 0000000000000000000000000000000000000000..a06c29b06bcee1089b421e0e3f779650cdff894f --- /dev/null +++ b/deepin-editor-6.0.6-FilePermission.patch @@ -0,0 +1,12 @@ +diff -urNp deepin-editor-6.0.6/src/widgets/window.cpp deepin-editor-6.0.6-FilePermisson/src/widgets/window.cpp +--- deepin-editor-6.0.6/src/widgets/window.cpp 2023-04-18 13:51:28.000000000 +0800 ++++ deepin-editor-6.0.6-FilePermisson/src/widgets/window.cpp 2024-12-06 09:26:32.592255338 +0800 +@@ -625,6 +625,8 @@ void Window::addTab(const QString &filep + QFile::Permissions permissions = file.permissions(); + bool bIsRead = (permissions & QFile::ReadUser || permissions & QFile::ReadOwner || permissions & QFile::ReadOther); + if (fileInfo.exists() && !bIsRead) { ++ if(curWrappper == nullptr) ++ addBlankTab(); + DMessageManager::instance()->sendMessage(m_editorWidget->currentWidget(), QIcon(":/images/warning.svg") + , QString(tr("You do not have permission to open %1")).arg(filepath)); + return; diff --git a/deepin-editor.spec b/deepin-editor.spec index 75c89fa5df9aa4dd3946e0ea4f9aff81bb2daa98..be751f3487d5db1b3103bb5a164b58b77bda6d5a 100644 --- a/deepin-editor.spec +++ b/deepin-editor.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.3 %global debug_package %{nil} Name: deepin-editor @@ -6,8 +6,10 @@ Version: 6.0.6 Release: 1%{anolis_release}%{?dist} Summary: Simple editor for Linux Deepin License: GPLv3 -URL: https://github.com/linuxdeepin/deepin-editor +#URL: https://github.com/linuxdeepin/deepin-editor +URL: https://gitee.com/src-anolis-dde/deepin-editor Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch1: deepin-editor-6.0.6-FilePermission.patch %if 0%{?openeuler} BuildRequires: cmake @@ -46,7 +48,9 @@ BuildRequires: libchardet-devel %{summary}. %prep -%autosetup -p1 +#%autosetup -p1 +%setup -q +%patch1 -p1 -b .FilePermission %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -75,6 +79,9 @@ popd %{_datadir}/dsg/configs/org.deepin.editor/org.deepin.editor.json %changelog +* Fri Dec 6 2024 xiezhong - 6.0.6-1.0.3 +- Fix the issue of program crash when reading a file without read permissions + * Fri Jan 12 2024 yangxianzhao - 6.0.6-1.0.2 - rebuild for qt5-qtbase