diff --git a/0001-allow-root-to-use-desktop-manager.patch b/0001-allow-root-to-use-desktop-manager.patch index 1f03d6d60df77041f2fa068010f97ec7f3d1d117..d0f03edb2e65c8123708c4870e338fd06bf01648 100644 --- a/0001-allow-root-to-use-desktop-manager.patch +++ b/0001-allow-root-to-use-desktop-manager.patch @@ -1,4 +1,4 @@ -From b081e9b4b21113e74e497df6d8ca92b2a41f16bc Mon Sep 17 00:00:00 2001 +From 723f18fbf45519926e6c190c0978ba146b05c515 Mon Sep 17 00:00:00 2001 From: tangjie02 Date: Mon, 13 Dec 2021 14:06:04 +0800 Subject: [PATCH] allow root to use desktop manager @@ -9,10 +9,10 @@ Signed-off-by: tangjie02 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/caja-application.c b/src/caja-application.c -index 090c3dd..d8c7acd 100644 +index b7d8ff8..7d92d90 100644 --- a/src/caja-application.c +++ b/src/caja-application.c -@@ -2293,7 +2293,7 @@ init_desktop (CajaApplication *self) +@@ -2183,7 +2183,7 @@ init_desktop (CajaApplication *self) self->priv->no_desktop = TRUE; } @@ -22,5 +22,5 @@ index 090c3dd..d8c7acd 100644 /* do not manage desktop when running as root or on other desktops unless forced */ self->priv->no_desktop = TRUE; -- -2.27.0 +2.43.0 diff --git a/0001-fix-desktop-Add-Chinese-name-translation-to-desktop-.patch b/0001-fix-desktop-Add-Chinese-name-translation-to-desktop-.patch deleted file mode 100644 index 8768891415c7243b7115092ff75f26e9c4a87a03..0000000000000000000000000000000000000000 --- a/0001-fix-desktop-Add-Chinese-name-translation-to-desktop-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2e401e51b4a4755bd77932b4a13e82c834905fc8 Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Fri, 2 Sep 2022 09:40:03 +0800 -Subject: [PATCH] fix(desktop): Add Chinese name translation to desktop files -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 给桌面文件添加中文名称翻译, 使得面板上图标的提示语为文件管理器 - -Signed-off-by: wangxiaoqing ---- - data/caja.desktop.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/caja.desktop.in b/data/caja.desktop.in -index 3d8a122..b1fb931 100644 ---- a/data/caja.desktop.in -+++ b/data/caja.desktop.in -@@ -1,5 +1,6 @@ - [Desktop Entry] - Name=Caja -+Name[zh_CN]=文件管理器 - GenericName[af]=Lêerbestuurder - GenericName[am]=የ ፋይል አስተዳዳሪ - GenericName[ar]=مدير الملفات --- -2.36.1 - diff --git a/0002-feature-kiran-Support-kiran-desktop-environment.patch b/0002-feature-kiran-Support-kiran-desktop-environment.patch index 367d81256eb438a0ddbe7646c53d7db27fa28330..d632bd35a598855b5a94d4d15a91657f96009356 100644 --- a/0002-feature-kiran-Support-kiran-desktop-environment.patch +++ b/0002-feature-kiran-Support-kiran-desktop-environment.patch @@ -1,7 +1,7 @@ -From 91dcb951c19e7a05b16f81474e0708e2389ce1d3 Mon Sep 17 00:00:00 2001 +From 5f71c9d9df2f7b3e9f82deeebf7abc0e7d13b515 Mon Sep 17 00:00:00 2001 From: tangjie02 Date: Mon, 9 Aug 2021 18:00:34 +0800 -Subject: [PATCH 2/3] feature(kiran): Support kiran desktop environment. +Subject: [PATCH] feature(kiran): Support kiran desktop environment. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -10,15 +10,15 @@ Content-Transfer-Encoding: 8bit Signed-off-by: tangjie02 --- - libegg/eggsmclient.c | 10 +++++++++- - src/caja-application.c | 11 +++++++++-- + mate-submodules/libegg/eggsmclient.c | 10 +++++++++- + src/caja-application.c | 11 +++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) -diff --git a/libegg/eggsmclient.c b/libegg/eggsmclient.c -index c404349..3113e6b 100644 ---- a/libegg/eggsmclient.c -+++ b/libegg/eggsmclient.c -@@ -59,6 +59,14 @@ running_in_mate (void) +diff --git a/mate-submodules/libegg/eggsmclient.c b/mate-submodules/libegg/eggsmclient.c +index c79e61d..dd03046 100644 +--- a/mate-submodules/libegg/eggsmclient.c ++++ b/mate-submodules/libegg/eggsmclient.c +@@ -58,6 +58,14 @@ running_in_mate (void) || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate") == 0); } @@ -33,20 +33,20 @@ index c404349..3113e6b 100644 static void egg_sm_client_init (EggSMClient *client) { -@@ -360,7 +368,7 @@ egg_sm_client_get (void) +@@ -374,7 +382,7 @@ egg_sm_client_get (void) as egg_sm_client_set_mode must be called prior to start of main loop to stop caja restart but this is diffcult in GtkApplication */ - if (geteuid () == 0 || !running_in_mate ()){ + if (geteuid () == 0 || !(running_in_mate () || running_in_kiran ())){ - global_client = g_object_new (EGG_TYPE_SM_CLIENT, NULL); + global_client = g_object_new (EGG_TYPE_SM_CLIENT, NULL); } } diff --git a/src/caja-application.c b/src/caja-application.c -index 2791bd9..8d33baa 100644 +index 7d92d90..2df0eee 100644 --- a/src/caja-application.c +++ b/src/caja-application.c -@@ -1838,6 +1838,13 @@ running_in_mate (void) +@@ -1905,6 +1905,13 @@ running_in_mate (void) || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate") == 0); } @@ -60,7 +60,7 @@ index 2791bd9..8d33baa 100644 static gboolean running_as_root (void) { -@@ -2110,7 +2117,7 @@ init_desktop (CajaApplication *self) +@@ -2183,7 +2190,7 @@ init_desktop (CajaApplication *self) self->priv->no_desktop = TRUE; } @@ -69,7 +69,7 @@ index 2791bd9..8d33baa 100644 { /* do not manage desktop when running as root or on other desktops unless forced */ self->priv->no_desktop = TRUE; -@@ -2262,7 +2269,7 @@ caja_application_startup (GApplication *app) +@@ -2333,7 +2340,7 @@ caja_application_startup (GApplication *app) * Otherwise, we read the value from the configuration. */ @@ -77,7 +77,7 @@ index 2791bd9..8d33baa 100644 + if ((running_in_mate () || running_in_kiran ()) && !running_as_root()) { GApplication *instance; - + gboolean exit_with_last_window; -- -2.33.0 +2.43.0 diff --git a/0001-Support-change-desktop-background-image-in-kiran-des.patch b/0003-Support-change-desktop-background-image-in-kiran-des.patch similarity index 57% rename from 0001-Support-change-desktop-background-image-in-kiran-des.patch rename to 0003-Support-change-desktop-background-image-in-kiran-des.patch index f8f2f031e99dcd601efc5a1efafc105fd33c6986..85b352842a899ded4a734a8e194350ecb3d1dad3 100644 --- a/0001-Support-change-desktop-background-image-in-kiran-des.patch +++ b/0003-Support-change-desktop-background-image-in-kiran-des.patch @@ -1,4 +1,4 @@ -From b8c487050e04975cb81bd9404f4f4281b6ed6f86 Mon Sep 17 00:00:00 2001 +From 1416f4a5849d0e6d0ef94c4e329ddec6554b1e15 Mon Sep 17 00:00:00 2001 From: wangxiaoqing Date: Wed, 27 Jul 2022 14:14:11 +0800 Subject: [PATCH] Support change desktop background image in kiran desktop @@ -32,10 +32,10 @@ index 5e3d22b..033142d 100644 g_object_unref (launch_context); g_object_unref (app_info); diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c -index aa40b2d..22dfa3f 100644 +index 954c26d..b5393e8 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c -@@ -656,17 +656,39 @@ action_new_launcher_callback (GtkAction *action, gpointer data) +@@ -708,6 +708,14 @@ action_new_launcher_callback (GtkAction *action, gpointer data) } @@ -50,36 +50,37 @@ index aa40b2d..22dfa3f 100644 static void action_change_background_callback (GtkAction *action, gpointer data) - { - g_assert (FM_DIRECTORY_VIEW (data)); - -- caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)), -- _("Background"), -- "mate-appearance-properties", -- FALSE, -- "--show-page=background", NULL); -+ if (running_in_kiran()) -+ { -+ caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)), -+ _("Background"), -+ "kiran-control-panel", -+ FALSE, -+ "-c", -+ "individuation", -+ "-s", -+ "Wallpaper", NULL); -+ } -+ else -+ { -+ caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)), -+ _("Background"), -+ "mate-appearance-properties", -+ FALSE, -+ "--show-page=background", NULL); -+ } +@@ -732,11 +740,25 @@ action_change_background_callback (GtkAction *action, + #endif + /*Get the new background and switch to it in x11*/ + { +- caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)), +- _("Background"), +- "mate-appearance-properties", +- FALSE, +- "--show-page=background", NULL); ++ if (running_in_kiran()) ++ { ++ caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)), ++ _("Background"), ++ "kiran-control-panel", ++ FALSE, ++ "-c", ++ "individuation", ++ "-s", ++ "Wallpaper", NULL); ++ } ++ else ++ { ++ caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)), ++ _("Background"), ++ "mate-appearance-properties", ++ FALSE, ++ "--show-page=background", NULL); ++ } + } } - static void -- -2.36.1 +2.43.0 diff --git a/0001-Fix-the-file-rename-error-msg-too-long.patch b/0004-Fix-the-file-rename-error-msg-too-long.patch similarity index 72% rename from 0001-Fix-the-file-rename-error-msg-too-long.patch rename to 0004-Fix-the-file-rename-error-msg-too-long.patch index 02b1b8962f23ea52dd02db6c16e902f38420e30e..b12c33b9a292fbd66e7c330cc6d99d1a338b05c9 100644 --- a/0001-Fix-the-file-rename-error-msg-too-long.patch +++ b/0004-Fix-the-file-rename-error-msg-too-long.patch @@ -1,7 +1,7 @@ -From a563dba2c4a920b8caae1a3cef9e87168327c9bf Mon Sep 17 00:00:00 2001 +From f32a223ced9d74bb153b191472cea31a738fd3ea Mon Sep 17 00:00:00 2001 From: wangxiaoqing Date: Wed, 27 Jul 2022 17:33:08 +0800 -Subject: [PATCH 1/4] Fix the file rename error msg too long +Subject: [PATCH] Fix the file rename error msg too long MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,16 +12,16 @@ Content-Transfer-Encoding: 8bit Signed-off-by: wangxiaoqing --- po/caja.pot | 4 ++++ - po/zh_CN.po | 3 +++ + po/zh_CN.po | 5 +++++ src/file-manager/fm-error-reporting.c | 4 ++++ - 3 files changed, 11 insertions(+) + 3 files changed, 13 insertions(+) diff --git a/po/caja.pot b/po/caja.pot -index 2eb694e..33f556a 100644 +index bcc827e..8892dc3 100644 --- a/po/caja.pot +++ b/po/caja.pot -@@ -7503,3 +7503,7 @@ msgstr "" - #: src/file-manager/fm-widget-view.c:447 +@@ -7553,3 +7553,7 @@ msgstr "" + #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + @@ -29,18 +29,20 @@ index 2eb694e..33f556a 100644 +msgid "File name too long. Please use a different name." +msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po -index cbaf91e..5a70ffe 100644 +index ead2742..d9320e4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po -@@ -7607,3 +7607,6 @@ msgstr "用部件视图来展示该位置。" - - #~ msgid "network-workgroup" - #~ msgstr "network-workgroup" +@@ -7677,3 +7677,8 @@ msgstr "部件视图在启动时遇到了错误。" + #: src/file-manager/fm-widget-view.c:446 + msgid "Display this location with the widget view." + msgstr "用部件视图来展示该位置。" ++ +#: src/file-manager/fm-error-reporting.c:148 +msgid "File name too long. Please use a different name." +msgstr "文件名称太长。请使用另外的名字。" ++ diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c -index 93cf77f..4a9b515 100644 +index 1cb8a3b..99716b7 100644 --- a/src/file-manager/fm-error-reporting.c +++ b/src/file-manager/fm-error-reporting.c @@ -144,6 +144,10 @@ fm_report_error_renaming_file (CajaFile *file, @@ -55,5 +57,5 @@ index 93cf77f..4a9b515 100644 break; } -- -2.36.1 +2.43.0 diff --git a/0001-Fix-the-file-can-be-rename-to-only-container-space-n.patch b/0005-Fix-the-file-can-be-rename-to-only-container-space-n.patch similarity index 83% rename from 0001-Fix-the-file-can-be-rename-to-only-container-space-n.patch rename to 0005-Fix-the-file-can-be-rename-to-only-container-space-n.patch index 06bbc0f1b626588ccea6db723f5271b7520e765e..987d36983b408dff326da97ef30ddc19e6997ff9 100644 --- a/0001-Fix-the-file-can-be-rename-to-only-container-space-n.patch +++ b/0005-Fix-the-file-can-be-rename-to-only-container-space-n.patch @@ -1,7 +1,7 @@ -From b36d0047bc7012b387abf775d25078b4195b83e5 Mon Sep 17 00:00:00 2001 +From 32222c62df06e65d5a152f58656e13cf4a6ae223 Mon Sep 17 00:00:00 2001 From: wangxiaoqing Date: Wed, 27 Jul 2022 17:49:59 +0800 -Subject: [PATCH 1/4] Fix the file can be rename to only container space name +Subject: [PATCH] Fix the file can be rename to only container space name file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -17,10 +17,10 @@ Signed-off-by: wangxiaoqing 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c -index 5de4ac3..9a2c3e8 100644 +index 4c4c084..7dbeb86 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c -@@ -9132,7 +9132,9 @@ end_renaming_mode (CajaIconContainer *container, gboolean commit) +@@ -9162,7 +9162,9 @@ end_renaming_mode (CajaIconContainer *container, gboolean commit) /* Verify that text has been modified before signalling change. */ changed_text = eel_editable_label_get_text (EEL_EDITABLE_LABEL (container->details->rename_widget)); @@ -32,10 +32,10 @@ index 5de4ac3..9a2c3e8 100644 AtkObject *accessible_icon; diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c -index bfc29c2..6339a1c 100644 +index b5a6145..8eb5d8f 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c -@@ -1402,7 +1402,10 @@ cell_renderer_edited (GtkCellRendererText *cell, +@@ -1393,7 +1393,10 @@ cell_renderer_edited (GtkCellRendererText *cell, -1); /* Only rename if name actually changed */ @@ -48,5 +48,5 @@ index bfc29c2..6339a1c 100644 view->details->renaming_file = caja_file_ref (file); view->details->rename_done = FALSE; -- -2.36.1 +2.43.0 diff --git a/0002-Let-the-location-bar-background-change-with-theme.patch b/0006-Let-the-location-bar-background-change-with-theme.patch similarity index 86% rename from 0002-Let-the-location-bar-background-change-with-theme.patch rename to 0006-Let-the-location-bar-background-change-with-theme.patch index e2964e85a26a3be97696fe6f00a70e85a2356806..24b30db01e60448e5e6c8765115dd7b025eaf240 100644 --- a/0002-Let-the-location-bar-background-change-with-theme.patch +++ b/0006-Let-the-location-bar-background-change-with-theme.patch @@ -1,7 +1,7 @@ -From f8df64351263ced3b369a03b93ac2a1644f56678 Mon Sep 17 00:00:00 2001 +From b7f5eb7b6141f7a7e12eef8ec433b7433179dae8 Mon Sep 17 00:00:00 2001 From: wangxiaoqing Date: Thu, 28 Jul 2022 08:57:36 +0800 -Subject: [PATCH 2/4] Let the location bar background change with theme +Subject: [PATCH] Let the location bar background change with theme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,7 +15,7 @@ Signed-off-by: wangxiaoqing 1 file changed, 3 deletions(-) diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c -index 29018b5..019162c 100644 +index 1966941..4d5841c 100644 --- a/src/caja-navigation-window-pane.c +++ b/src/caja-navigation-window-pane.c @@ -58,9 +58,6 @@ real_set_active (CajaWindowPane *pane, gboolean is_active) @@ -29,5 +29,5 @@ index 29018b5..019162c 100644 gtk_widget_set_sensitive (gtk_bin_get_child (GTK_BIN (nav_pane->location_button)), is_active); } -- -2.36.1 +2.43.0 diff --git a/0004-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch b/0007-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch similarity index 88% rename from 0004-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch rename to 0007-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch index ef4cbce6f218a1cff5c730144e8b1e2de15abbb3..16bb6bad242343b80c66a5bf4d01ca70a353fcd8 100644 --- a/0004-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch +++ b/0007-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch @@ -1,7 +1,7 @@ -From 5b3b8728e06b515c9ab3cdd2d601445cabd285a8 Mon Sep 17 00:00:00 2001 +From 74e41076efdc3f44a8fe7d94dfd2b47d4ce5dfde Mon Sep 17 00:00:00 2001 From: wangxiaoqing Date: Fri, 29 Jul 2022 16:41:14 +0800 -Subject: [PATCH 4/4] Not draw icon and text hight light color when icon not +Subject: [PATCH] Not draw icon and text hight light color when icon not get force MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -16,10 +16,10 @@ Signed-off-by: wangxiaoqing 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c -index 7ab2f70..7c56de2 100644 +index 43c340d..5fd00ea 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c -@@ -1077,7 +1077,9 @@ prepare_pango_layout_for_draw (CajaIconCanvasItem *item, +@@ -1074,7 +1074,9 @@ prepare_pango_layout_for_draw (CajaIconCanvasItem *item, container = CAJA_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas); details = item->details; @@ -30,7 +30,7 @@ index 7ab2f70..7c56de2 100644 if (IS_COMPACT_VIEW (container)) { -@@ -1278,7 +1280,9 @@ draw_label_text (CajaIconCanvasItem *item, +@@ -1275,7 +1277,9 @@ draw_label_text (CajaIconCanvasItem *item, text_rect = compute_text_rectangle (item, icon_rect, TRUE, BOUNDS_USAGE_FOR_DISPLAY); @@ -41,7 +41,7 @@ index 7ab2f70..7c56de2 100644 is_rtl_label_beside = caja_icon_container_is_layout_rtl (container) && container->details->label_position == CAJA_ICON_LABEL_POSITION_BESIDE; -@@ -1777,22 +1781,17 @@ real_map_surface (CajaIconCanvasItem *icon_item) +@@ -1772,22 +1776,17 @@ real_map_surface (CajaIconCanvasItem *icon_item) } } @@ -71,5 +71,5 @@ index 7ab2f70..7c56de2 100644 color = *c; gdk_rgba_free (c); -- -2.36.1 +2.43.0 diff --git a/1084-fix-caja-Fix-the-open-terminal-can-not-correct-to-te-29a720a6.patch b/0008-fix-caja-Fix-the-open-terminal-can-not-correct-to-te.patch similarity index 59% rename from 1084-fix-caja-Fix-the-open-terminal-can-not-correct-to-te-29a720a6.patch rename to 0008-fix-caja-Fix-the-open-terminal-can-not-correct-to-te.patch index 5dc41cd414547b13cf7255905a48e773f486e954..36978ab55d3eade3de8e0a54e6c5ae8604ef1dba 100644 --- a/1084-fix-caja-Fix-the-open-terminal-can-not-correct-to-te-29a720a6.patch +++ b/0008-fix-caja-Fix-the-open-terminal-can-not-correct-to-te.patch @@ -1,25 +1,20 @@ -From 29a720a6c6abcf2ab3afeabcc5effef425845e1c Mon Sep 17 00:00:00 2001 +From 4bec7af0e3ae8466650504de11f08526151c6bf9 Mon Sep 17 00:00:00 2001 From: wangxiaoqing Date: Wed, 12 Jan 2022 08:56:02 +0600 -Subject: [PATCH 1084/1085] fix(caja): Fix the open terminal can not correct to +Subject: [PATCH] fix(caja): Fix the open terminal can not correct to terminal icon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - -- 修复从文件管理器打开终端时，图标无法对应上的问题 - Related #48474 - -Signed-off-by: wangxiaoqing --- src/caja-main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/caja-main.c b/src/caja-main.c -index 1fa77c2..1eab994 100644 +index 1187125..4fd5af4 100644 --- a/src/caja-main.c +++ b/src/caja-main.c -@@ -251,6 +251,8 @@ main (int argc, char *argv[]) +@@ -237,6 +237,8 @@ main (int argc, char *argv[]) mallopt (M_MMAP_THRESHOLD, 128 *1024); #endif @@ -29,5 +24,5 @@ index 1fa77c2..1eab994 100644 eel_make_warnings_and_criticals_stop_in_debugger (); } -- -2.27.0 +2.43.0 diff --git a/0003-Fix-the-background-image-can-not-draw-all-when-rotat.patch b/0010-Fix-the-background-image-can-not-draw-all-when-rotat.patch similarity index 62% rename from 0003-Fix-the-background-image-can-not-draw-all-when-rotat.patch rename to 0010-Fix-the-background-image-can-not-draw-all-when-rotat.patch index 6f856b6c1adffe96a3c5e6d651a63ef3a9388319..ef6372ffb7675787916f86024ed5238652363c78 100644 --- a/0003-Fix-the-background-image-can-not-draw-all-when-rotat.patch +++ b/0010-Fix-the-background-image-can-not-draw-all-when-rotat.patch @@ -1,7 +1,7 @@ -From 84bd5f2ea9d84094b5a2b0cba2eab9b8c3116c53 Mon Sep 17 00:00:00 2001 +From 3bbea6be9faa48a44c39898f6ec5c558d1e19f87 Mon Sep 17 00:00:00 2001 From: wangxiaoqing Date: Thu, 28 Jul 2022 14:00:58 +0800 -Subject: [PATCH 3/4] Fix the background image can not draw all when rotating +Subject: [PATCH] Fix the background image can not draw all when rotating screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -12,14 +12,14 @@ Content-Transfer-Encoding: 8bit Signed-off-by: wangxiaoqing --- - src/caja-desktop-window.c | 37 +++++++++++++++++++++++++++++++++++-- - 1 file changed, 35 insertions(+), 2 deletions(-) + src/caja-desktop-window.c | 42 ++++++++++++++++++++++++++++++++++++--- + 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/src/caja-desktop-window.c b/src/caja-desktop-window.c -index 36ae52c..97b5a0b 100644 +index 662c247..5e3c8d9 100644 --- a/src/caja-desktop-window.c +++ b/src/caja-desktop-window.c -@@ -148,17 +148,50 @@ caja_desktop_window_update_directory (CajaDesktopWindow *window) +@@ -153,18 +153,54 @@ caja_desktop_window_update_directory (CajaDesktopWindow *window) g_object_unref (location); } @@ -53,25 +53,30 @@ index 36ae52c..97b5a0b 100644 + *width = x2 - x1; + *height = y2 - y1; +} ++ + static void caja_desktop_window_screen_size_changed (GdkScreen *screen, CajaDesktopWindow *window) { int width_request, height_request; - int scale; ++ int scale; + int screen_width, screen_height; - scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen)); - -- width_request = WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale; -- height_request = HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale; -+ calculate_screen_size (screen, &screen_width, &screen_height); -+ width_request = screen_width / scale; -+ height_request = screen_height / scale; - - g_object_set (window, - "width_request", width_request, + GdkDisplay *display = gdk_screen_get_display (screen); + if (GDK_IS_X11_DISPLAY (display)) + { +- GdkWindow *root_window; +- root_window = gdk_screen_get_root_window (screen); +- gdk_window_get_geometry (root_window, NULL, NULL, &width_request, &height_request); ++ scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen)); ++ ++ calculate_screen_size (screen, &screen_width, &screen_height); ++ width_request = screen_width / scale; ++ height_request = screen_height / scale; + } + else + { -- -2.36.1 +2.43.0 diff --git a/0003-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch b/0011-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch similarity index 59% rename from 0003-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch rename to 0011-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch index f238bf1e4491130c9f2c017fd1d434e9fcd4e6fe..ef715d8664805a6505fcaa2b4af8cc31d567a2b3 100644 --- a/0003-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch +++ b/0011-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch @@ -1,7 +1,7 @@ -From 0b2176a539338466dda802b06fcd7589d51ceef5 Mon Sep 17 00:00:00 2001 +From b0255b95bc607c863148dec062c3c6f861cc861e Mon Sep 17 00:00:00 2001 From: tangjie02 Date: Thu, 7 May 2020 00:06:50 +0800 -Subject: [PATCH 3/3] fix(libegg): caja not register for root in MATE desktop +Subject: [PATCH] fix(libegg): caja not register for root in MATE desktop before session manager timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -11,22 +11,22 @@ Content-Transfer-Encoding: 8bit Signed-off-by: tangjie02 --- - libegg/eggsmclient.c | 2 +- + mate-submodules/libegg/eggsmclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/libegg/eggsmclient.c b/libegg/eggsmclient.c -index 3113e6b..f8c35e1 100644 ---- a/libegg/eggsmclient.c -+++ b/libegg/eggsmclient.c -@@ -368,7 +368,7 @@ egg_sm_client_get (void) +diff --git a/mate-submodules/libegg/eggsmclient.c b/mate-submodules/libegg/eggsmclient.c +index dd03046..92be4da 100644 +--- a/mate-submodules/libegg/eggsmclient.c ++++ b/mate-submodules/libegg/eggsmclient.c +@@ -382,7 +382,7 @@ egg_sm_client_get (void) as egg_sm_client_set_mode must be called prior to start of main loop to stop caja restart but this is diffcult in GtkApplication */ - if (geteuid () == 0 || !(running_in_mate () || running_in_kiran ())){ + if (!(running_in_mate () || running_in_kiran ())){ - global_client = g_object_new (EGG_TYPE_SM_CLIENT, NULL); + global_client = g_object_new (EGG_TYPE_SM_CLIENT, NULL); } } -- -2.33.0 +2.43.0 diff --git a/caja-1.24.1.tar.xz b/caja-1.24.1.tar.xz deleted file mode 100755 index c6021fa5fd30adb09e336bb022cd3181ed496570..0000000000000000000000000000000000000000 Binary files a/caja-1.24.1.tar.xz and /dev/null differ diff --git a/caja-1.24.1-2.isoft.src.rpm b/caja-1.28.0.tar.xz old mode 100755 new mode 100644 similarity index 41% rename from caja-1.24.1-2.isoft.src.rpm rename to caja-1.28.0.tar.xz index 42cbf9cd8aa0689af7308e97b379570fd33a0556..5263fb76f3d42b39edf23d0241ed50dc373cb981 Binary files a/caja-1.24.1-2.isoft.src.rpm and b/caja-1.28.0.tar.xz differ diff --git a/caja.spec b/caja.spec old mode 100755 new mode 100644 index bcfa40dce4b79d4cb8e5bb6c10279a44fa61cb6a..b752fac50571040a3fecf0777fba514cf1ffd786 --- a/caja.spec +++ b/caja.spec @@ -1,51 +1,34 @@ -# Conditional for release and snapshot builds. Uncomment for release-builds. -%global rel_build 1 - -# This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.24 - -# Settings used for build from snapshots. -%{!?rel_build:%global commit ee0a62c8759040d84055425954de1f860bac8652} -%{!?rel_build:%global commit_date 20140223} -%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})} -%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}} -%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}} -%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} - Name: caja Summary: File manager for MATE -Version: %{branch}.1 -%if 0%{?rel_build} -Release: 12 -%else -Release: 0.15%{?git_rel} -%endif +Version: 1.28.0 +Release: 1 License: GPLv2+ and LGPLv2+ URL: http://mate-desktop.org - -# for downloading the tarball use 'spectool -g -R caja.spec' -# Source for release-builds. -%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz} -# Source for snapshot-builds. -%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} - -Patch0: caja_add-xfce-to-desktop-file-1.25.patch -Patch1: 0001-allow-root-to-use-desktop-manager.patch -Patch2: 0002-feature-kiran-Support-kiran-desktop-environment.patch -Patch3: 0003-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch -Patch4: 0001-Support-change-desktop-background-image-in-kiran-des.patch -Patch5: 0001-Fix-the-file-rename-error-msg-too-long.patch -Patch6: 0001-Fix-the-file-can-be-rename-to-only-container-space-n.patch -Patch7: 0002-Let-the-location-bar-background-change-with-theme.patch -Patch8: 0003-Fix-the-background-image-can-not-draw-all-when-rotat.patch -Patch9: 0004-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch -Patch10: 0001-fix-desktop-Add-Chinese-name-translation-to-desktop-.patch -Patch11: 1084-fix-caja-Fix-the-open-terminal-can-not-correct-to-te-29a720a6.patch +Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz + +Patch1: caja_0001-caja-file-operations-fix-caption-button-in-destinati.patch +Patch2: caja_0003-wayland-background-use-mate-appearance-properties-if.patch +Patch3: caja_0004-build-remove-configure-dependency-on-perl-1789.patch +Patch4: caja_0005-wayland-ensure-windows-can-be-moved-if-compositor-is.patch +Patch5: caja_0009-caja-file-operations-fix-estimate-for-queued-copy-17.patch +Patch6: caja_0010-caja-file-operations-restart-timer-also-for-moves.patch + +Patch7: 0001-allow-root-to-use-desktop-manager.patch +Patch8: 0002-feature-kiran-Support-kiran-desktop-environment.patch +Patch9: 0003-Support-change-desktop-background-image-in-kiran-des.patch +Patch10: 0004-Fix-the-file-rename-error-msg-too-long.patch +Patch11: 0005-Fix-the-file-can-be-rename-to-only-container-space-n.patch +Patch12: 0006-Let-the-location-bar-background-change-with-theme.patch +Patch13: 0007-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch +Patch14: 0008-fix-caja-Fix-the-open-terminal-can-not-correct-to-te.patch +Patch15: 0010-Fix-the-background-image-can-not-draw-all-when-rotat.patch +Patch16: 0011-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: exempi-devel BuildRequires: gobject-introspection-devel +BuildRequires: gtk-layer-shell-devel BuildRequires: cairo-gobject-devel BuildRequires: libexif-devel BuildRequires: libselinux-devel @@ -59,7 +42,7 @@ BuildRequires: startup-notification-devel BuildRequires: libnotify-devel Requires: filesystem -Requires: openEuler-menus +Requires: %{_vendor}-menus Requires: gvfs # the main binary links against libcaja-extension.so @@ -102,28 +85,21 @@ for developing caja extensions. %prep -%if 0%{?rel_build} %autosetup -p1 -%else -%autosetup -n %{name}-%{commit} -p1 -%endif # disable startup notification sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-computer.desktop.in.in sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-home.desktop.in.in -%if 0%{?rel_build} -#NOCONFIGURE=1 ./autogen.sh -%else # 0%{?rel_build} -# needed for git snapshots +#Patch2 NOCONFIGURE=1 ./autogen.sh -%endif # 0%{?rel_build} %build %configure \ --disable-static \ --disable-schemas-compile \ - --disable-update-mimedb + --disable-update-mimedb \ + --enable-wayland #drop unneeded direct library deps with --as-needed # libtool doesn't make this easy, so we do it the hard way @@ -192,583 +168,13 @@ EOF %changelog -* Fri Sep 09 2022 liuxinhao - 1.24.1-12 -- Apply the last submitted patch - -* Thu Sep 08 2022 liuxinhao - 1.24.1-11 -- Fix the open terminal can not correct to terminal icon(#I5Q5ME) - -* Fri Sep 02 2022 wangxiaoqing - 1.24.1-10 -- Add Chinese name translation to desktop files - -* Fri Jul 29 2022 wangxiaoqing - 1.24.1-9 -- Fix the file can be rename to only container space name -- Let the location bar background change with theme -- Fix the background image can not draw all when rotating -- Not draw icon and text hight light color when icon not get force - -* Fri Jul 29 2022 wangxiaoqing - 1.24.1-8 -- Fix the file rename error msg too long - -* Wed Jul 27 2022 wangxiaoqing - 1.24.1-7 -- Support change desktop background image in kiran desktop - -* Thu Jun 23 2022 tangjie02 - 1.24.1-6 -- Remove %{?dist} - -* Thu Jun 23 2022 tangjie02 - 1.24.1-5 -- Support kiran desktop environment. -- Caja not register for root in MATE desktop before session manager timeout - -* Thu Mar 24 2022 zhangtao - 1.24.1-4 -- modify else release number back - -* Thu Mar 24 2022 xu_ping - 1.24.1-3 -- Remove %{?dist} - -* Tue Jan 25 2022 longcheng - 1.24.1-2 -- Modify the require redhat-menus to openEuler-menus -- Allow root to use desktop manager - -* Thu Mar 25 2021 Wolfgang Ulbrich - 1.24.1-1 -- update to 1.24.1 - -* Tue Feb 9 2021 Wolfgang Ulbrich - 1.24.0-7 -- drop gamin dependency - -* Tue Jan 26 2021 Fedora Release Engineering - 1.24.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.24.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun May 24 2020 Wolfgang Ulbrich - 1.24.0-4 -- fix dependencies, hopefully - -* Sat May 23 2020 Wolfgang Ulbrich - 1.24.0-3 -- drop non needed provides and obsoletes - -* Fri May 22 2020 Wolfgang Ulbrich - 1.24.0-2 -- drop BR pangox-compat-devel in favour of pango-devel - -* Mon Feb 10 2020 Wolfgang Ulbrich - 1.24.0-1 -- update to 1.24.0 - -* Sun Feb 02 2020 Wolfgang Ulbrich - 1.23.4-1 -- update to 1.23.4 -- fix f32 mass rebuild -- drop c99 patch - -* Tue Jan 28 2020 Fedora Release Engineering - 1.22.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Dec 23 2019 Wolfgang Ulbrich - 1.22.3-1 -- update to 1.22.3 - -* 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 - -* Wed Sep 18 2019 Wolfgang Ulbrich - 1.22.2-1 -- update to 1.22.2 - -* Tue Sep 10 2019 Florian Weimer - 1.22.1-4 -- Fix building in C99 mode - -* Fri Sep 06 2019 Nikola Forró - 1.22.1-3 -- rebuilt for exempi 2.5.1 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.22.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Apr 26 2019 Wolfgang Ulbrich - 1.22.1-1 -- update to 1.22.1 - -* Mon Mar 04 2019 Wolfgang Ulbrich - 1.22.0-1 -- update to 1.22.0 - -* Thu Jan 31 2019 Fedora Release Engineering - 1.20.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Dec 11 2018 Wolfgang Ulbrich - 1.20.3-1 -- test 1.20.3 - -* Thu Jul 12 2018 Fedora Release Engineering - 1.20.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 12 2018 Wolfgang Ulbrich - 1.20.2-2 -- rename caja-extension sub-package to avoid conflicts with -- debuginfo from caja-extensions - -* Fri Apr 06 2018 Wolfgang Ulbrich - 1.20.2-1 -- update to 1.20.2 - -* Tue Mar 27 2018 Wolfgang Ulbrich - 1.20.1-1 -- update to 1.20.1 - -* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-3 -- fix emblem and backgrounds preferences UI - -* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-2 -- drop obsolet scriptlet again - -* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-1 -- update to 1.20.0 release -- drop mimeinfo rpm scriptlet -- drop desktop-database rpm scriptlet -- drop GSettings Schema rpm scriptlet -- switch to using autosetup - -* Wed Feb 07 2018 Fedora Release Engineering - 1.19.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 07 2018 Igor Gnatenko - 1.19.3-2 -- Remove obsolete scriptlets - -* 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 - -* Mon Aug 28 2017 Wolfgang Ulbrich - 1.19.1-2 -- use https://github.com/mate-desktop/caja/pull/837 -- use https://github.com/mate-desktop/caja/pull/838 - -* Sat Aug 26 2017 Wolfgang Ulbrich - 1.19.1-1 -- update to 1.19.1 - -* Wed Aug 09 2017 Wolfgang Ulbrich - 1.19.0-4 -- remove virtual provides - -* Wed Aug 02 2017 Fedora Release Engineering - 1.19.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.19.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu May 11 2017 Wolfgang Ulbrich - 1.19.0-1 -- update to 1.19.0 release - -* Tue Apr 25 2017 Wolfgang Ulbrich - 1.18.2-3 -- fix opening download folder from Firefox "freezes" X -- https://github.com/mate-desktop/caja/commit/6ece67f - -* Tue Apr 25 2017 Wolfgang Ulbrich - 1.18.2-2 -- add some upstream patches -- Expand grid width to canvas -- use gtk+-3 bookmark location -- force icons size in open-with-dialog -- show correct right-click menu after making selection - -* Tue Apr 04 2017 Wolfgang Ulbrich - 1.18.2-1 -- update to 1.18.2 -- add upstream commit "Expand grid width to canvas" - -* Tue Apr 04 2017 Wolfgang Ulbrich - 1.18.1-1 -- update to 1.18.1 - -* Tue Mar 14 2017 Wolfgang Ulbrich - 1.18.0-1 -- update to 1.18.0 release - -* Fri Feb 10 2017 Fedora Release Engineering - 1.17.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jan 18 2017 Wolfgang Ulbrich - 1.17.3-1 -- update to 1.17.3 - -* Mon Jan 09 2017 Wolfgang Ulbrich - 1.17.2-1 -- update to 1.17.2 -- fix running under wayland session - -* Sat Dec 03 2016 Wolfgang Ulbrich - 1.17.1-1 -- update to 1.17.1 release - -* Thu Nov 17 2016 Wolfgang Ulbrich - 1.17.0-1 -- update to 1.17.0 release - -* Wed Oct 19 2016 Wolfgang Ulbrich - 1.16.1-1 -- update to 1.16.1 release -- fix Orca speaking - -* Thu Sep 22 2016 Wolfgang Ulbrich - 1.16.0-1 -- update to 1.16.0 release -- disable startup notification - -* Sat Aug 13 2016 Wolfgang Ulbrich - 1.15.4-1 -- update to 1.15.4 release - -* Wed Aug 10 2016 Wolfgang Ulbrich - 1.15.3-3 -- fix crash on changing wallpapers in non-compositor mode - -* Mon Aug 08 2016 Wolfgang Ulbrich - 1.15.3-2 -- fix desktop background rendering in noncomposited mode - -* Thu Aug 04 2016 Wolfgang Ulbrich - 1.15.3-1 -- update to 1.15.3 release - -* Sun Jul 24 2016 Wolfgang Ulbrich - 1.15.2-2 -- fix desktop redraw issues with gtk+-3.21.4 - -* Sat Jul 02 2016 Wolfgang Ulbrich - 1.15.2-1 -- update to 1.15.2 release - -* Sat Jul 02 2016 Wolfgang Ulbrich - 1.15.1-1 -- update to 1.15.1 release - -* Mon Jun 27 2016 Wolfgang Ulbrich - 1.15.0-2 -- don't show color and image backgounds menu entry - -* Thu Jun 09 2016 Wolfgang Ulbrich - 1.15.0-1 -- update to 1.15.0 release -- switch to gtk+3 - -* Sat May 21 2016 Wolfgang Ulbrich - 1.14.1-1 -- update to 1.14.1 release - -* Tue Apr 05 2016 Wolfgang Ulbrich - 1.14.0-1 -- update to 1.14.0 release - -* Mon Feb 22 2016 Wolfgang Ulbrich - 1.13.1-1 -- update to 1.13.1 release - -* Sun Feb 07 2016 Wolfgang Ulbrich - 1.13.0-1 -- update to 1.13.0 release -- try fix rhbz (#1291540) - -* Wed Feb 03 2016 Fedora Release Engineering - 1.12.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sun Dec 27 2015 Wolfgang Ulbrich - 1.12.2-2 -- add XFCE to OnlyShowIn in caja-browser.desktop - -* Thu Dec 24 2015 Wolfgang Ulbrich - 1.12.2-1 -- update to 1.12.2 release -- remove upstreamed patch - -* Tue Dec 22 2015 Wolfgang Ulbrich - 1.12.1-2 -- change cajas behaviour in xfce session, rhbz (#1278079) - -* Tue Dec 01 2015 Wolfgang Ulbrich - 1.12.1-1 -- update to 1.12.1 release - -* Fri Nov 06 2015 Wolfgang Ulbrich - 1.12.0-1 -- update to 1.12.0 release - -* Wed Oct 21 2015 Wolfgang Ulbrich - 1.11.0-1 -- update to 1.11.0 release - -* Fri Sep 25 2015 Wolfgang Ulbrich - 1.10.4-1 -- update to 1.10.4 release -- remove upstreamed patches - -* Thu Sep 17 2015 Wolfgang Ulbrich - 1.10.3-2 -- fix crash if restore file from trash in f23 -- do not save position from last window - -* Tue Jul 21 2015 Wolfgang Ulbrich - 1.10.3-1 -- update to 1.10.3 release - -* Thu Jul 16 2015 Wolfgang Ulbrich - 1.10.2.1 -- update to 1.10.2 release -- remove upstreamed patches - -* Sat Jul 11 2015 Wolfgang Ulbrich - 1.10.1-7 -- use new help dir - -* Fri Jul 03 2015 Wolfgang Ulbrich - 1.10.0-6 -- revert 'allow caja --no-desktop in other desktops' - -* Fri Jul 03 2015 Wolfgang Ulbrich - 1.10.0-5 -- use old help from 1.8 - -* Sun Jun 28 2015 Wolfgang Ulbrich - 1.10.1.4 -- improve double click detection -- no daemon mode in other desktop environments -- allow caja --no-desktop in other desktops - -* Sat Jun 20 2015 Wolfgang Ulbrich - 1.10.1.3 -- fix caja help -- fix renaming of files (gtk3) -- add new bookmark behaviour -- drop old bookmarks patch - -* Wed Jun 17 2015 Fedora Release Engineering - 1.10.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Jun 12 2015 Wolfgang Ulbrich - 1.10.1.1 -- update to 1.10.1 release -- add bookmarks patch again -- avoid prelink to mess with caja rhbz (#1228874) - -* Mon Apr 06 2015 Wolfgang Ulbrich - 1.10.0-1 -- update to 1.10.0 release - -* Wed Feb 25 2015 Wolfgang Ulbrich - 1.9.90.1 -- update to 1.9.90 release - -* Tue Jan 13 2015 Wolfgang Ulbrich - 1.9.4.1 -- update to 1.9.4 release - -* Tue Nov 11 2014 Wolfgang Ulbrich - 1.9.3-1 -- update to 1.9.3 release - -* Sun Oct 12 2014 Wolfgang Ulbrich - 1.9.2-1 -- update to 1.9.2 release -- adjust obsoletes - -* Fri Aug 15 2014 Fedora Release Engineering - 1.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jul 12 2014 Wolfgang Ulbrich - 1.9.1-1 -- update to 1.9.1 release -- move gtk-docs to -devel subpackage -- removed upstreamed patches - -* Tue Jul 08 2014 Rex Dieter 1.8.1-3 -- optimize/update scriptlets - -* Sat Jun 07 2014 Fedora Release Engineering - 1.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Apr 26 2014 Wolfgang Ulbrich - 1.8.1-1 -- update to 1.8.1 release -- remove upstreamed patches - -* Sat Mar 22 2014 Wolfgang Ulbrich - 1.8.0-2 -- fix for x-caja-window issue, end of a long story -- remove consolekit usage -- don't use caja-autostart script anymore - -* Tue Mar 04 2014 Dan Mashal - 1.8.0-1 -- Update to 1.8.0 -- Turn autoreconf bit back on. This is still needed for rpath issue. - -* Sun Feb 23 2014 Wolfgang Ulbrich - 1.7.91-0.1.git20140223.ee0a62 -- update to latest git snapshot from 2014.02.23 -- remove debuging patch, fix rhbz (#1067234) -- move autoreconf to the right place -- remove delay from caja-autostart for testing proposal -- remove non existent COPYING-DOCS -- disable gtk-docs for dit snapshot builds - -* Wed Feb 12 2014 Dan Mashal - 1.7.2-2 -- Add autoreconf -fi to fix rpath issues. - -* Sun Feb 09 2014 Dan Mashal - 1.7.2-1 -- Update to 1.7.2 - -* Tue Jan 14 2014 Wolfgang Ulbrich - 1.7.1-1 -- update to 1.7.1 -- remove glib-2.39 fix, already fixed in upstream -- use gtk-docs for release build - -* Tue Dec 17 2013 Wolfgang Ulbrich - 1.7.1-0.6.git20131201.0ef48fa -- fix build against new glib2-39.2, 'g_memmove' is removed -- https://git.gnome.org/browse/glib/commit/?id=6e4a7fca431f53fdfd89afbe956212229cf52200 - -* Tue Dec 17 2013 Wolfgang Ulbrich - 1.7.1-0.5.git20131201.0ef48fa -- new patch for x-caja-window issue, it surpress creating x-caja-desktop-windows -- rename patches -- fix provides -- use modern 'make install' macro -- make Maintainers life easier and use better git snapshot usage, Thanks to Björn Esser - -* Sun Dec 08 2013 Wolfgang Ulbrich - 1.7.1-0.4.git0ef48fab -- add mimeinfo rpm scriplets again - -* Sun Dec 08 2013 Wolfgang Ulbrich - 1.7.1-0.3.git0ef48fab -- fix usage of %%{buildroot} -- use desktop-database rpm scriptlet instead of mimeinfo scriptlet - -* Sat Dec 07 2013 Wolfgang Ulbrich - 1.7.1-0.2.git0ef48fab -- fix all the macro-in-comment warnings -- add ldconfig scriptlets for the extension subpackage -- add versioned provides for the obsoleted packages -- remove licence tags from subpackages -- remove group tags from subpackages -- fix permission for caja-autostart script - -* Thu Dec 05 2013 Wolfgang Ulbrich - 1.7.1-0.1.git0ef48fab -- rename mate-file-manager to caja for f21 -- use latest git snapshot, 2013.12.05 - -* Thu Dec 05 2013 Dan Mashal - 1.7.0-1 -- Update to 1.7.0 - -* Thu Oct 10 2013 Wolfgang Ulbrich - 1.6.3-0.7.gitbf47018 -- add add autostart script to desktop file - -* Thu Oct 10 2013 Wolfgang Ulbrich - 1.6.3-0.6.gitbf47018 -- add a 3 secs delay for caja autostart and restart if killed - -* Mon Oct 07 2013 Wolfgang Ulbrich - 1.6.3-0.5.gitbf47018 -- add new caja-sidebar design for f20 - -* Mon Oct 07 2013 Wolfgang Ulbrich - 1.6.3-0.4.gitbf47018 -- allow dropping files to bookmarks -- fix https://github.com/mate-desktop/mate-file-manager/issues/122 - -* Sun Oct 06 2013 Wolfgang Ulbrich - 1.6.3-0.3.gitbf47018 -- fix caja crash if closing properties windows on dropbox folder - -* Sun Sep 22 2013 Wolfgang Ulbrich - 1.6.3-0.2.git73cc7e9 -- update latest git snapshot -- fix rhbz (#1005660) -- change open folders in spatial-mode -- fix spatial mode crash and shift+double click -- https://github.com/mate-desktop/mate-file-manager/issues/120 -- https://github.com/mate-desktop/mate-file-manager/issues/161 -- fixed thumbnail frame not being displayed for some files -- https://github.com/mate-desktop/mate-file-manager/issues/135 - -* Wed Sep 18 2013 Wolfgang Ulbrich - 1.6.3-0.1.git6278dcb -- update latest git snapshot -- fix rhbz (959444) -- remove upstreamed mate-file-manager_fix_privat-icons-dir.patch - -* Thu Aug 08 2013 Wolfgang Ulbrich - 1.6.2-3 -- move gsettings schemas to -schemas subpackage, to fix #959607 -- move locale to -schemas subpackage -- remove runtime require hicolor-icon-theme - -* Sat Aug 03 2013 Fedora Release Engineering - 1.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jul 20 2013 Wolfgang Ulbrich - 1.6.2-1 -- update to new upstream release -- remove in release included mate-file-manager_fix-radio-buttons.patch -- add upstream mate-file-manager_fix_privat-icons-dir.patch -- remove needless runtime require gsettings-desktop-schemas -- remove runtime require mate-icon-theme - -* Mon Jul 01 2013 Wolfgang Ulbrich - 1.6.1-9 -- set autostart to false in caja-autostart, fix rhbz #969663 -- and #978598 - -* Sun Jun 30 2013 Wolfgang Ulbrich - 1.6.1-8 -- add mate-file-manager_fix-radio-buttons.patch to fix rhbz #964357 -- clean up BR's -- add runtime require hicolor-icon-theme -- revert 1.6.1-7 changes - -* Thu Jun 20 2013 Dan Mashal - 1.6.1-7 -- Try caja without the autostart file (886029) - -* Sat Jun 15 2013 Wolfgang Ulbrich - 1.6.1-6 -- remove gsettings convert file - -* Thu Jun 06 2013 Wolfgang Ulbrich - 1.6.1-5 -- add AutostartCondition to caja-autostart.desktop - -* Wed May 22 2013 Wolfgang Ulbrich - 1.6.1-4 -- workaround for x-caja-desktop window issue -- add caja-autostart desktopfile to /etc/xdg/autostart - -* Wed May 15 2013 Dan Mashal - 1.6.1-3 -- Fix previous commit - -* Tue May 14 2013 Dan Mashal - 1.6.1-2 -- Own libdir/caja (961992) - -* Thu Apr 11 2013 Dan Mashal - 1.6.1-1 -- Update to latest upstream release. - -* Wed Apr 03 2013 Dan Mashal - 1.6.0-1 -- Update to latest 1.6.0 stable release. - -* Mon Mar 11 2013 Dan Mashal - 1.5.5-1 -- Update to latest upstream release - -* Sat Mar 02 2013 Dan Mashal - 1.5.4-1 -- Update to latest upstream release -- Add upstream patch - -* Mon Dec 03 2012 Dan Mashal - 1.5.2-1 -- Update to 1.5.2 release -- Drop all patches -- Update configure flags -- Clean up spec file - -* Sun Nov 25 2012 Leigh Scott - 1.5.1-2 -- upload source again as upstream switched it -- specfile cleanup - -* Fri Nov 23 2012 Leigh Scott - 1.5.1-1 -- update to 1.5.1 release -- drop upstream commits patch and other merged patch -- change source url and fix packagename in %%prep to suit - -* Thu Nov 22 2012 Leigh Scott - 1.5.0-6 -- update commits patch - -* Tue Nov 20 2012 Leigh Scott - 1.5.0-5 -- add git commits rollup patch, hopefully it fixes rhbz 868472 -- drop merged patch - -* Mon Nov 19 2012 Dan Mashal - 1.5.0-4 -- This change was reverted - -* Sun Nov 11 2012 Leigh Scott - 1.5.0-3 -- add patch to call gdk_pixbuf_loader_close() earlier (#558267) -- fix mistake in scriptlets - -* Mon Oct 29 2012 Leigh Scott - 1.5.0-2 -- add requires gsettings-desktop-schemas -- add build requires gsettings-desktop-schemas-devel - -* Mon Oct 29 2012 Leigh Scott - 1.5.0-1 -- update to 1.5.0 release -- add schema scriptlets and remove mateconf scriptlets -- drop un-needed requires and build requires and change style -- make directory for extensions and move to main package -- drop all patches not needed for building for now -- clean up spec file - -* Thu Oct 18 2012 Rex Dieter - 1.4.0-12 -- fix mate-doc xml error (patch out reference to non-existent caja-extension-i18n.xml) -- verbose build - -* Thu Oct 18 2012 Leigh Scott - 1.4.0-11 -- Drop caja_remove_mate-bg-crossfade patch as it was causing crash - -* Thu Oct 18 2012 Leigh Scott - 1.4.0-10 -- add patch to try and fix crash - -* Thu Oct 18 2012 Leigh Scott - 1.4.0-9 -- revert last commit "add autostart file for caja desktop" -- add no session delay patch - -* Thu Oct 18 2012 Leigh Scott - 1.4.0-8 -- add autostart file for caja desktop -- add build requires libxml2-devel - -* Mon Aug 20 2012 Wolfgang Ulbrich - 1.4.0-7 -- remove obsoleting stuff - -* Thu Aug 16 2012 Rex Dieter 1.4.0-6 -- drop needless ldconfig scriptlet on main pkg - -* Mon Aug 13 2012 Wolfgang Ulbrich - 1.4.0-5 -- fix desktop file handle -- fix obsolete caja from external repo - -* Sun Aug 12 2012 Wolfgang Ulbrich - 1.4.0-4 -- correct %%build section -- correct rpm scriplets -- correct %%prep section -- change .*z to .* in %%file section -- correct obsoletes -- some other fixes - -* Sun Aug 12 2012 Wolfgang Ulbrich - 1.4.0-3 -- obsoleting caja from external repo -- remove unecessary build requires - -* Tue Aug 07 2012 Wolfgang Ulbrich - 1.4.0-2 -- initial package for fedora - -* Sun Dec 25 2011 Wolfgang Ulbrich - 1.1.0-1 -- mate-file-manager.spec based on nautilus-2.32.0-1.fc14 spec - +* Fri Mar 14 2025 yuanxing - 1.28.0-1 +- Initial build +- KYOS-F: allow root to use desktop manager +- KYOS-F: feature(kiran): Support kiran desktop environment +- KYOS-F: Support change desktop background image in kiran desktop(#I5I1HE) +- KYOS-B: Fix the file rename error msg too long(#I5I8IM) +- KYOS-B: Fix the file can be rename to only container space name(#I5I8KI) +- KYOS-F: Let the location bar background change with theme(#I5I8V9) +- KYOS-B: Not draw icon and text hight light color when icon not get force(#I5HRI0) +- KYOS-B: Fix the open terminal can not correct to terminal icon diff --git a/caja_0001-caja-file-operations-fix-caption-button-in-destinati.patch b/caja_0001-caja-file-operations-fix-caption-button-in-destinati.patch new file mode 100644 index 0000000000000000000000000000000000000000..aaaac858bc19793c94a12555e4f10ceff2a74646 --- /dev/null +++ b/caja_0001-caja-file-operations-fix-caption-button-in-destinati.patch @@ -0,0 +1,186 @@ +From d90c625350c52b2ca10b6edda50c977075ad5fc6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20P=C3=B6schel?= +Date: Sat, 3 Feb 2024 22:43:45 +0100 +Subject: [PATCH 1/8] caja-file-operations: fix caption/button in destination + error dialogue + +For certain operations, the destination is checked. If an error occurs, +the user is asked how to proceed using a dialogue. So far this dialogue +was hard-coded to only consider the copy operation. + +This fix also considers the other affected operations and generalizes +the continue button text. +--- + libcaja-private/caja-file-operations.c | 49 ++++++++++++++++++++++---- + 1 file changed, 42 insertions(+), 7 deletions(-) + +diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c +index 8676800e..edc595b1 100644 +--- a/libcaja-private/caja-file-operations.c ++++ b/libcaja-private/caja-file-operations.c +@@ -152,6 +152,8 @@ typedef struct { + } SetPermissionsJob; + + typedef enum { ++ OP_KIND_CREATE, ++ OP_KIND_LINK, + OP_KIND_COPY, + OP_KIND_MOVE, + OP_KIND_DELETE, +@@ -188,7 +190,7 @@ typedef struct { + #define DELETE_ALL _("Delete _All") + #define REPLACE_ALL _("Replace _All") + #define MERGE_ALL _("Merge _All") +-#define COPY_FORCE _("Copy _Anyway") ++#define CONTINUE_FORCE _("Continue _Anyway") + + NotifyNotification *unmount_notify; + +@@ -2522,6 +2524,10 @@ report_count_progress (CommonJob *job, + + switch (source_info->op) { + default: ++ // OP_KIND_CREATE and OP_KIND_LINK don't have a source ++ g_assert_not_reached (); ++ s = f (""); ++ break; + case OP_KIND_COPY: + s = f (ngettext("Preparing to copy %'d file (%S)", + "Preparing to copy %'d files (%S)", +@@ -2571,6 +2577,9 @@ get_scan_primary (OpKind kind) + { + switch (kind) { + default: ++ // OP_KIND_CREATE and OP_KIND_LINK don't have a source ++ g_assert_not_reached (); ++ return f (""); + case OP_KIND_COPY: + return f (_("Error while copying.")); + case OP_KIND_MOVE: +@@ -2820,8 +2829,29 @@ scan_sources (GList *files, + report_count_progress (job, source_info); + } + ++static char * ++get_verify_primary (OpKind kind, ++ GFile *dest) ++{ ++ switch (kind) { ++ default: ++ // OP_KIND_DELETE and OP_KIND_TRASH don't have a destination ++ g_assert_not_reached (); ++ return f (""); ++ case OP_KIND_CREATE: ++ return f (_("Error while creating file/directory in \"%B\"."), dest); ++ case OP_KIND_LINK: ++ return f (_("Error while creating link in \"%B\"."), dest); ++ case OP_KIND_COPY: ++ return f (_("Error while copying to \"%B\"."), dest); ++ case OP_KIND_MOVE: ++ return f (_("Error while moving to \"%B\"."), dest); ++ } ++} ++ + static void + verify_destination (CommonJob *job, ++ OpKind kind, + GFile *dest, + char **dest_fs_id, + goffset required_size) +@@ -2853,7 +2883,7 @@ verify_destination (CommonJob *job, + return; + } + +- primary = f (_("Error while copying to \"%B\"."), dest); ++ primary = get_verify_primary (kind, dest); + details = NULL; + + if (IS_IO_ERROR (error, PERMISSION_DENIED)) { +@@ -2895,7 +2925,7 @@ verify_destination (CommonJob *job, + g_object_unref (info); + + if (file_type != G_FILE_TYPE_DIRECTORY) { +- primary = f (_("Error while copying to \"%B\"."), dest); ++ primary = get_verify_primary (kind, dest); + secondary = f (_("The destination is not a folder.")); + + response = run_error (job, +@@ -2928,7 +2958,7 @@ verify_destination (CommonJob *job, + G_FILE_ATTRIBUTE_FILESYSTEM_FREE); + + if (free_size < (guint64) required_size) { +- primary = f (_("Error while copying to \"%B\"."), dest); ++ primary = get_verify_primary (kind, dest); + secondary = f(_("There is not enough space on the destination. Try to remove files to make space.")); + + details = f (_("There is %" G_GUINT64_FORMAT " available, but %" G_GOFFSET_FORMAT " is required."), free_size, required_size); +@@ -2939,7 +2969,7 @@ verify_destination (CommonJob *job, + details, + FALSE, + CANCEL, +- COPY_FORCE, ++ CONTINUE_FORCE, + RETRY, + NULL); + +@@ -2948,7 +2978,7 @@ verify_destination (CommonJob *job, + } else if (response == 2) { + goto retry; + } else if (response == 1) { +- /* We are forced to copy - just fall through ... */ ++ /* We are forced to continue - just fall through ... */ + } else { + g_assert_not_reached (); + } +@@ -2958,7 +2988,7 @@ verify_destination (CommonJob *job, + if (!job_aborted (job) && + g_file_info_get_attribute_boolean (fsinfo, + G_FILE_ATTRIBUTE_FILESYSTEM_READONLY)) { +- primary = f (_("Error while copying to \"%B\"."), dest); ++ primary = get_verify_primary (kind, dest); + secondary = f (_("The destination is read-only.")); + + response = run_error (job, +@@ -4668,6 +4698,7 @@ copy_job (GIOSchedulerJob *io_job, + } + + verify_destination (&job->common, ++ OP_KIND_COPY, + dest, + &dest_fs_id, + source_info.num_bytes); +@@ -5196,6 +5227,7 @@ move_job (GIOSchedulerJob *io_job, + caja_progress_info_start (job->common.progress); + + verify_destination (&job->common, ++ OP_KIND_MOVE, + job->destination, + &dest_fs_id, + -1); +@@ -5225,6 +5257,7 @@ move_job (GIOSchedulerJob *io_job, + } + + verify_destination (&job->common, ++ OP_KIND_MOVE, + job->destination, + NULL, + source_info.num_bytes); +@@ -5526,6 +5559,7 @@ link_job (GIOSchedulerJob *io_job, + caja_progress_info_start (job->common.progress); + + verify_destination (&job->common, ++ OP_KIND_LINK, + job->destination, + NULL, + -1); +@@ -6009,6 +6043,7 @@ create_job (GIOSchedulerJob *io_job, + max_length = get_max_name_length (job->dest_dir); + + verify_destination (common, ++ OP_KIND_CREATE, + job->dest_dir, + NULL, -1); + if (job_aborted (common)) { +-- +2.47.0 + diff --git a/caja_0003-wayland-background-use-mate-appearance-properties-if.patch b/caja_0003-wayland-background-use-mate-appearance-properties-if.patch new file mode 100644 index 0000000000000000000000000000000000000000..d21f54e643783684a3f39fd16e5015d0cf1ff855 --- /dev/null +++ b/caja_0003-wayland-background-use-mate-appearance-properties-if.patch @@ -0,0 +1,37 @@ +From d5a66388fe5f076939136671449de057aaa3b44f Mon Sep 17 00:00:00 2001 +From: Luke from DC +Date: Tue, 30 Jul 2024 20:58:44 +0000 +Subject: [PATCH 03/10] wayland background: use mate-appearance-properties if + we can (#1771) + +*In the wayland session, we now have mate-settings-daemon with GDK_BACKEND=x11 +*We need it anyway to control theming in xwayland apps,so we can now use mate-appearance-properties to set the desktop background when it is running +--- + src/file-manager/fm-desktop-icon-view.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c +index 0d0c034a..954c26de 100644 +--- a/src/file-manager/fm-desktop-icon-view.c ++++ b/src/file-manager/fm-desktop-icon-view.c +@@ -717,7 +717,16 @@ action_change_background_callback (GtkAction *action, + /*Get the new background and switch to it in wayland*/ + if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default())) + { +- wayland_bg_dialog_new (); ++ /*We can use the appearance capplet with some versions of mate-control-center ++ *in which the appearance capplet works in wayland ++ *Try it first, and fall back to the standalone dialog if it fails ++ */ ++ GError *error = NULL; ++ ++ g_spawn_command_line_async ("mate-appearance-properties --show-page=background", ++ &error); ++ if (error != NULL) ++ wayland_bg_dialog_new (); + } + else + #endif +-- +2.48.1 + diff --git a/caja_0004-build-remove-configure-dependency-on-perl-1789.patch b/caja_0004-build-remove-configure-dependency-on-perl-1789.patch new file mode 100644 index 0000000000000000000000000000000000000000..8a1e1b0e2974e8b60bf3e54b5423ce697b89fe6b --- /dev/null +++ b/caja_0004-build-remove-configure-dependency-on-perl-1789.patch @@ -0,0 +1,33 @@ +From 421c24b979198a7a7b54f8e89d58dc1bb80c8df7 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Thu, 29 Aug 2024 13:11:40 -0400 +Subject: [PATCH 04/10] build: remove configure dependency on perl (#1789) + +It is totally unused. In 2010, nautilus removed a perl script used to +generate enums: +https://gitlab.gnome.org/GNOME/nautilus/-/commit/75a03a440ebff23ccbf8674ca4a0e9f6475ebbb8 + +Before then, perl was needed to build. After this commit, nautilus still +had messy code to check for perl availability but did nothing with it. +Across multiple forks and reinitialized git repositories that dropped +all commit history, it turns out that caja still has that messy code +too. +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index fa3c4f08..70b61787 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,7 +134,6 @@ fi + + dnl ========================================================================== + +-AC_CHECK_PROGS(PERL, perl5 perl) + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + + dnl ========================================================================== +-- +2.48.1 + diff --git a/caja_0005-wayland-ensure-windows-can-be-moved-if-compositor-is.patch b/caja_0005-wayland-ensure-windows-can-be-moved-if-compositor-is.patch new file mode 100644 index 0000000000000000000000000000000000000000..773fbadc7e6c87097956130e95fbbd00c2bb79d9 --- /dev/null +++ b/caja_0005-wayland-ensure-windows-can-be-moved-if-compositor-is.patch @@ -0,0 +1,58 @@ +From d55e854dade057bb954778d12acdbdc77d8c0422 Mon Sep 17 00:00:00 2001 +From: Luke from DC +Date: Sun, 22 Sep 2024 06:07:42 +0000 +Subject: [PATCH 05/10] wayland: ensure windows can be moved if compositor is + using CSD (#1787) + +*Do not use G_OBJECT_CLASS (class)->constructed +*We don't seem to need it anymore and it breaks dragging windows with the titlebar or resizing with the mouse in wayland +--- + src/caja-window.c | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +diff --git a/src/caja-window.c b/src/caja-window.c +index a67a5ee4..2191a7ed 100644 +--- a/src/caja-window.c ++++ b/src/caja-window.c +@@ -631,17 +631,6 @@ caja_window_set_initial_window_geometry (CajaWindow *window) + max_height_for_screen)); + } + +-static void +-caja_window_constructed (GObject *self) +-{ +- CajaWindow *window; +- +- window = CAJA_WINDOW (self); +- +- caja_window_initialize_bookmarks_menu (window); +- caja_window_set_initial_window_geometry (window); +-} +- + static void + caja_window_set_property (GObject *object, + guint arg_id, +@@ -742,6 +731,12 @@ caja_window_constructor (GType type, + + slot = caja_window_open_slot (window->details->active_pane, 0); + caja_window_set_active_slot (window, slot); ++ /*We can now do this here instead of in a separate constructed function ++ *and we need to because the separate constructed function causes the ++ *window to be un-draggable/un-resizable with the mouse in wayland ++ */ ++ caja_window_initialize_bookmarks_menu (window); ++ caja_window_set_initial_window_geometry (window); + + return object; + } +@@ -2170,7 +2165,6 @@ caja_window_class_init (CajaWindowClass *class) + GtkBindingSet *binding_set; + + G_OBJECT_CLASS (class)->constructor = caja_window_constructor; +- G_OBJECT_CLASS (class)->constructed = caja_window_constructed; + G_OBJECT_CLASS (class)->get_property = caja_window_get_property; + G_OBJECT_CLASS (class)->set_property = caja_window_set_property; + G_OBJECT_CLASS (class)->finalize = caja_window_finalize; +-- +2.48.1 + diff --git a/caja_0009-caja-file-operations-fix-estimate-for-queued-copy-17.patch b/caja_0009-caja-file-operations-fix-estimate-for-queued-copy-17.patch new file mode 100644 index 0000000000000000000000000000000000000000..03a6dbdf9913432fb99a1d6c2f0e578c4bfef5ab --- /dev/null +++ b/caja_0009-caja-file-operations-fix-estimate-for-queued-copy-17.patch @@ -0,0 +1,72 @@ +From bfa6b650c732ff9edddd1537b14bdab39819fc45 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20P=C3=B6schel?= + +Date: Fri, 13 Dec 2024 05:44:28 +0100 +Subject: [PATCH 09/10] caja-file-operations: fix estimate for queued copy + (#1759) + +* caja-file-operations: fix estimate for queued copy + +Fixes the condition for showing an estimate of the remaining duration in +case a copy operation is queued, correctly considering the current +transfer rate. + +* caja-file-operations: fix division by 0 for delete + +Aligning to the copy operation case, this fixes the condition for +showing an estimate of the remaining duration for delete operations, +preventing a possible division by 0 due to a zero transfer rate. +--- + libcaja-private/caja-file-operations.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c +index edc595b1..6ab8697d 100644 +--- a/libcaja-private/caja-file-operations.c ++++ b/libcaja-private/caja-file-operations.c +@@ -1497,7 +1497,7 @@ report_delete_progress (CommonJob *job, + TransferInfo *transfer_info) + { + int files_left; +- double elapsed; ++ double elapsed, transfer_rate; + gint64 now; + char *files_left_s; + +@@ -1524,15 +1524,19 @@ report_delete_progress (CommonJob *job, + f (_("Deleting files"))); + + elapsed = g_timer_elapsed (job->time, NULL); +- if (elapsed < SECONDS_NEEDED_FOR_RELIABLE_TRANSFER_RATE) { ++ transfer_rate = 0; ++ if (elapsed > 0) { ++ transfer_rate = transfer_info->num_files / elapsed; ++ } ++ ++ if (elapsed < SECONDS_NEEDED_FOR_RELIABLE_TRANSFER_RATE || ++ transfer_rate <= 0) { + + caja_progress_info_set_details (job->progress, files_left_s); + } else { + char *details, *time_left_s; + int remaining_time; +- double transfer_rate; + +- transfer_rate = transfer_info->num_files / elapsed; + remaining_time = files_left / transfer_rate; + + /* Translators: %T will expand to a time like "2 minutes". +@@ -3109,8 +3113,8 @@ report_copy_progress (CopyMoveJob *copy_job, + transfer_rate = transfer_info->num_bytes / elapsed; + } + +- if (elapsed < SECONDS_NEEDED_FOR_RELIABLE_TRANSFER_RATE && +- transfer_rate > 0) { ++ if (elapsed < SECONDS_NEEDED_FOR_RELIABLE_TRANSFER_RATE || ++ transfer_rate <= 0) { + char *s; + /* Translators: %S will expand to a size like "2 bytes" or "3 MB", so something like "4 kb of 4 MB" */ + s = f (_("%S of %S"), transfer_info->num_bytes, total_size); +-- +2.48.1 + diff --git a/caja_0010-caja-file-operations-restart-timer-also-for-moves.patch b/caja_0010-caja-file-operations-restart-timer-also-for-moves.patch new file mode 100644 index 0000000000000000000000000000000000000000..6bad05099865ff5e13baee31a4610fed1af72530 --- /dev/null +++ b/caja_0010-caja-file-operations-restart-timer-also-for-moves.patch @@ -0,0 +1,178 @@ +From ed41589e35a534cb47ea7b6dcc685fef2e7ca578 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20P=C3=B6schel?= +Date: Sun, 31 Dec 2023 17:42:21 +0100 +Subject: [PATCH 10/10] caja-file-operations: restart timer also for moves + +As done for copy/delete jobs, restart the operation timer also for move +jobs. Thus preparations (e.g. `scan_sources`) later won't affect the +later transfer rate calculation. + +caja-file-operations: stop timer when waiting + +When a copy/move operation is created while another operation is already +active, the new operation is queued. As the (already running) operation +timer of the new operation is not stopped during the waiting period, +that period is (erroneously) included in the transfer rate calculation +and leads to initially low/slowly increasing transfer rates be shown. + +Hence stop the operation timer when the (queued) operation is waiting. + +Fixes #1420 and #1623. +--- + libcaja-private/caja-file-operations.c | 24 +++++++++++++----------- + libcaja-private/caja-progress-info.c | 4 +++- + libcaja-private/caja-progress-info.h | 2 +- + 3 files changed, 17 insertions(+), 13 deletions(-) + +diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c +index 6ab8697d..4b51c907 100644 +--- a/libcaja-private/caja-file-operations.c ++++ b/libcaja-private/caja-file-operations.c +@@ -1879,7 +1879,7 @@ trash_files (CommonJob *job, GList *files, guint *files_skipped) + for (l = files; + l != NULL && !job_aborted (job); + l = l->next) { +- caja_progress_info_get_ready (job->progress); ++ caja_progress_info_get_ready (job->progress, job->time); + + file = l->data; + +@@ -3632,7 +3632,7 @@ copy_move_directory (CopyMoveJob *copy_job, + nextinfo = g_file_enumerator_next_file (enumerator, job->cancellable, skip_error?NULL:&error); + while (!job_aborted (job) && + (info = nextinfo) != NULL) { +- caja_progress_info_get_ready (job->progress); ++ caja_progress_info_get_ready (job->progress, job->time); + + nextinfo = g_file_enumerator_next_file (enumerator, job->cancellable, skip_error?NULL:&error); + src_file = g_file_get_child (src, +@@ -4598,7 +4598,7 @@ copy_files (CopyMoveJob *job, + for (l = job->files; + l != NULL && !job_aborted (common); + l = l->next) { +- caja_progress_info_get_ready (common->progress); ++ caja_progress_info_get_ready (common->progress, common->time); + + src = l->data; + +@@ -4915,7 +4915,7 @@ move_file_prepare (CopyMoveJob *move_job, + } + + retry: +- caja_progress_info_get_ready (job->progress); ++ caja_progress_info_get_ready (job->progress, job->time); + + flags = G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_NO_FALLBACK_FOR_MOVE; + if (overwrite) { +@@ -5091,7 +5091,7 @@ move_files_prepare (CopyMoveJob *job, + + total = left = g_list_length (job->files); + +- caja_progress_info_get_ready (common->progress); ++ caja_progress_info_get_ready (common->progress, common->time); + report_move_progress (job, total, left); + + i = 0; +@@ -5155,7 +5155,7 @@ move_files (CopyMoveJob *job, + for (l = fallbacks; + l != NULL && !job_aborted (common); + l = l->next) { +- caja_progress_info_get_ready (common->progress); ++ caja_progress_info_get_ready (common->progress, common->time); + + fallback = l->data; + src = fallback->file; +@@ -5269,6 +5269,8 @@ move_job (GIOSchedulerJob *io_job, + goto aborted; + } + ++ g_timer_start (job->common.time); ++ + memset (&transfer_info, 0, sizeof (transfer_info)); + move_files (job, + fallbacks, +@@ -5579,7 +5581,7 @@ link_job (GIOSchedulerJob *io_job, + for (l = job->files; + l != NULL && !job_aborted (common); + l = l->next) { +- caja_progress_info_get_ready (common->progress); ++ caja_progress_info_get_ready (common->progress, common->time); + + src = l->data; + +@@ -5721,7 +5723,7 @@ set_permissions_file (SetPermissionsJob *job, + + caja_progress_info_pulse_progress (common->progress); + +- caja_progress_info_get_ready (common->progress); ++ caja_progress_info_get_ready (common->progress, common->time); + + free_info = FALSE; + if (info == NULL) { +@@ -6086,7 +6088,7 @@ create_job (GIOSchedulerJob *io_job, + count = 1; + + retry: +- caja_progress_info_get_ready (common->progress); ++ caja_progress_info_get_ready (common->progress, common->time); + + error = NULL; + if (job->make_dir) { +@@ -6416,7 +6418,7 @@ delete_trash_file (CommonJob *job, + gboolean del_file, + gboolean del_children) + { +- caja_progress_info_get_ready (job->progress); ++ caja_progress_info_get_ready (job->progress, job->time); + + if (job_aborted (job)) { + return; +@@ -6565,7 +6567,7 @@ mark_desktop_file_trusted (CommonJob *common, + GFileInfo *info; + + retry: +- caja_progress_info_get_ready (common->progress); ++ caja_progress_info_get_ready (common->progress, common->time); + + error = NULL; + if (!g_file_load_contents (file, +diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c +index 1db11351..7ded7ae4 100644 +--- a/libcaja-private/caja-progress-info.c ++++ b/libcaja-private/caja-progress-info.c +@@ -707,7 +707,7 @@ widget_state_notify_paused_callback (ProgressWidgetData *data) + } + + void +-caja_progress_info_get_ready (CajaProgressInfo *info) ++caja_progress_info_get_ready (CajaProgressInfo *info, GTimer *time) + { + if (info->waiting) { + G_LOCK (progress_info); +@@ -717,8 +717,10 @@ caja_progress_info_get_ready (CajaProgressInfo *info) + g_source_set_callback (source, (GSourceFunc)widget_state_notify_paused_callback, info->widget, NULL); + g_source_attach (source, NULL); + ++ g_timer_stop (time); + while (info->waiting) + g_cond_wait (&info->waiting_c, &G_LOCK_NAME(progress_info)); ++ g_timer_continue (time); + } + G_UNLOCK (progress_info); + } +diff --git a/libcaja-private/caja-progress-info.h b/libcaja-private/caja-progress-info.h +index c713361b..4b3e59f4 100644 +--- a/libcaja-private/caja-progress-info.h ++++ b/libcaja-private/caja-progress-info.h +@@ -51,7 +51,7 @@ GType caja_progress_info_get_type (void) G_GNUC_CONST; + */ + + CajaProgressInfo *caja_progress_info_new (gboolean should_start, gboolean can_pause); +-void caja_progress_info_get_ready (CajaProgressInfo *info); ++void caja_progress_info_get_ready (CajaProgressInfo *info, GTimer *time); + void caja_progress_info_disable_pause (CajaProgressInfo *info); + + GList * caja_get_all_progress_info (void); +-- +2.48.1 + diff --git a/caja_add-xfce-to-desktop-file-1.25.patch b/caja_add-xfce-to-desktop-file-1.25.patch deleted file mode 100755 index 38f34c50988e7e33e74b940fcdda6bc628f78c21..0000000000000000000000000000000000000000 --- a/caja_add-xfce-to-desktop-file-1.25.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -uprN caja-1.23.3.orig/data/caja-browser.desktop.in caja-1.23.3/data/caja-browser.desktop.in ---- caja-1.23.3.orig/data/caja-browser.desktop.in 2020-01-19 19:26:14.000000000 +0100 -+++ caja-1.23.3/data/caja-browser.desktop.in 2020-01-19 19:59:55.695171961 +0100 -@@ -218,4 +218,4 @@ Keywords[sl]=datoteke;brskalnik;upravlja - Keywords[zh_CN]=文件;浏览;管理;MATE; - Keywords[zh_TW]=files;browser;manager;MATE; - Keywords=files;browser;manager;MATE; --OnlyShowIn=MATE; -+OnlyShowIn=MATE;XFCE; -diff -uprN caja-1.23.3.orig/data/caja-browser.desktop.in.in caja-1.23.3/data/caja-browser.desktop.in.in ---- caja-1.23.3.orig/data/caja-browser.desktop.in.in 2020-01-10 11:05:05.000000000 +0100 -+++ caja-1.23.3/data/caja-browser.desktop.in.in 2020-01-19 19:59:47.537786679 +0100 -@@ -12,4 +12,4 @@ Type=Application - Categories=GTK;System;Utility;Core; - # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! - Keywords=files;browser;manager;MATE; --OnlyShowIn=MATE; -+OnlyShowIn=MATE;XFCE;