!8 允许gnome-terminal在locale字符集为非UTF-8的情况下启动和运行

From: @kkzhs_admin 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
This commit is contained in:
openeuler-ci-bot 2023-08-21 07:13:03 +00:00 committed by Gitee
commit 5291975cf0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From c9ea02e40a13316619d7c20ad3b3a6c666941d88 Mon Sep 17 00:00:00 2001
From: kkz <zhaoshuang@uniontech.com>
Date: Wed, 26 Jul 2023 17:28:08 +0800
Subject: [PATCH] allow non-UTF8 locale
---
src/server.cc | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/server.cc b/src/server.cc
index 48c09f3..429424f 100644
--- a/src/server.cc
+++ b/src/server.cc
@@ -122,11 +122,6 @@ init_server (int argc,
terminal_i18n_init (TRUE);
g_unsetenv ("CHARSET");
- const char *charset;
- if (!g_get_charset (&charset)) {
- g_printerr ("Non UTF-8 locale (%s) is not supported!\n", charset);
- return _EXIT_FAILURE_NO_UTF8;
- }
/* Sanitise environment */
g_unsetenv ("DBUS_STARTER_BUS_TYPE");
--
2.27.0

View File

@ -1,6 +1,6 @@
Name: gnome-terminal
Version: 3.46.7
Release: 1
Release: 2
Summary: A terminal emulator for GNOME
License: GPL-3.0-or-later and GFDL-1.3-only and LGPL-2.0-or-later
URL: http://www.gnome.org/
@ -8,6 +8,7 @@ Source0: https://gitlab.gnome.org/GNOME/%{name}/-/archive/%{version}/%{na
Source1: org.gnome.Terminal.gschema.override
Patch0000: gnome-terminal-cntr-ntfy-autottl-ts.patch
Patch0001: allow-non-UTF8-locale.patch
BuildRequires: glib2-devel gtk3-devel gsettings-desktop-schemas-devel
BuildRequires: desktop-file-utils gettext-devel autoconf automake
@ -82,6 +83,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.de
%{_metainfodir}/org.gnome.Terminal.Nautilus.metainfo.xml
%changelog
* Wed Jul 26 2023 zhaoshuang <zhaoshuang@uniontech.com> - 3.46.7-2
- fix: allow-non-UTF8-locale
* Tue Feb 7 2023 liyanan <liyanan32@h-partners.com> - 3.46.7-1
- Update to 3.46.7