Accepting request 797877 from GNOME:Next
New stable release OBS-URL: https://build.opensuse.org/request/show/797877 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=229
This commit is contained in:
parent
3fd4f26392
commit
9f8028a192
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f3d708a1e76d77c1c85b126f6e003220a15d4a46a50fd8070e1a3aabe678a376
|
||||
size 2528356
|
3
gnome-terminal-3.36.2.tar.xz
Normal file
3
gnome-terminal-3.36.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:41d1b6a3dc97c066e294acdb7f36931e81668638dcc92ffa25bca3ddebacdf46
|
||||
size 2528492
|
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 26 11:18:05 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 3.36.2:
|
||||
+ server:
|
||||
- systemd: Don't kill all remaining processes in the control
|
||||
group
|
||||
- Fix refcount leak
|
||||
+ client: legacy: Suppress debug message spam
|
||||
+ screen:
|
||||
- Take a ref to the FD list
|
||||
- Fix memdup overrun
|
||||
+ Revert "screen: Use clean env when creating new tab"
|
||||
+ Updated translations.
|
||||
- Drop gt-Suppress-debug-message-spam.patch: Fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 11 16:11:09 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
@ -17,15 +17,13 @@
|
||||
|
||||
|
||||
Name: gnome-terminal
|
||||
Version: 3.36.1.1
|
||||
Version: 3.36.2
|
||||
Release: 0
|
||||
Summary: GNOME Terminal
|
||||
License: GPL-3.0-or-later AND LGPL-2.1-or-later
|
||||
Group: System/X11/Terminals
|
||||
URL: https://wiki.gnome.org/Apps/Terminal
|
||||
Source0: https://download.gnome.org/sources/gnome-terminal/3.36/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM gt-Suppress-debug-message-spam.patch -- Supress debug messages spam in terminal
|
||||
Patch0: gt-Suppress-debug-message-spam.patch
|
||||
|
||||
BuildRequires: fdupes
|
||||
# Needed for search provider. It should not be needed in my opinion,
|
||||
|
@ -1,71 +0,0 @@
|
||||
From 11f0ad63587c3a9671fe7c4c6e49356da401f2de Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@src.gnome.org>
|
||||
Date: Thu, 9 Apr 2020 21:04:32 +0200
|
||||
Subject: [PATCH] client: legacy: Suppress debug message spam
|
||||
|
||||
The glib log writer API has a deficiency in that the filtering is
|
||||
done in the default log writer, instead of only passing messages
|
||||
that pass the filter. This is filed as glib#2087, but until that
|
||||
is fixed, apply a simple log level filter to work around it.
|
||||
|
||||
Patch by Kim Nguyen <https://gitlab.gnome.org/kim.nguyen>
|
||||
|
||||
Fixes: https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/42
|
||||
(cherry picked from commit f84316ec180e9b9515a0914e883a0585f6877c7e)
|
||||
---
|
||||
src/terminal-options.c | 27 ++++++++++++++++++++++++++-
|
||||
1 file changed, 26 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/terminal-options.c b/src/terminal-options.c
|
||||
index d5bb5f24..5cc20798 100644
|
||||
--- a/src/terminal-options.c
|
||||
+++ b/src/terminal-options.c
|
||||
@@ -62,9 +62,33 @@ terminal_fprintf (FILE* fp,
|
||||
}
|
||||
}
|
||||
|
||||
+static TerminalVerbosity
|
||||
+verbosity_from_log_level (GLogLevelFlags log_level)
|
||||
+{
|
||||
+ guint level = log_level & G_LOG_LEVEL_MASK;
|
||||
+ TerminalVerbosity res;
|
||||
+ level = level & ~(level - 1); /* extract the highest bit */
|
||||
+ switch (level) {
|
||||
+ case G_LOG_LEVEL_DEBUG:
|
||||
+ res = TERMINAL_VERBOSITY_DEBUG;
|
||||
+ break;
|
||||
+ case G_LOG_LEVEL_INFO:
|
||||
+ res = TERMINAL_VERBOSITY_DETAIL;
|
||||
+ break;
|
||||
+ default:
|
||||
+ /* better display than lose important messages */
|
||||
+ res = TERMINAL_VERBOSITY_NORMAL;
|
||||
+ }
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
/* Need to install a special log writer so we never output
|
||||
* anything without the '# ' prepended, in case --print-environment
|
||||
* is used.
|
||||
+ *
|
||||
+ * FIXME: Until issue glib#2087 is fixed, apply a simple log level filter
|
||||
+ * to prevent spamming dconf (and other) debug messages to stderr,
|
||||
+ * see issue gnome-terminal#42.
|
||||
*/
|
||||
GLogWriterOutput
|
||||
terminal_log_writer (GLogLevelFlags log_level,
|
||||
@@ -72,9 +96,10 @@ terminal_log_writer (GLogLevelFlags log_level,
|
||||
gsize n_fields,
|
||||
gpointer user_data)
|
||||
{
|
||||
+ TerminalVerbosity level = verbosity_from_log_level(log_level);
|
||||
for (gsize i = 0; i < n_fields; i++) {
|
||||
if (g_str_equal (fields[i].key, "MESSAGE"))
|
||||
- terminal_printerr ("%s\n", (const char*)fields[i].value);
|
||||
+ terminal_fprintf (stderr, level, "%s\n", (const char*)fields[i].value);
|
||||
}
|
||||
|
||||
return G_LOG_WRITER_HANDLED;
|
||||
--
|
||||
2.24.1
|
||||
|
Loading…
Reference in New Issue
Block a user