packages/caja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!17 caja-1.24版本升级

Browse Source 
From: @hostfj
Reviewed-by: @li_guoqiang9
Signed-off-by: @li_guoqiang9
This commit is contained in:
openeuler-ci-bot 2021-08-17 02:42:31 +00:00 committed by Gitee
commit 305d3ab1d7
12 changed files with 82 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
0001-add-open-terminal-when-clicking-right-key-in-desktop.patch
View File

@ -1,85 +0,0 @@
From 44ba536ad0b22b3f89799e99edcecbf9f84820d4 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Tue, 17 Mar 2020 14:38:42 +0800
Subject: [PATCH] add open terminal when clicking right key in desktop
---
po/zh_CN.po | 5 ++++
.../caja-desktop-icon-view-ui.xml | 1 +
src/file-manager/fm-desktop-icon-view.c | 25 +++++++++++++++++++
3 files changed, 31 insertions(+)
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 38cd51a..7f20991 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3696,6 +3696,11 @@ msgstr "创建新启动器"
msgid "Change Desktop _Background"
msgstr "更改桌面背景(_B)"
+#. label, accelerator
+#: ../src/file-manager/fm-desktop-icon-view.c:778
+msgid "Open Terminal..."
+msgstr "打开终端"
+
#. tooltip
#: ../src/file-manager/fm-desktop-icon-view.c:774
msgid ""
diff --git a/src/file-manager/caja-desktop-icon-view-ui.xml b/src/file-manager/caja-desktop-icon-view-ui.xml
index d437801..5654e4c 100644
--- a/src/file-manager/caja-desktop-icon-view-ui.xml
+++ b/src/file-manager/caja-desktop-icon-view-ui.xml
@@ -9,6 +9,7 @@
</placeholder>
<placeholder name="After Zoom Items">
<placeholder name="Background Items">
+ <menuitem name="Open Terminal" action="Open Terminal"/>
<menuitem name="Change Background" action="Change Background"/>
</placeholder>
</placeholder>
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 9205edc..fba954d 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -652,6 +652,22 @@ action_new_launcher_callback (GtkAction *action, gpointer data)
}
+action_open_terminal_callback (GtkAction *action, gpointer data)
+{
+ char *desktop_directory;
+
+ g_assert (FM_DIRECTORY_VIEW (data));
+
+ desktop_directory = caja_get_desktop_directory ();
+
+ caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)),
+ "Mate Terminal",
+ "mate-terminal",
+ FALSE,
+ NULL, desktop_directory, NULL);
+ g_free (desktop_directory);
+
+}
static void
action_change_background_callback (GtkAction *action,
gpointer data)
@@ -756,6 +772,15 @@ static const GtkActionEntry desktop_view_entries[] =
G_CALLBACK (action_new_launcher_callback)
},
/* name, stock id */
+ {
+ "Open Terminal", NULL,
+ /* label, accelerator */
+ N_("Open Terminal..."), NULL,
+ /* tooltip */
+ N_("Mate Terminal"),
+ G_CALLBACK (action_open_terminal_callback)
+ },
+ /* name, stock id */
{
"Change Background", NULL,
/* label, accelerator */
--
2.23.0

25
0001-caja-po-translation.patch
View File

@ -1,25 +0,0 @@
From 3862f8a7eb8acc4d9ca565967f8723c27f02f6eb Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Tue, 17 Dec 2019 17:33:21 +0800
Subject: [PATCH] caja-po-translation
---
po/zh_CN.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 36f4a37..38cd51a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -329,7 +329,7 @@ msgstr "自动运行提示"
#: ../data/caja-folder-handler.desktop.in.h:1 ../src/caja-spatial-window.c:396
#: ../src/caja-window-menus.c:557 ../src/caja-window.c:164
msgid "Caja"
-msgstr "Caja"
+msgstr "文件管理器"
#: ../data/caja-browser.desktop.in.h:2
msgid "File Browser"
--
2.23.0

BIN
caja-1.22.2-6.isoft.src.rpm
View File

Binary file not shown.

30
caja-1.22.2-mate-search-tool.patch
View File

@ -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 <config.h>
#include <locale.h>
-
+#include <stdlib.h>
#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)

26
caja-1.22.2-trash-translate.patch
View File

@ -1,26 +0,0 @@
diff -Nuar caja-1.22.2/po/zh_CN.po caja-1.22.2-bak/po/zh_CN.po
--- caja-1.22.2/po/zh_CN.po 2021-04-07 10:59:11.408483382 +0800
+++ caja-1.22.2-bak/po/zh_CN.po 2021-04-07 11:08:40.512221984 +0800
@@ -5455,11 +5455,11 @@
#: ../src/file-manager/fm-properties-window.c:3309
msgid "Accessed:"
-msgstr "访问："
+msgstr "访问日期："
#: ../src/file-manager/fm-properties-window.c:3313
msgid "Modified:"
-msgstr "修改于："
+msgstr "修改日期："
#: ../src/file-manager/fm-properties-window.c:3322
msgid "Free space:"
@@ -5627,7 +5627,7 @@
#: ../src/file-manager/fm-properties-window.c:4795
msgid "Last changed:"
-msgstr "最后修改："
+msgstr "删除日期："
#: ../src/file-manager/fm-properties-window.c:4806
msgid "Apply Permissions to Enclosed Files"

BIN
caja-1.22.2.tar.xz
View File

Binary file not shown.

BIN
caja-1.24.1-2.isoft.src.rpm Executable file
View File

Binary file not shown.

BIN
caja-1.24.1.tar.xz Executable file
View File

Binary file not shown.

108
caja.spec Normal file → Executable file
View File

@ -2,7 +2,7 @@
%global rel_build 1
# This is needed, because src-url contains branched part of versioning-scheme.
%global branch 1.22
%global branch 1.24
# Settings used for build from snapshots.
%{!?rel_build:%global commit ee0a62c8759040d84055425954de1f860bac8652}
@ -14,11 +14,11 @@
Name: caja
Summary: File manager for MATE
Version: %{branch}.2
Version: %{branch}.1
%if 0%{?rel_build}
Release: 6
Release: 2
%else
Release: 0.11%{?git_rel}%{?dist}
Release: 0.14%{?git_rel}%{?dist}
%endif
License: GPLv2+ and LGPLv2+
URL: http://mate-desktop.org
@ -29,41 +29,31 @@ URL: http://mate-desktop.org
# Source for snapshot-builds.
%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
Patch1: caja_add-xfce-to-desktop-file-1.22.patch
# https://github.com/mate-desktop/caja/commit/ea81a5
Patch2: caja_0001-canvas-item-Don-t-hyphenate-filenames-1.22.patch
Patch0: caja_add-xfce-to-desktop-file-1.25.patch
Patch3: 0001-caja-po-translation.patch
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
BuildRequires: exempi-devel
BuildRequires: gobject-introspection-devel
BuildRequires: cairo-gobject-devel
BuildRequires: libexif-devel
BuildRequires: libselinux-devel
BuildRequires: libSM-devel
BuildRequires: libxml2-devel
BuildRequires: make
BuildRequires: mate-common
BuildRequires: mate-desktop-devel
BuildRequires: pango-devel
BuildRequires: startup-notification-devel
BuildRequires: libnotify-devel
Patch4: 0001-add-open-terminal-when-clicking-right-key-in-desktop.patch
Patch5: caja-1.22.2-mate-search-tool.patch
Patch6: caja-1.22.2-trash-translate.patch
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
BuildRequires: exempi-devel
BuildRequires: gobject-introspection-devel
BuildRequires: cairo-gobject-devel
BuildRequires: libexif-devel
BuildRequires: libselinux-devel
BuildRequires: libSM-devel
BuildRequires: libxml2-devel
BuildRequires: mate-common
BuildRequires: mate-desktop-devel
BuildRequires: pangox-compat-devel
BuildRequires: startup-notification-devel
BuildRequires: libnotify-devel
Requires: gamin
Requires: filesystem
Requires: isoft-menus
Requires: redhat-menus
Requires: gvfs
# the main binary links against libcaja-extension.so
# don't depend on soname, rather on exact version
Requires: %{name}-extensions-common
Requires: %{name}-core-extensions%{?_isa} = %{version}-%{release}
# needed for using mate-text-editor as stanalone in another DE
Requires: %{name}-schemas%{?_isa} = %{version}-%{release}
@ -79,11 +69,6 @@ It is also responsible for handling the icons on the MATE desktop.
%package core-extensions
Summary: Mate-file-manager extensions library
Requires: %{name}%{?_isa} = %{version}-%{release}
%if (0%{?fedora} >= 28 && 0%{?fedora} <= 32)
Provides: %{name}-extensions = %{version}-%{release}
Provides: %{name}-extensions%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-extensions < 1.20.2-2
%endif
%description core-extensions
This package provides the libraries used by caja extensions.
@ -113,8 +98,8 @@ for developing caja extensions.
%endif
# disable startup notification
sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-computer.desktop.in
sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-home.desktop.in
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
@ -196,12 +181,41 @@ EOF
%changelog
* Thu May 27 2021 xianzhao Yang <xianzhao.yang@i-soft.com.cn> - 1.22.6
- Optimize search tools Optimize startup window position and add some Chinese files
* Thu Mar 25 2021 Wolfgang Ulbrich <fedora@raveit.de> - 1.24.1-1
- update to 1.24.1
* Tue Feb 9 2021 Wolfgang Ulbrich <fedora@raveit.de> - 1.24.0-7
- drop gamin dependency
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sun May 24 2020 Wolfgang Ulbrich <fedora@raveit.de> - 1.24.0-4
- fix dependencies, hopefully
* Sat May 23 2020 Wolfgang Ulbrich <fedora@raveit.de> - 1.24.0-3
- drop non needed provides and obsoletes
* Fri May 22 2020 Wolfgang Ulbrich <fedora@raveit.de> - 1.24.0-2
- drop BR pangox-compat-devel in favour of pango-devel
* Mon Feb 10 2020 Wolfgang Ulbrich <fedora@raveit.de> - 1.24.0-1
- update to 1.24.0
* Sun Feb 02 2020 Wolfgang Ulbrich <fedora@raveit.de> - 1.23.4-1
- update to 1.23.4
- fix f32 mass rebuild
- drop c99 patch
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Dec 23 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.3-1
- update to 1.22.3
* Mon Fri 15 2021 xianzhao Yang <xianzhao.yang@i-soft.com.cn> - 1.22.3
- Sinicization file
* Fri Nov 22 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-2
- https://github.com/mate-desktop/caja/commit/ea81a5
- Don't hyphenate filenames with pango-1.44
@ -209,6 +223,12 @@ EOF
* Wed Sep 18 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-1
- update to 1.22.2
* Tue Sep 10 2019 Florian Weimer <fweimer@redhat.com> - 1.22.1-4
- Fix building in C99 mode
* Fri Sep 06 2019 Nikola Forró <nforro@redhat.com> - 1.22.1-3
- rebuilt for exempi 2.5.1
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

84
caja_0001-canvas-item-Don-t-hyphenate-filenames-1.22.patch
View File

@ -1,84 +0,0 @@
From ea81a5e3bd1cc8e9ba2b92ced9db1ebae803e24d Mon Sep 17 00:00:00 2001
From: raveit65 <mate@raveit.de>
Date: Fri, 22 Nov 2019 21:29:30 +0100
Subject: [PATCH] canvas-item: Don't hyphenate filenames
fixes https://github.com/mate-desktop/caja/issues/1284
Pango 1.44 got the ability to automatically hyphenate on line breaks,
which is on by default, but can be set off by a new attribute.
As a result, we now hyphenate filenames, which is confusing, because
a filename may already include hyphens.
To restore the previous behavior, let's not insert hyphens when
breaking filenames in multiple lines.
Inspired by https://gitlab.gnome.org/GNOME/nautilus/commit/9738d85
---
libcaja-private/caja-icon-canvas-item.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c
index 71d56fc3..cb2d8316 100644
--- a/libcaja-private/caja-icon-canvas-item.c
+++ b/libcaja-private/caja-icon-canvas-item.c
@@ -60,6 +60,14 @@
#define MAX_TEXT_WIDTH_BESIDE 90
#define MAX_TEXT_WIDTH_BESIDE_TOP_TO_BOTTOM 150
+#ifndef PANGO_CHECK_VERSION
+#define PANGO_CHECK_VERSION(major, minor, micro) \
+ (PANGO_VERSION_MAJOR > (major) || \
+ (PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR > (minor)) || \
+ (PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR == (minor) && \
+ PANGO_VERSION_MICRO >= (micro)))
+#endif
+
/* special text height handling
* each item has three text height variables:
* + text_height: actual height of the displayed (i.e. on-screen) PangoLayout.
@@ -1967,12 +1975,18 @@ create_label_layout (CajaIconCanvasItem *item,
GString *str;
char *zeroified_text;
const char *p;
+ #if PANGO_CHECK_VERSION (1, 44, 0)
+ PangoAttrList *attr_list;
+ #endif
canvas_item = EEL_CANVAS_ITEM (item);
container = CAJA_ICON_CONTAINER (canvas_item->canvas);
context = gtk_widget_get_pango_context (GTK_WIDGET (canvas_item->canvas));
layout = pango_layout_new (context);
+ #if PANGO_CHECK_VERSION (1, 44, 0)
+ attr_list = pango_attr_list_new ();
+ #endif
zeroified_text = NULL;
@@ -2019,6 +2033,11 @@ create_label_layout (CajaIconCanvasItem *item,
pango_layout_set_spacing (layout, LABEL_LINE_SPACING);
pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
+ #if PANGO_CHECK_VERSION (1, 44, 0)
+ pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
+ pango_layout_set_attributes (layout, attr_list);
+ #endif
+
/* Create a font description */
if (container->details->font)
{
@@ -2034,6 +2053,9 @@ create_label_layout (CajaIconCanvasItem *item,
pango_layout_set_font_description (layout, desc);
pango_font_description_free (desc);
g_free (zeroified_text);
+ #if PANGO_CHECK_VERSION (1, 44, 0)
+ pango_attr_list_unref (attr_list);
+ #endif
return layout;
}
--
2.21.0

9
caja_add-xfce-to-desktop-file-1.22.patch
View File

@ -1,9 +0,0 @@
diff -uprN caja-1.22.0-orig/data/caja-browser.desktop.in caja-1.22.0/data/caja-browser.desktop.in
--- caja-1.22.0-orig/data/caja-browser.desktop.in 2019-02-08 13:51:59.000000000 +0100
+++ caja-1.22.0/data/caja-browser.desktop.in 2019-02-24 16:57:13.244536755 +0100
@@ -10,4 +10,4 @@ StartupNotify=false
Type=Application
Categories=GTK;System;Utility;Core;
Keywords=files;browser;manager;MATE;
-OnlyShowIn=MATE;
+OnlyShowIn=MATE;XFCE;

18
caja_add-xfce-to-desktop-file-1.25.patch Executable file
View File

@ -0,0 +1,18 @@
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;