Add some patches
Signed-off-by: longcheng <longcheng@kylinsec.com.cn>
This commit is contained in:
longcheng
parent
3e9e84900a
commit
ac2e64e33f
@ -0,0 +1,27 @@
|
||||
From 9bbe35595d079cfb35a705f42c8040851a9a0153 Mon Sep 17 00:00:00 2001
|
||||
From: longcheng <longcheng@kylinos.com.cn>
|
||||
Date: Fri, 16 Oct 2020 14:36:56 +0800
|
||||
Subject: [PATCH] Add a action in mate-terminal.desktop.in.in
|
||||
|
||||
---
|
||||
mate-terminal.desktop.in.in | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/mate-terminal.desktop.in.in b/mate-terminal.desktop.in.in
|
||||
index a0e9401..0bbd7e6 100644
|
||||
--- a/mate-terminal.desktop.in.in
|
||||
+++ b/mate-terminal.desktop.in.in
|
||||
@@ -14,3 +14,10 @@ X-MATE-Bugzilla-Version=@VERSION@
|
||||
Categories=System;GTK;Utility;TerminalEmulator;
|
||||
StartupNotify=true
|
||||
|
||||
+Actions=OpenTerminal
|
||||
+
|
||||
+[Desktop Action OpenTerminal]
|
||||
+Name=Open Terminal
|
||||
+Name[zh_CN]=打开新的终端
|
||||
+X-TryExec=mate-terminal
|
||||
+Exec=mate-terminal %U
|
||||
--
|
||||
2.18.4
|
||||
|
||||
2718
0001-Fix-translation-errors-in-help-manual.patch
Normal file
2718
0001-Fix-translation-errors-in-help-manual.patch
Normal file
File diff suppressed because it is too large
Load Diff
1358
0001-add-kylin-mask-and-part-of-translations.patch
Normal file
1358
0001-add-kylin-mask-and-part-of-translations.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,60 @@
|
||||
From 427d8487cd5589db6c69c7867ef7bf266c137d0d Mon Sep 17 00:00:00 2001
|
||||
From: root <root@localhost.localdomain>
|
||||
Date: Tue, 20 Oct 2020 11:07:10 +0800
|
||||
Subject: [PATCH 1/3] feature(color scheme):add two color scheme:Dracula Dark
|
||||
and Gruvbox Dark
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 添加两种颜色方案：Dracula Dark and Gruvbox Dark
|
||||
|
||||
Fixes #30872
|
||||
---
|
||||
po/zh_CN.po | 8 ++++++++
|
||||
src/profile-editor.c | 10 ++++++++++
|
||||
2 files changed, 18 insertions(+)
|
||||
|
||||
diff --git a/po/zh_CN.po b/po/zh_CN.po
|
||||
index 34ef0b0..a37a9d2 100644
|
||||
--- a/po/zh_CN.po
|
||||
+++ b/po/zh_CN.po
|
||||
@@ -1104,6 +1104,14 @@ msgstr "Solarized 亮色"
|
||||
msgid "Solarized dark"
|
||||
msgstr "Solarized 暗色"
|
||||
|
||||
+#: ../src/profile-editor.c:79
|
||||
+msgid "Dracula dark"
|
||||
+msgstr "Dracula 暗色"
|
||||
+
|
||||
+#: ../src/profile-editor.c:84
|
||||
+msgid "Gruvbox dark"
|
||||
+msgstr "Gruvbox 暗色"
|
||||
+
|
||||
#: ../src/profile-editor.c:488
|
||||
#, c-format
|
||||
msgid "Error parsing command: %s"
|
||||
diff --git a/src/profile-editor.c b/src/profile-editor.c
|
||||
index ebdc5db..4d5c7d2 100644
|
||||
--- a/src/profile-editor.c
|
||||
+++ b/src/profile-editor.c
|
||||
@@ -75,6 +75,16 @@ static const TerminalColorScheme color_schemes[] =
|
||||
{ 0.513725, 0.580392, 0.588235, 1 },
|
||||
{ 0, 0.168627, 0.211764, 1 }
|
||||
},
|
||||
+ /*Dracula */
|
||||
+ { N_("Dracula dark"),
|
||||
+ { 0.972549, 0.972549, 0.949019, 1 },
|
||||
+ { 0.156862, 0.164705, 0.211764, 1 }
|
||||
+ },
|
||||
+ /*Gruvbox */
|
||||
+ { N_("Gruvbox dark"),
|
||||
+ { 0.921568, 0.858823, 0.698039, 1 },
|
||||
+ { 0.156862, 0.156862, 0.156862, 1 }
|
||||
+ },
|
||||
};
|
||||
|
||||
static void profile_forgotten_cb (TerminalProfile *profile,
|
||||
--
|
||||
2.18.1
|
||||
|
||||
45
0001-set-text-preview-content.patch
Normal file
45
0001-set-text-preview-content.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From 7cd6b97b99735bed103dc120ee1b47a8778edb42 Mon Sep 17 00:00:00 2001
|
||||
From: wangxiaoqing <wangxiaoqing@kylinos.com.cn>
|
||||
Date: Tue, 7 Apr 2020 23:19:29 +0800
|
||||
Subject: [PATCH] set text preview content
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 设置预览字体内容
|
||||
---
|
||||
po/zh_CN.po | 3 +++
|
||||
src/profile-editor.c | 3 +++
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/po/zh_CN.po b/po/zh_CN.po
|
||||
index d5c12d9..34ef0b0 100644
|
||||
--- a/po/zh_CN.po
|
||||
+++ b/po/zh_CN.po
|
||||
@@ -2586,6 +2586,9 @@ msgstr "贡献者："
|
||||
msgid "A terminal emulator for the MATE desktop"
|
||||
msgstr "MATE 桌面的终端模拟器"
|
||||
|
||||
+msgid "KYLINSEC is trustworthy!"
|
||||
+msgstr "麒麟信安值得信赖!"
|
||||
+
|
||||
#: ../src/terminal-window.c:4397
|
||||
msgid "translator-credits"
|
||||
msgstr ""
|
||||
diff --git a/src/profile-editor.c b/src/profile-editor.c
|
||||
index b097b3d..ebdc5db 100644
|
||||
--- a/src/profile-editor.c
|
||||
+++ b/src/profile-editor.c
|
||||
@@ -706,6 +706,9 @@ terminal_profile_edit (TerminalProfile *profile,
|
||||
w = (GtkWidget *) gtk_builder_get_object (builder, "background-image-filechooser");
|
||||
setup_background_filechooser (w, profile);
|
||||
|
||||
+ w = GTK_WIDGET (gtk_builder_get_object (builder, "font-selector"));
|
||||
+ gtk_font_chooser_set_preview_text (w, _("KYLINSEC is trustworthy!"));
|
||||
+
|
||||
/* Hook up the palette colorpickers and combo box */
|
||||
|
||||
for (i = 0; i < TERMINAL_PALETTE_SIZE; ++i)
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
From 2cfffe7cede01516d2337cbb232e4ee9575332b5 Mon Sep 17 00:00:00 2001
|
||||
From: yuanxing <yaunxing@kylinos.com.cn>
|
||||
Date: Tue, 20 Oct 2020 11:13:17 +0800
|
||||
Subject: [PATCH 2/3] fix(default color scheme):change default color scheme to
|
||||
Dracula Dark
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 修改默认的颜色方案为Dracula Dark
|
||||
|
||||
Fixes #30872
|
||||
---
|
||||
src/org.mate.terminal.gschema.xml.in | 4 ++--
|
||||
src/terminal-profile.c | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/org.mate.terminal.gschema.xml.in b/src/org.mate.terminal.gschema.xml.in
|
||||
index 32fab43..5f4a97b 100644
|
||||
--- a/src/org.mate.terminal.gschema.xml.in
|
||||
+++ b/src/org.mate.terminal.gschema.xml.in
|
||||
@@ -99,12 +99,12 @@
|
||||
<description>True if the menubar should be shown in new windows, for windows/tabs with this profile.</description>
|
||||
</key>
|
||||
<key name="foreground-color" type="s">
|
||||
- <default>'#E6E6E6'</default>
|
||||
+ <default>'#F8F8F2'</default>
|
||||
<summary>Default color of text in the terminal</summary>
|
||||
<description>Default color of text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red").</description>
|
||||
</key>
|
||||
<key name="background-color" type="s">
|
||||
- <default>'#000000'</default>
|
||||
+ <default>'#282A36'</default>
|
||||
<summary>Default color of terminal background</summary>
|
||||
<description>Default color of terminal background, as a color specification (can be HTML-style hex digits, or a color name such as "red").</description>
|
||||
</key>
|
||||
diff --git a/src/terminal-profile.c b/src/terminal-profile.c
|
||||
index 07009ae..bedd492 100644
|
||||
--- a/src/terminal-profile.c
|
||||
+++ b/src/terminal-profile.c
|
||||
@@ -127,7 +127,7 @@ enum
|
||||
|
||||
/* Keep these in sync with the GSettings schema! */
|
||||
#define DEFAULT_ALLOW_BOLD (TRUE)
|
||||
-#define DEFAULT_BACKGROUND_COLOR ("#000000")
|
||||
+#define DEFAULT_BACKGROUND_COLOR ("#282A36")
|
||||
#define DEFAULT_BOLD_COLOR ("#FFFFFF")
|
||||
#define DEFAULT_BOLD_COLOR_SAME_AS_FG (FALSE)
|
||||
#define DEFAULT_BACKGROUND_DARKNESS (0.5)
|
||||
@@ -144,7 +144,7 @@ enum
|
||||
#define DEFAULT_DELETE_BINDING (VTE_ERASE_DELETE_SEQUENCE)
|
||||
#define DEFAULT_EXIT_ACTION (TERMINAL_EXIT_CLOSE)
|
||||
#define DEFAULT_FONT ("Monospace 12")
|
||||
-#define DEFAULT_FOREGROUND_COLOR ("#E6E6E6")
|
||||
+#define DEFAULT_FOREGROUND_COLOR ("#F8F8F2")
|
||||
#define DEFAULT_LOGIN_SHELL (FALSE)
|
||||
#define DEFAULT_NAME (NULL)
|
||||
#define DEFAULT_PALETTE (terminal_palettes[TERMINAL_PALETTE_TANGO])
|
||||
--
|
||||
2.18.1
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
From 7096bb5084dd2d98994b33394090f107b14e0d70 Mon Sep 17 00:00:00 2001
|
||||
From: yuanxing <yaunxing@kylinos.com.cn>
|
||||
Date: Tue, 20 Oct 2020 11:13:49 +0800
|
||||
Subject: [PATCH 3/3] fix(systerm color scheme):change systerm color scheme to
|
||||
Dracula Dark
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 修改系统颜色方案为Dracula Dark
|
||||
|
||||
Fixes #30872
|
||||
---
|
||||
src/terminal-screen.c | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
|
||||
index b4e7460..438ecbd 100644
|
||||
--- a/src/terminal-screen.c
|
||||
+++ b/src/terminal-screen.c
|
||||
@@ -1107,6 +1107,19 @@ update_color_scheme (TerminalScreen *screen)
|
||||
if (bg_rgba)
|
||||
bg = *bg_rgba;
|
||||
}
|
||||
+ else
|
||||
+ {
|
||||
+ //set Dracula Dark to systerm color
|
||||
+ fg.red = 0.972549;
|
||||
+ fg.green = 0.972549;
|
||||
+ fg.blue = 0.949019;
|
||||
+ fg.alpha = 1;
|
||||
+
|
||||
+ bg.red = 0.156862;
|
||||
+ bg.green = 0.164705;
|
||||
+ bg.blue = 0.211764;
|
||||
+ bg.alpha = 1;
|
||||
+ }
|
||||
|
||||
n_colors = G_N_ELEMENTS (colors);
|
||||
terminal_profile_get_palette (priv->profile, colors, &n_colors);
|
||||
--
|
||||
2.18.1
|
||||
|
||||
35
1008-select-the-default-charset-by-locale-d48ad40e.patch
Normal file
35
1008-select-the-default-charset-by-locale-d48ad40e.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From d48ad40eb2d360a183035e2071a2f4c16b30e3a7 Mon Sep 17 00:00:00 2001
|
||||
From: root <root@localhost.localdomain>
|
||||
Date: Thu, 10 Feb 2022 22:17:45 +0800
|
||||
Subject: [PATCH] select the default charset by locale
|
||||
|
||||
---
|
||||
src/terminal-window.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/terminal-window.c b/src/terminal-window.c
|
||||
index df6347c..a6784bc 100644
|
||||
--- a/src/terminal-window.c
|
||||
+++ b/src/terminal-window.c
|
||||
@@ -1001,12 +1001,17 @@ terminal_window_update_encoding_menu_active_encoding (TerminalWindow *window)
|
||||
TerminalWindowPrivate *priv = window->priv;
|
||||
GtkAction *action;
|
||||
char name[128];
|
||||
-
|
||||
+ const char *charset;
|
||||
+
|
||||
if (!priv->active_screen)
|
||||
return;
|
||||
if (!priv->encodings_action_group)
|
||||
return;
|
||||
|
||||
+ g_get_charset (&charset);
|
||||
+ vte_terminal_set_encoding (VTE_TERMINAL (priv->active_screen),
|
||||
+ charset, NULL);
|
||||
+
|
||||
g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s",
|
||||
vte_terminal_get_encoding (VTE_TERMINAL (priv->active_screen)));
|
||||
action = gtk_action_group_get_action (priv->encodings_action_group, name);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -16,7 +16,7 @@ Summary: Terminal emulator for MATE
|
||||
Name: mate-terminal
|
||||
Version: %{branch}.1
|
||||
%if 0%{?rel_build}
|
||||
Release: 4
|
||||
Release: 5
|
||||
%else
|
||||
Release: 0.8%{?git_rel}
|
||||
%endif
|
||||
@ -37,6 +37,14 @@ Patch2: mate-terminal_0001-Avoid-NULL-pointer-dereference-in-terminal_scr
|
||||
Patch3: 0001-fix-url-highlighting-due-to-deprecation-of-vte_termi.patch
|
||||
Patch4: 0002-fix-searching-in-terminal-window.patch
|
||||
|
||||
Patch1001: 0001-add-kylin-mask-and-part-of-translations.patch
|
||||
Patch1002: 0001-Fix-translation-errors-in-help-manual.patch
|
||||
Patch1003: 0001-set-text-preview-content.patch
|
||||
Patch1004: 0001-Add-a-action-in-mate-terminal.desktop.in.in-9bbe3559.patch
|
||||
Patch1005: 0001-feature-color-scheme-add-two-color-scheme-Dracula-Da.patch
|
||||
Patch1006: 0002-fix-default-color-scheme-change-default-color-scheme.patch
|
||||
Patch1007: 0003-fix-systerm-color-scheme-change-systerm-color-scheme.patch
|
||||
Patch1008: 1008-select-the-default-charset-by-locale-d48ad40e.patch
|
||||
|
||||
BuildRequires: dconf-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
@ -101,6 +109,13 @@ desktop-file-install \
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 13 2022 longcheng <longcheng@kylinsec.com.cn> - 1.22.1-5
|
||||
- KYOS-B: add kylin mask and part of translations
|
||||
- KYOS-T: Fix translation errors in help manual.
|
||||
- KYOS-B: set text preview content (#24148)
|
||||
- KYOS-B: add two color theme and change the default color theme to Dracula Dark (#30872)
|
||||
- KYOS-B: select the default charset by locale(#49592)
|
||||
|
||||
* Tue Jun 14 2022 yuanxing <yuanxing@kylinsec.com.cn> - 1.22.1-4
|
||||
- fix url highlighting and search function problem due to deprecation function from vte291-0.62
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user