diff --git a/.gitignore b/.gitignore index 4c1f21b..dea9a53 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /caja-1.19.0.tar.xz /caja-1.19.1.tar.xz /caja-1.19.2.tar.xz +/caja-1.19.3.tar.xz diff --git a/caja.spec b/caja.spec index c1e1f74..b88669b 100644 --- a/caja.spec +++ b/caja.spec @@ -14,7 +14,7 @@ Name: caja Summary: File manager for MATE -Version: %{branch}.2 +Version: %{branch}.3 %if 0%{?rel_build} Release: 1%{?dist} %else @@ -33,6 +33,9 @@ URL: http://mate-desktop.org Patch1: caja_add-xfce-to-desktop-file.patch # drop backgrounds Patch2: caja_0001-do-not-show-property-browser-in-menu.patch +# https://github.com/mate-desktop/caja/pull/891 +Patch3: caja_0001-eject-Do-not-show-safe-to-remove-notification-if-dri.patch +Patch4: caja_0002-places-sidebar-remove-duplicate-function.patch BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils @@ -102,6 +105,8 @@ sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-home.desktop.in.in %patch1 -p1 -b .add-xfce-to-desktop-file #%patch2 -p1 -b .0001 +%patch3 -p1 -b .0001 +%patch4 -p1 -b .0001 %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh @@ -215,6 +220,10 @@ fi %changelog +* Mon Jan 01 2018 Wolfgang Ulbrich - 1.19.3-1 +- update to 1.19.3 +- use https://github.com/mate-desktop/caja/pull/891 + * Wed Oct 11 2017 Wolfgang Ulbrich - 1.19.2-1 - update to 1.19.2 release diff --git a/caja_0001-eject-Do-not-show-safe-to-remove-notification-if-dri.patch b/caja_0001-eject-Do-not-show-safe-to-remove-notification-if-dri.patch new file mode 100644 index 0000000..6de7119 --- /dev/null +++ b/caja_0001-eject-Do-not-show-safe-to-remove-notification-if-dri.patch @@ -0,0 +1,29 @@ +From f84970875ea6ac80f47e8fea1eeada7550f7a706 Mon Sep 17 00:00:00 2001 +From: lukefromdc +Date: Sun, 31 Dec 2017 01:10:29 -0500 +Subject: [PATCH 1/2] eject: Do not show "safe to remove" notification if drive + fails to unmount + +--- + libcaja-private/caja-file-operations.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c +index cb3ba2b..d832033 100644 +--- a/libcaja-private/caja-file-operations.c ++++ b/libcaja-private/caja-file-operations.c +@@ -2135,7 +2135,10 @@ unmount_mount_callback (GObject *source_object, + if (data->eject) { + unmounted = g_mount_eject_with_operation_finish (G_MOUNT (source_object), + res, &error); +- caja_application_notify_unmount_show ("It is now safe to remove the drive"); ++ if ((!error) || (unmounted == TRUE)){ ++ caja_application_notify_unmount_show ("It is now safe to remove the drive"); ++ } ++ + } else { + unmounted = g_mount_unmount_with_operation_finish (G_MOUNT (source_object), + res, &error); +-- +2.13.6 + diff --git a/caja_0002-places-sidebar-remove-duplicate-function.patch b/caja_0002-places-sidebar-remove-duplicate-function.patch new file mode 100644 index 0000000..8577267 --- /dev/null +++ b/caja_0002-places-sidebar-remove-duplicate-function.patch @@ -0,0 +1,27 @@ +From 01e6daf138fca29539cdde785043c3c653062720 Mon Sep 17 00:00:00 2001 +From: lukefromdc +Date: Sun, 31 Dec 2017 01:55:09 -0500 +Subject: [PATCH 2/2] places-sidebar: remove duplicate function + +This is already handled in libcaja-private/caja-file-operations.c +--- + src/caja-places-sidebar.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c +index 93c42e6..9aba1bb 100644 +--- a/src/caja-places-sidebar.c ++++ b/src/caja-places-sidebar.c +@@ -2197,9 +2197,6 @@ drive_eject_cb (GObject *source_object, + } + g_error_free (error); + } +- else { +- caja_application_notify_unmount_show ("It is now safe to remove the drive"); +- } + } + + static void +-- +2.13.6 + diff --git a/sources b/sources index e117eef..e0a89dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (caja-1.19.2.tar.xz) = aa6e31072663756e156d71c262692d7923d3944b702cc98161ce03d7f85eaf3345ef11c95a64360d5be340e44e25e5c99d6dfa23994080b5a942e305ddb6d2a7 +SHA512 (caja-1.19.3.tar.xz) = 2b20ac378c56b84ddec365d8bf27fe607ffb33f13679aec711dc3fb71819894c2ee69469a77432d37019becdd4a58dae9bf8e1f1698ba74e39de159a0a6f6fcc