diff --git a/0001-add-open-terminal-when-clicking-right-key-in-desktop.patch b/0001-add-open-terminal-when-clicking-right-key-in-desktop.patch old mode 100644 new mode 100755 diff --git a/0001-caja-po-translation.patch b/0001-caja-po-translation.patch old mode 100644 new mode 100755 diff --git a/action-stop-add-slot-stop-loading.patch b/action-stop-add-slot-stop-loading.patch new file mode 100755 index 0000000000000000000000000000000000000000..3f8b313e7f084aa9fa38e6ae992c605a329b075b --- /dev/null +++ b/action-stop-add-slot-stop-loading.patch @@ -0,0 +1,20 @@ +diff -upNr caja-1.22.2.old/src/file-manager/fm-directory-view.c caja-1.22.2/src/file-manager/fm-directory-view.c +--- caja-1.22.2.old/src/file-manager/fm-directory-view.c 2021-08-13 11:31:36.766290737 +0800 ++++ caja-1.22.2/src/file-manager/fm-directory-view.c 2021-08-13 11:34:20.449524871 +0800 +@@ -3355,6 +3355,7 @@ real_load_error (FMDirectoryView *view, + * unrelated code that just happens to try to iterate this + * directory. + */ ++ CajaWindowSlot *slot; + if (!view->details->reported_load_error) { + fm_report_error_loading_directory + (fm_directory_view_get_directory_as_file (view), +@@ -3362,6 +3363,8 @@ real_load_error (FMDirectoryView *view, + fm_directory_view_get_containing_window (view)); + } + view->details->reported_load_error = TRUE; ++ slot = caja_window_info_get_active_slot (view->details->window); ++ caja_window_slot_stop_loading (slot); + } + + void diff --git a/caja-1.22.2-6.isoft.src.rpm b/caja-1.22.2-6.isoft.src.rpm deleted file mode 100644 index 61becd34bf9c78140c3b17f62b2a50e4f296750a..0000000000000000000000000000000000000000 Binary files a/caja-1.22.2-6.isoft.src.rpm and /dev/null differ diff --git a/caja-1.22.2-mate-search-tool.patch b/caja-1.22.2-mate-search-tool.patch deleted file mode 100644 index 3c8048a1c1ed99d39fccd78ef65ad8eb3629448d..0000000000000000000000000000000000000000 --- a/caja-1.22.2-mate-search-tool.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nuar caja-1.22.2/src/caja-navigation-window-menus.c caja-1.22.2-bak/src/caja-navigation-window-menus.c ---- caja-1.22.2/src/caja-navigation-window-menus.c 2019-09-18 00:09:37.000000000 +0800 -+++ caja-1.22.2-bak/src/caja-navigation-window-menus.c 2021-04-07 10:43:38.712353814 +0800 -@@ -28,7 +28,7 @@ - #include - - #include -- -+#include - #include "caja-actions.h" - #include "caja-notebook.h" - #include "caja-navigation-action.h" -@@ -663,7 +663,7 @@ - { - GtkAction *search_action; - CajaNavigationWindow *window; -- -+ system("mate-search-tool"); - window = CAJA_NAVIGATION_WINDOW (user_data); - - search_action = -@@ -688,7 +688,7 @@ - gpointer user_data) - { - CajaNavigationWindow *window; -- -+ system("mate-search-tool"); - /* This is used when toggling the action for updating the UI - state only, not actually activating the action */ - if (g_object_get_data (G_OBJECT (action), "blocked") != NULL) diff --git a/caja-1.22.2-trash-translate.patch b/caja-1.22.2-trash-translate.patch old mode 100644 new mode 100755 diff --git a/caja-1.22.2.tar.xz b/caja-1.22.2.tar.xz old mode 100644 new mode 100755 diff --git a/caja.spec b/caja.spec old mode 100644 new mode 100755 index 9ef6fd7337374204bf2bb46a8258bfe486223424..3144d77c2059f90ea8f35f62ab88b81778ceee37 --- a/caja.spec +++ b/caja.spec @@ -16,9 +16,9 @@ Name: caja Summary: File manager for MATE Version: %{branch}.2 %if 0%{?rel_build} -Release: 6 +Release: 13 %else -Release: 0.11%{?git_rel}%{?dist} +Release: 13%{?git_rel}%{?dist} %endif License: GPLv2+ and LGPLv2+ URL: http://mate-desktop.org @@ -37,10 +37,24 @@ Patch3: 0001-caja-po-translation.patch Patch4: 0001-add-open-terminal-when-clicking-right-key-in-desktop.patch -Patch5: caja-1.22.2-mate-search-tool.patch +#Patch5: caja-1.22.2-mate-search-tool.patch Patch6: caja-1.22.2-trash-translate.patch +Patch7: caja_delete_Keep_Aligned.patch + +Patch8: caja_hh.patch + +#Patch9: caja_type_add.patch + +Patch10: caja_up.patch + +Patch11: caja_trash_filename.patch + +Patch12: action-stop-add-slot-stop-loading.patch + +Patch13: foder_recovery.patch + BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: exempi-devel @@ -58,8 +72,9 @@ BuildRequires: libnotify-devel Requires: gamin Requires: filesystem -Requires: isoft-menus +Requires: openeuler-menus Requires: gvfs +Requires: python-six # the main binary links against libcaja-extension.so # don't depend on soname, rather on exact version @@ -128,6 +143,7 @@ NOCONFIGURE=1 ./autogen.sh --disable-static \ --disable-schemas-compile \ --disable-update-mimedb + CFLAGS=-g #drop unneeded direct library deps with --as-needed # libtool doesn't make this easy, so we do it the hard way @@ -196,12 +212,6 @@ EOF %changelog -* Thu May 27 2021 xianzhao Yang - 1.22.6 -- Optimize search tools Optimize startup window position and add some Chinese files - -* Mon Fri 15 2021 xianzhao Yang - 1.22.3 -- Sinicization file - * Fri Nov 22 2019 Wolfgang Ulbrich - 1.22.2-2 - https://github.com/mate-desktop/caja/commit/ea81a5 - Don't hyphenate filenames with pango-1.44 diff --git a/caja_0001-canvas-item-Don-t-hyphenate-filenames-1.22.patch b/caja_0001-canvas-item-Don-t-hyphenate-filenames-1.22.patch old mode 100644 new mode 100755 diff --git a/caja_add-xfce-to-desktop-file-1.22.patch b/caja_add-xfce-to-desktop-file-1.22.patch old mode 100644 new mode 100755 diff --git a/caja_delete_Keep_Aligned.patch b/caja_delete_Keep_Aligned.patch new file mode 100755 index 0000000000000000000000000000000000000000..55cd2b0607ff99ce87d84aa6d77f52f1358c76ee --- /dev/null +++ b/caja_delete_Keep_Aligned.patch @@ -0,0 +1,16 @@ +diff -Naur caja-1.22.2.bak/src/file-manager/fm-icon-view.c caja-1.22.2/src/file-manager/fm-icon-view.c +--- caja-1.22.2.bak/src/file-manager/fm-icon-view.c 2019-09-18 00:09:37.000000000 +0800 ++++ caja-1.22.2/src/file-manager/fm-icon-view.c 2021-06-04 10:25:48.381265194 +0800 +@@ -1814,9 +1814,9 @@ + gtk_action_group_add_actions (action_group, + icon_view_entries, G_N_ELEMENTS (icon_view_entries), + icon_view); +- gtk_action_group_add_toggle_actions (action_group, +- icon_view_toggle_entries, G_N_ELEMENTS (icon_view_toggle_entries), +- icon_view); ++// gtk_action_group_add_toggle_actions (action_group, ++ // icon_view_toggle_entries, G_N_ELEMENTS (icon_view_toggle_entries), ++ // icon_view); + gtk_action_group_add_radio_actions (action_group, + arrange_radio_entries, + G_N_ELEMENTS (arrange_radio_entries), diff --git a/caja_hh.patch b/caja_hh.patch new file mode 100755 index 0000000000000000000000000000000000000000..446879d8da52b9046c2a29728372aee63e32df1f --- /dev/null +++ b/caja_hh.patch @@ -0,0 +1,12 @@ +diff -Naur caja-1.22.2.bak/po/zh_CN.po caja-1.22.2/po/zh_CN.po +--- caja-1.22.2.bak/po/zh_CN.po 2019-09-18 00:09:37.000000000 +0800 ++++ caja-1.22.2/po/zh_CN.po 2021-06-30 15:34:21.094181973 +0800 +@@ -1087,7 +1087,7 @@ + #: ../src/file-manager/fm-directory-view.c:9010 + #: ../src/file-manager/fm-tree-view.c:1344 ../src/caja-emblem-sidebar.c:373 + msgid "_Delete" +-msgstr "删除(_D)" ++msgstr "彻底删除(_D)" + + #: ../libcaja-private/caja-file-operations.c:191 + msgid "Delete _All" diff --git a/caja_trash_filename.patch b/caja_trash_filename.patch new file mode 100755 index 0000000000000000000000000000000000000000..db6d8a926e1b015c81488c294a759c34ac55b67e --- /dev/null +++ b/caja_trash_filename.patch @@ -0,0 +1,17 @@ +diff -Naur caja-bak/libcaja-private/caja-file-operations.c caja-1.22.2/libcaja-private/caja-file-operations.c +--- caja-bak/libcaja-private/caja-file-operations.c 2021-08-12 10:39:11.813843111 +0800 ++++ caja-1.22.2/libcaja-private/caja-file-operations.c 2021-08-12 10:44:18.483915748 +0800 +@@ -3328,11 +3328,11 @@ + dest = NULL; + if (!same_fs) { + info = g_file_query_info (src, +- G_FILE_ATTRIBUTE_STANDARD_COPY_NAME, ++ G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME, + 0, NULL, NULL); + + if (info) { +- copyname = g_strdup (g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_COPY_NAME)); ++ copyname = g_strdup (g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME)); + + if (copyname) { + make_file_name_valid_for_dest_fs (copyname, dest_fs_type); diff --git a/caja_up.patch b/caja_up.patch new file mode 100755 index 0000000000000000000000000000000000000000..c529534557b37399c2c0a99556b1040a2f9a51a0 --- /dev/null +++ b/caja_up.patch @@ -0,0 +1,47 @@ +diff -Naur caja-1.22.2.bak/libcaja-private/caja-file-operations.c caja-1.22.2/libcaja-private/caja-file-operations.c +--- caja-1.22.2.bak/libcaja-private/caja-file-operations.c 2019-09-18 00:09:37.000000000 +0800 ++++ caja-1.22.2/libcaja-private/caja-file-operations.c 2021-08-05 11:03:50.134004590 +0800 +@@ -2145,7 +2145,7 @@ + unmounted = g_mount_eject_with_operation_finish (G_MOUNT (source_object), + res, &error); + if ((!error) || (unmounted == TRUE)){ +- caja_application_notify_unmount_show ("It is now safe to remove the drive"); ++ caja_application_notify_unmount_show ("现在可安全的卸下设备"); + } + + } else { +diff -Naur caja-1.22.2.bak/po/zh_CN.po caja-1.22.2/po/zh_CN.po +--- caja-1.22.2.bak/po/zh_CN.po 2019-09-18 00:09:37.000000000 +0800 ++++ caja-1.22.2/po/zh_CN.po 2021-08-05 10:27:14.974862066 +0800 +@@ -105,6 +105,10 @@ + msgid "MATE" + msgstr "MATE" + ++ ++msgid "It is now safe to remove the drive" ++msgstr "现在可按全移除此设备" ++ + #: ../data/browser.xml.h:19 + msgid "Green Weave" + msgstr "绿色编织物" +diff -Naur caja-1.22.2.bak/src/caja-places-sidebar.c caja-1.22.2/src/caja-places-sidebar.c +--- caja-1.22.2.bak/src/caja-places-sidebar.c 2019-09-18 00:09:37.000000000 +0800 ++++ caja-1.22.2/src/caja-places-sidebar.c 2021-08-05 11:03:01.813054804 +0800 +@@ -2249,7 +2249,7 @@ + } + + else { +- caja_application_notify_unmount_show ("It is now safe to remove the drive"); ++ caja_application_notify_unmount_show ("现在可安全卸下设备"); + } + } + +@@ -2284,7 +2284,7 @@ + } + + else { +- caja_application_notify_unmount_show ("It is now safe to remove the drive"); ++ caja_application_notify_unmount_show ("现在可安全的卸下设备"); + } + } + diff --git a/foder_recovery.patch b/foder_recovery.patch new file mode 100755 index 0000000000000000000000000000000000000000..72de5ed276f58baf0a417c9d5c7cb8e1ceead05f --- /dev/null +++ b/foder_recovery.patch @@ -0,0 +1,12 @@ +diff -Naur caja-1.22.2.bak/libcaja-private/caja-file-operations.c caja-1.22.2.target/libcaja-private/caja-file-operations.c +--- caja-1.22.2.bak/libcaja-private/caja-file-operations.c 2021-10-29 17:30:15.439729431 +0800 ++++ caja-1.22.2.target/libcaja-private/caja-file-operations.c 2021-11-03 15:16:26.030644062 +0800 +@@ -4230,7 +4230,7 @@ + caja_progress_info_disable_pause (job->progress); + + if (copy_job->is_move) { +- res = g_file_move (src, dest, ++ res = g_file_copy (src, dest, + flags, + job->cancellable, + copy_file_progress_callback,