diff --git a/008-fix-check-symlink-target.patch b/008-fix-check-symlink-target.patch new file mode 100644 index 0000000000000000000000000000000000000000..b6462a480fd8c77d11af8cf163346c97bfdb392f --- /dev/null +++ b/008-fix-check-symlink-target.patch @@ -0,0 +1,32 @@ +From d94cae5719c00e7940bd952ef7ae1bf015516989 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E5=BC=A0=E6=B6=9B?= +Date: Thu, 19 Oct 2023 14:20:21 +0800 +Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=8D=E5=88=B6=E6=96=87=E4=BB=B6?= + =?UTF-8?q?=E5=88=B0=E5=85=B1=E4=BA=AB=E7=9B=AE=E5=BD=95=EF=BC=8C=E5=BC=B9?= + =?UTF-8?q?=E5=87=BA=E5=AD=98=E5=9C=A8=E5=90=8C=E5=90=8D=E6=BA=90=E6=96=87?= + =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=97=A0=E6=B3=95=E6=89=A7=E8=A1=8C=E6=AD=A4?= + =?UTF-8?q?=E6=93=8D=E4=BD=9C?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + libnemo-private/nemo-file-operations.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libnemo-private/nemo-file-operations.c b/libnemo-private/nemo-file-operations.c +index ad52baf..a840c07 100644 +--- a/libnemo-private/nemo-file-operations.c ++++ b/libnemo-private/nemo-file-operations.c +@@ -4494,7 +4494,7 @@ check_symlink_traget (GFile *src, GFile *dest, CommonJob *job) + + char *dest_path; + dest_path = g_file_get_path (dest); +- if (g_strcmp0 (symlink_target, dest_path) == 0) { ++ if (symlink_target && dest_path && g_strcmp0 (symlink_target, dest_path) == 0) { + g_timer_stop (job->time); + nemo_progress_info_pause (job->progress); + g_io_scheduler_job_send_to_mainloop (job->io_job, +-- +2.30.2 + diff --git a/nemo.spec b/nemo.spec index b5aead8e5fec3936ed6b4ae8eddad7df5c6aaf2a..15c31cb8cc220a630d11099d7634daf08fe74b4a 100644 --- a/nemo.spec +++ b/nemo.spec @@ -1,7 +1,7 @@ Name: nemo Summary: File manager and graphical shell for Cinnamon. Version: 4.8.6 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %{name}-%{version}.tar.gz @@ -14,6 +14,7 @@ Patch3: 004-fix-desktop-pop-up-context-menu.patch Patch4: 005-fix-view-refresh.patch Patch5: 006-fix-desktop-window-edge.patch Patch6: 007-fix-file-management.patch +Patch7: 008-fix-check-symlink-target.patch BuildRequires: meson BuildRequires: intltool @@ -159,6 +160,10 @@ install -m 644 data/nemo.conf %{buildroot}%{_sysconfdir}/rsyslog.d/nemo.conf #/usr/share/python3/runtime.d/nemo-data.rtupdate %changelog +* Thu Oct 19 2023 张涛 - 4.8.6-9 +- fix: 复制文件到共享目录,弹出存在同名源文件,无法执行此操作 +- add patch: 008-fix-check-symlink-target.patch + * Thu Oct 19 2023 张涛 - 4.8.6-8 - fix: 设置中添加文件移动到回收站前询问选项 - add patch: 007-fix-file-management.patch