rpms/gnome-terminal
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c8
Branches Tags
rpms:c8
rpms:c10s
rpms:c8-beta
rpms:c9s
rpms:c8s
rpms:c9
rpms:c9-beta
rpms:imports/c8/gnome-terminal-3.28.3-4.el8
rpms:imports/c8-beta/gnome-terminal-3.28.3-4.el8
rpms:imports/c9/gnome-terminal-3.40.3-1.el9
rpms:imports/c9-beta/gnome-terminal-3.40.3-1.el9
rpms:imports/c9-beta/gnome-terminal-3.40.1-2.el9
rpms:imports/c8-beta/gnome-terminal-3.28.3-3.el8
rpms:imports/c8-beta/gnome-terminal-3.28.3-2.el8
rpms:imports/c8-beta/gnome-terminal-3.28.3-1.el8
rpms:imports/c8-beta/gnome-terminal-3.28.2-3.el8
rpms:imports/c8s/gnome-terminal-3.28.3-3.el8
rpms:imports/c8s/gnome-terminal-3.28.3-2.el8
rpms:imports/c8s/gnome-terminal-3.28.3-1.el8
rpms:imports/c8/gnome-terminal-3.28.3-3.el8
rpms:imports/c8/gnome-terminal-3.28.3-2.el8
rpms:imports/c8/gnome-terminal-3.28.3-1.el8
rpms:imports/c8/gnome-terminal-3.28.2-3.el8
...
pull from: rpms:c9-beta
Branches Tags
rpms:c10s
rpms:c8
rpms:c8-beta
rpms:c9s
rpms:c8s
rpms:c9
rpms:c9-beta
rpms:imports/c8/gnome-terminal-3.28.3-4.el8
rpms:imports/c8-beta/gnome-terminal-3.28.3-4.el8
rpms:imports/c9/gnome-terminal-3.40.3-1.el9
rpms:imports/c9-beta/gnome-terminal-3.40.3-1.el9
rpms:imports/c9-beta/gnome-terminal-3.40.1-2.el9
rpms:imports/c8-beta/gnome-terminal-3.28.3-3.el8
rpms:imports/c8-beta/gnome-terminal-3.28.3-2.el8
rpms:imports/c8-beta/gnome-terminal-3.28.3-1.el8
rpms:imports/c8-beta/gnome-terminal-3.28.2-3.el8
rpms:imports/c8s/gnome-terminal-3.28.3-3.el8
rpms:imports/c8s/gnome-terminal-3.28.3-2.el8
rpms:imports/c8s/gnome-terminal-3.28.3-1.el8
rpms:imports/c8/gnome-terminal-3.28.3-3.el8
rpms:imports/c8/gnome-terminal-3.28.3-2.el8
rpms:imports/c8/gnome-terminal-3.28.3-1.el8
rpms:imports/c8/gnome-terminal-3.28.2-3.el8

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

9 changed files with 1547 additions and 1818 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/gnome-terminal-3.28.3.tar.xz
SOURCES/gnome-terminal-3.40.3.tar.xz

1
.gnome-terminal.metadata Normal file
View File

@ -0,0 +1 @@
ea6da6d44534bebce8835e5933b5e28a59147830 SOURCES/gnome-terminal-3.40.3.tar.xz

470
SOURCES/0001-Add-a-manual.patch
View File

@ -1,470 +0,0 @@
From 33c56bac4d5592e845a824f3273de5af5eee0ae4 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 17 Jun 2020 12:59:48 +0200
Subject: [PATCH] Add a manual
https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/277
---
Makefile.am | 2 +-
configure.ac | 9 +
man/Makefile.am | 18 ++
man/gnome-terminal.xml | 385 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 413 insertions(+), 1 deletion(-)
create mode 100644 man/Makefile.am
create mode 100644 man/gnome-terminal.xml
diff --git a/Makefile.am b/Makefile.am
index 14b59bac43b9..52dd7265d715 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src po help
+SUBDIRS = man src po help
NULL =
diff --git a/configure.ac b/configure.ac
index c5f40c07884a..00028858c654 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,14 @@ if test -z "$DESKTOP_FILE_VALIDATE"; then
fi
fi
+AC_ARG_VAR([XSLTPROC],[the xsltproc programme])
+if test -z "$XSLTPROC"; then
+ AC_PATH_PROG([XSLTPROC],[xsltproc],[])
+ if test -z "$XSLTPROC"; then
+ AC_MSG_ERROR([xsltproc not found])
+ fi
+fi
+
# ***************************
# GNOME Shell search provider
# ***************************
@@ -327,6 +335,7 @@ AC_DEFINE_UNQUOTED([GDK_VERSION_MAX_ALLOWED],[G_ENCODE_VERSION($(echo $GTK_MAX_A
AC_CONFIG_FILES([
Makefile
org.gnome.Terminal.desktop.in
+man/Makefile
src/Makefile
src/terminal-version.h
help/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 000000000000..ecce224d455d
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,18 @@
+XSLTPROC_FLAGS = \
+ --nonet \
+ --stringparam man.output.quietly 1 \
+ --stringparam funcsynopsis.style ansi \
+ --stringparam man.authors.section.enabled 0 \
+ --stringparam man.copyright.section.enabled 0
+
+.xml.1:
+ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+man_MANS = \
+ gnome-terminal.1
+
+xml_files = $(man_MANS:.1=.xml)
+
+EXTRA_DIST = $(xml_files)
+
+CLEANFILES = $(man_MANS)
diff --git a/man/gnome-terminal.xml b/man/gnome-terminal.xml
new file mode 100644
index 000000000000..abdac002c8ae
--- /dev/null
+++ b/man/gnome-terminal.xml
@@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2020 Red Hat, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+ * the GNU General Public License as published by the Free
+ Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+
+ or
+
+ * the GNU Free Documentation License version 1.3 as published by the
+ Free Software Foundation; with no Invariant Sections, no Front-Cover
+ Texts, and no Back-Cover Texts.
+
+ or both in parallel, as here.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License and the GNU Free Documentation License
+ for more details.
+
+ You should have received a copy of the GNU General Public License and
+ of the GNU Free Documentation License along with this program.
+ If not, see <https://www.gnu.org/licenses/>.
+-->
+<refentry id="gnome-terminal.1">
+ <refentryinfo>
+ <title>gnome-terminal</title>
+ <date>June 2020</date>
+ <productname>GNOME</productname>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>gnome-terminal</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">User Commands</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>gnome-terminal</refname>
+ <refpurpose>A terminal emulator for GNOME</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>gnome-terminal</command>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ <command>gnome-terminal</command> is a terminal emulator application for
+ accessing a UNIX shell environment which can be used to run programs
+ available on your system. It supports several profiles, multiple tabs and
+ implements several keyboard shortcuts.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>OPTIONS</title>
+ <variablelist>
+ <varlistentry>
+ <term><option>--help, -h</option></term>
+ <listitem>
+ <para>
+ Show a brief overview of all the options.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--help-all</option></term>
+ <listitem>
+ <para>
+ Show all the options in detail.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--help-gtk</option></term>
+ <listitem>
+ <para>
+ Show all the GTK options.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--help-terminal</option></term>
+ <listitem>
+ <para>
+ Show all the options to select between new terminal tabs or
+ windows.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--help-terminal-options</option></term>
+ <listitem>
+ <para>
+ Show all the options to change the attributes of terminals
+ regardless of whether they are in separate tabs or windows.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--help-window-options</option></term>
+ <listitem>
+ <para>
+ Show all the options to change the attributes of windows
+ containing terminals.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--load-config=FILE</option></term>
+ <listitem>
+ <para>
+ Restore the application to a previously saved state by loading it
+ from a configuration file.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--preferences</option></term>
+ <listitem>
+ <para>
+ Show the preferences window.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--print-environment, -p</option></term>
+ <listitem>
+ <para>
+ Print the environment variables to interact with newly created
+ terminals.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--quiet, -q</option></term>
+ <listitem>
+ <para>
+ Suppress diagnostics.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--verbose, -v</option></term>
+ <listitem>
+ <para>
+ Increase diagnostic verbosity.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--tab</option></term>
+ <listitem>
+ <para>
+ Open a new tab containing a terminal in the last-opened window with
+ the default profile.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--window</option></term>
+ <listitem>
+ <para>
+ Open a new window with a tab containing a terminal with the default
+ profile.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--command, -e=COMMAND</option></term>
+ <listitem>
+ <para>
+ Execute the argument to this option inside the terminal.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--fd=FD</option></term>
+ <listitem>
+ <para>
+ Forward file descriptor.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--profile=PROFILE-NAME</option></term>
+ <listitem>
+ <para>
+ Use the given profile instead of the default profile.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--title, -t=TITLE</option></term>
+ <listitem>
+ <para>
+ Set the initial terminal title.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--wait</option></term>
+ <listitem>
+ <para>
+ Wait until the terminal's child exits.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--working-directory=DIRNAME</option></term>
+ <listitem>
+ <para>
+ Set the terminal's working directory.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--zoom=ZOOM</option></term>
+ <listitem>
+ <para>
+ Set the terminal's zoom factor. 1.0 is normal size.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--active</option></term>
+ <listitem>
+ <para>
+ Set the last specified tab as the active one in its window.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--full-screen</option></term>
+ <listitem>
+ <para>
+ Full-screen the window.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--geometry=GEOMETRY</option></term>
+ <listitem>
+ <para>
+ Set the window size as COLSxROWS+X+Y. For example, 80x24 or
+ 80x24+200+200.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--hide-menubar</option></term>
+ <listitem>
+ <para>
+ Turn off the menubar for the window.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--show-menubar</option></term>
+ <listitem>
+ <para>
+ Turn on the menubar for the window.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--maximize</option></term>
+ <listitem>
+ <para>
+ Maximize the window.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--role=ROLE</option></term>
+ <listitem>
+ <para>
+ Set the X window role.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--class=CLASS</option></term>
+ <listitem>
+ <para>
+ Program class as used by the window manager.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--display=DISPLAY</option></term>
+ <listitem>
+ <para>
+ X display to use.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--g-fatal-warnings</option></term>
+ <listitem>
+ <para>
+ Make all warnings fatal.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--gdk-debug=FLAGS</option></term>
+ <listitem>
+ <para>
+ GDK debugging flags to set.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--gdk-no-debug=FLAGS</option></term>
+ <listitem>
+ <para>
+ GDK debugging flags to unset.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--gtk-debug=FLAGS</option></term>
+ <listitem>
+ <para>
+ GTK debugging flags to set.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--gtk-no-debug=FLAGS</option></term>
+ <listitem>
+ <para>
+ GTK debugging flags to unset.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--gtk-module=MODULES</option></term>
+ <listitem>
+ <para>
+ Load additional GTK modules.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--name=NAME</option></term>
+ <listitem>
+ <para>
+ Program name as used by the window manager.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>BUGS</title>
+ <para>
+ Please read
+ <ulink url="https://wiki.gnome.org/Apps/Terminal/ReportingBugs"></ulink>
+ on how to report bugs.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+ <para>
+ For further information, visit the website
+ <ulink url="https://wiki.gnome.org/Apps/Terminal"></ulink>. There's a
+ list of frequently asked questions at
+ <ulink url="https://wiki.gnome.org/Apps/Terminal/FAQ"></ulink>.
+ </para>
+ </refsect1>
+</refentry>
--
2.25.4

35
SOURCES/0001-build-Don-t-treat-warnings-as-errors.patch
View File

@ -1,35 +0,0 @@
From 91247dcb61cae4fbf36123e745193b7ad041f319 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 23 Feb 2015 18:54:36 +0100
Subject: [PATCH] build: Don't treat warnings as errors
---
configure.ac | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index fcdd52c83980..b3a57a693e64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,12 +271,12 @@ CC_CHECK_FLAGS_APPEND([WARN_CFLAGS],[CFLAGS],[ \
-Wall \
-Wcast-align \
-Wendif-labels \
- "-Werror=format=2 -Werror=format-nonliteral -Werror=format-security" \
- -Werror=implicit-function-declaration \
- -Werror=init-self \
- -Werror=missing-include-dirs \
- -Werror=missing-prototypes \
- -Werror=pointer-arith \
+ "-Wformat=2 -Wformat-nonliteral -Wformat-security" \
+ -Wimplicit-function-declaration \
+ -Winit-self \
+ -Wmissing-include-dirs \
+ -Wmissing-prototypes \
+ -Wpointer-arith \
-Wextra \
-Wfloat-equal \
-Wimplicit \
--
2.14.3

70
SOURCES/gnome-terminal-3.28.3-quiet-dconf-logging.patch
View File

@ -1,70 +0,0 @@
From 8b0d3a904e512977383954fc5c1aed20092145eb 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
---
src/terminal-options.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/terminal-options.c b/src/terminal-options.c
index 8d506d82..fe3cad92 100644
--- a/src/terminal-options.c
+++ b/src/terminal-options.c
@@ -63,10 +63,33 @@ terminal_fprintf (FILE* fp,
}
#if GLIB_CHECK_VERSION (2, 50, 0)
+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,
@@ -74,9 +97,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.40.1

2323
SOURCES/gnome-terminal-notify-open-title-transparency.patch → SOURCES/gnome-terminal-cntr-ntfy-autottl-ts.patch
View File

File diff suppressed because it is too large Load Diff

189
SOURCES/gnome-terminal-keypad-accels.patch
View File

@ -1,189 +0,0 @@
From 6858b70c0ad36a1a072ec545b2e8bea8e926b06d Mon Sep 17 00:00:00 2001
From: Egmont Koblinger <egmont@gmail.com>
Date: Wed, 18 Sep 2019 13:46:47 +0200
Subject: [PATCH 1/2] build: Bump gtk min-req version to 3.18
https://gitlab.gnome.org/GNOME/gnome-terminal/issues/162
---
configure.ac | 2 +-
src/terminal-accels.c | 26 ++++++++++++--------------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index 00028858c654..5b5bd4133970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_MSG_RESULT([$with_gtk])
case "$with_gtk" in
3.0) GTK_API_VERSION=3.0
GTK_REQUIRED=3.12.0
- GTK_MIN_REQUIRED=3.8
+ GTK_MIN_REQUIRED=3.18
GTK_MAX_ALLOWED=3.22
VTE_API_VERSION=2.91
VTE_REQUIRED=0.52.2
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
index 2ce4635d09cd..1871037f7fab 100644
--- a/src/terminal-accels.c
+++ b/src/terminal-accels.c
@@ -259,6 +259,7 @@ key_changed_cb (GSettings *settings,
gpointer user_data)
{
GtkApplication *application = user_data;
+ const gchar *accels[2] = { NULL, NULL };
_terminal_debug_print (TERMINAL_DEBUG_ACCELS,
"key %s changed\n",
@@ -278,6 +279,8 @@ key_changed_cb (GSettings *settings,
gs_free char *detailed = g_action_print_detailed_name (key_entry->action_name,
key_entry->parameter);
gs_unref_variant GVariant *shadow_parameter = g_variant_new_string (detailed);
+ gs_free char *shadow_detailed = g_action_print_detailed_name (key_entry->shadow_action_name,
+ shadow_parameter);
/* We want to always consume the action's accelerators, even if the corresponding
* action is insensitive, so the corresponding shortcut key escape code isn't sent
@@ -289,22 +292,17 @@ key_changed_cb (GSettings *settings,
*/
if (g_str_equal (value, "disabled")) {
- gtk_application_remove_accelerator (application,
- key_entry->action_name,
- key_entry->parameter);
- gtk_application_remove_accelerator (application,
- key_entry->shadow_action_name,
- shadow_parameter);
+ accels[0] = NULL;
} else {
- gtk_application_add_accelerator (application,
- value,
- key_entry->action_name,
- key_entry->parameter);
- gtk_application_add_accelerator (application,
- value,
- key_entry->shadow_action_name,
- shadow_parameter);
+ accels[0] = value;
}
+
+ gtk_application_set_accels_for_action (application,
+ detailed,
+ accels);
+ gtk_application_set_accels_for_action (application,
+ shadow_detailed,
+ accels);
}
void
--
2.28.0
From 0a273ebcd6945c6da9b58f4183ff2ccc300d2278 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 19 Nov 2020 19:25:05 +0100
Subject: [PATCH 2/2] accels: Support using the '0', '+' and '-' keys from the
numeric keypad
Currently, the default accelerators for zooming (ie., Ctrl+0, Ctrl++
and Ctrl+-) only work with the alphanumeric keys, not the numeric
keypad, which can confuse users. From now on, any accelerator that has
the '0', '+' or '-' key will work with both sets of keys.
https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/313
---
src/terminal-accels.c | 51 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
index 1871037f7fab..ab319a83f334 100644
--- a/src/terminal-accels.c
+++ b/src/terminal-accels.c
@@ -22,6 +22,7 @@
#include <glib.h>
#include <glib/gi18n.h>
+#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include "terminal-accels.h"
@@ -253,13 +254,45 @@ binding_name (guint keyval,
return g_strdup ("disabled");
}
+static guint
+get_alternate_accel_key (guint key)
+{
+ guint retval = 0;
+
+ switch (key) {
+ case GDK_KEY_0:
+ retval = GDK_KEY_KP_0;
+ break;
+ case GDK_KEY_minus:
+ retval = GDK_KEY_KP_Subtract;
+ break;
+ case GDK_KEY_plus:
+ retval = GDK_KEY_KP_Add;
+ break;
+ case GDK_KEY_KP_0:
+ retval = GDK_KEY_0;
+ break;
+ case GDK_KEY_KP_Add:
+ retval = GDK_KEY_plus;
+ break;
+ case GDK_KEY_KP_Subtract:
+ retval = GDK_KEY_minus;
+ break;
+ default:
+ break;
+ }
+
+ return retval;
+}
+
static void
key_changed_cb (GSettings *settings,
const char *settings_key,
gpointer user_data)
{
GtkApplication *application = user_data;
- const gchar *accels[2] = { NULL, NULL };
+ const gchar *accels[3] = { NULL, NULL, NULL };
+ gsize accels_offset = 0;
_terminal_debug_print (TERMINAL_DEBUG_ACCELS,
"key %s changed\n",
@@ -275,6 +308,7 @@ key_changed_cb (GSettings *settings,
}
gs_free char *value = g_settings_get_string (settings, settings_key);
+ gs_free char *alternate_value = NULL;
gs_free char *detailed = g_action_print_detailed_name (key_entry->action_name,
key_entry->parameter);
@@ -294,7 +328,20 @@ key_changed_cb (GSettings *settings,
if (g_str_equal (value, "disabled")) {
accels[0] = NULL;
} else {
- accels[0] = value;
+ accels[accels_offset] = value;
+ accels_offset++;
+
+ GdkModifierType mods;
+ guint key;
+ gtk_accelerator_parse (value, &key, &mods);
+
+ guint alternate_key = get_alternate_accel_key (key);
+
+ if (alternate_key != 0) {
+ alternate_value = gtk_accelerator_name (alternate_key, mods);
+ accels[accels_offset] = alternate_value;
+ accels_offset++;
+ }
}
gtk_application_set_accels_for_action (application,
--
2.28.0

1
SOURCES/org.gnome.Terminal.gschema.override
View File

@ -1,2 +1,3 @@
[org.gnome.Terminal.Legacy.Settings]
theme-variant='dark'
unified-menu=false

274
SPECS/gnome-terminal.spec
View File

@ -1,53 +1,43 @@
%define gettext_package gnome-terminal
%define glib2_version 2.50.0
%define gtk3_version 3.22.27
%define vte_version 0.52.2
%global gettext_version 0.19.8
%define glib2_version 2.52.0
%define gtk3_version 3.24.0
%define vte_version 0.64.0
%define desktop_file_utils_version 0.2.90
Name: gnome-terminal
Version: 3.28.3
Release: 4%{?dist}
Name: gnome-terminal
Version: 3.40.3
Release: 1%{?dist}
Summary: Terminal emulator for GNOME
License: GPLv3+ and GFDL and LGPLv2+
URL: http://www.gnome.org/
Source0: http://download.gnome.org/sources/gnome-terminal/3.28/gnome-terminal-%{version}.tar.xz
URL: https://wiki.gnome.org/Apps/Terminal
Source0: https://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz
Source1: org.gnome.Terminal.gschema.override
Patch100: gnome-terminal-notify-open-title-transparency.patch
Patch101: 0001-build-Don-t-treat-warnings-as-errors.patch
Patch100: gnome-terminal-cntr-ntfy-autottl-ts.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1612688
Patch102: 0001-Add-a-manual.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=837035
Patch103: gnome-terminal-keypad-accels.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=2154269
Patch104: gnome-terminal-3.28.3-quiet-dconf-logging.patch
BuildRequires: docbook-style-xsl
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
BuildRequires: gsettings-desktop-schemas-devel
BuildRequires: vte291-devel >= %{vte_version}
BuildRequires: pkgconfig(dconf)
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(libnautilus-extension)
BuildRequires: pkgconfig(libpcre2-8)
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(vte-2.91) >= %{vte_version}
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: gnome-common
BuildRequires: autoconf automake libtool
BuildRequires: itstool
BuildRequires: dconf-devel
BuildRequires: libxslt
BuildRequires: libuuid-devel
BuildRequires: nautilus-devel
BuildRequires: docbook-style-xsl
BuildRequires: gettext-devel >= %{gettext_version}
BuildRequires: gcc
BuildRequires: gnome-shell
BuildRequires: pcre2-devel
BuildRequires: systemd
BuildRequires: vala-devel
BuildRequires: itstool
BuildRequires: libxslt
BuildRequires: make
BuildRequires: systemd-rpm-macros
BuildRequires: yelp-tools
Requires: dbus-x11
Requires: dbus
Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gsettings-desktop-schemas
Requires: gtk3%{?_isa} >= %{gtk3_version}
@ -69,30 +59,29 @@ This package provides a Nautilus extension that adds the 'Open in Terminal'
option to the right-click context menu in Nautilus.
%prep
%setup -q
%patch100 -p1 -b .notify-open-title-transparency
%patch101 -p1 -b .warnings
%patch102 -p1 -b .manual
%patch103 -p1 -b .keypad-accels
%patch104 -p1 -b .dconf-logging
%autosetup -p1
%build
autoreconf -f -i
%configure --disable-static --disable-migration --with-gtk=3.0 --with-nautilus-extension
%configure \
--disable-silent-rules \
--disable-static \
--enable-debug \
--with-gtk=3.0 \
--with-nautilus-extension
make %{?_smp_mflags}
%make_build
%install
%make_install
rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
rm -f %{buildroot}%{_libdir}/nautilus/extensions-3.0/*.la
cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas
%find_lang %{gettext_package} --with-gnome
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Terminal.desktop
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.desktop
make check
%files -f %{gettext_package}.lang
@ -107,32 +96,191 @@ make check
%{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.override
%{_datadir}/gnome-shell
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg
%{_datadir}/man/man1/gnome-terminal.1*
%dir %{_libdir}/gnome-terminal
%{_libdir}/gnome-terminal/gschemas.compiled
%{_userunitdir}/gnome-terminal-server.service
%files nautilus
%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so
%{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
%changelog
* Thu May 04 2023 David King <amigadave@amigadave.com> - 3.28.3-4
- Quiet dconf logging (#2154269)
* Thu Sep 16 2021 David King <amigadave@amigadave.com> - 3.40.3-1
- Update to 3.40.3 (#1998957)
* Mon Nov 30 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.28.3-3
- Support using the '0', '+' and '-' keys from the numeric keypad as
accelerators
- Resolves: #837035
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.40.1-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jun 19 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.28.3-2
- Add a manual
- Resolves: #1612688
* Tue May 11 2021 Debarshi Ray <rishi@fedoraproject.org> - 3.40.1-1
- Update to 3.40.1
- Rebase the patches
- Backport yet-to-be-released patches from upstream to avoid translation
conflicts
Resolves: #1959384
* Wed Dec 11 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.28.3-1
- Update to 3.28.3
- Resolves: #1642427
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.38.1-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Jul 30 2018 Florian Weimer <fweimer@redhat.com> - 3.28.2-3
- Rebuild with fixed binutils
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Nov 20 2020 Ting-Wei Lan <lantw44@gmail.com> - 3.38.1-2
- Fix crash when the command line is shorter than 1024 characters
* Mon Oct 12 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.38.1-1
- Update to 3.38.1
- Backport yet-to-be-released patches from upstream
* Sat Sep 26 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.38.0-1
- Update to 3.38.0
- Rebase the patches
- Backport yet-to-be-released patches from upstream
* Sat Sep 26 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.37.90-1
- Update to 3.37.90
- Rebase the patches
* Fri Sep 25 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.36.2-1
- Update to 3.36.2
- Rebase the patches
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.1.1-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 15 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.36.1.1-2
- Enable debugging
* Mon Apr 06 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.36.1.1-1
- Update to 3.36.1.1
- Rebase the patches
* Sun Apr 05 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.36.1-1
- Update to 3.36.1
- Rebase the patches
* Fri Mar 06 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.36.0.1-1
- Update to 3.36.0.1
* Thu Mar 05 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.35.92-2
- Limit the command line to 1024 characters when used as the title
* Mon Mar 02 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.35.92-1
- Update to 3.35.92
* Fri Feb 28 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.35.91-1
- Update to 3.35.91
- Rebase the patches
- Backport yet-to-be-released patches from upstream to avoid translation
conflicts
* Fri Feb 28 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.35.1-1
- Update to 3.35.1
- Rebase the patches
* Mon Feb 24 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.34.2-3
- Add a "shell-command" flag for debugging.
- Backport yet-to-be-released patches from upstream to avoid translation
conflicts.
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Oct 14 2019 Kalev Lember <klember@redhat.com> - 3.34.2-1
- Update to 3.34.2
* Mon Oct 07 2019 Kalev Lember <klember@redhat.com> - 3.34.1-1
- Update to 3.34.1
* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
- Update to 3.34.0
- Rebase the translations
* Wed Sep 04 2019 Kalev Lember <klember@redhat.com> - 3.33.90-1
- Update to 3.33.90
- Rebase the patches
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 20 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.32.2-2
- Preserve current toolbox, if any, when opening a new terminal
* Tue May 07 2019 Kalev Lember <klember@redhat.com> - 3.32.2-1
- Update to 3.32.2
* Tue Apr 09 2019 Kalev Lember <klember@redhat.com> - 3.32.1-1
- Update to 3.32.1
- Rebase the translations
* Wed Apr 03 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.32.0-2
- Automatically update the title with the current foreground process.
- Rewrite the command-notify patches to use the interactive shell's precmd and
preexec hooks, instead of only the precmd hook and the history.
- Backport yet-to-be-released patches from upstream to avoid translation
conflicts.
* Fri Mar 29 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.32.0-1
- Update to 3.32.0
* Fri Mar 29 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.31.92-1
- Update to 3.31.92
- Rebase the translations
* Sat Mar 16 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 3.31.90-4
- Revert previous commit: headerbar will come in 3.32 final
* Sat Mar 16 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 3.31.90-3
- Enable the headerbar
* Tue Feb 19 2019 Kalev Lember <klember@redhat.com> - 3.31.90-2
- Rebuilt against fixed atk (#1626575)
* Tue Feb 19 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
- Update to 3.31.90
- Rebase the translations
- Drop obsolete gnome-common build dep
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.30.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Oct 26 2018 Kalev Lember <klember@redhat.com> - 3.30.2-1
- Update to 3.30.2
- Rebase transparency, command-notify, custom title and translation patches
* Thu Oct 11 2018 David Herrmann <dh.herrmann@gmail.com> - 3.30.1-2
- Reduce 'dbus-x11' dependency to 'dbus'. The xinit script are no longer the
canonical way to start dbus, but the 'dbus' package is nowadays required to
provide a user and system bus to its dependents.
* Fri Oct 05 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.30.0-1
- Update to 3.30.1
- Rebase transparency, command-notify, custom title and translation patches
- Use a GSettings override to separate the new-terminal menuitems
* Fri Oct 05 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.30.0-1
- Update to 3.30.0
* Fri Oct 05 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.29.92-1
- Update to 3.29.92
- Rebase transparency, command-notify, custom title and translation patches
- Remove upstreamed patches
* Fri Jul 27 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.28.2-4
- Include LGPLv2+ in the list of licenses
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jun 04 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.28.2-2
- Backport fix for client-side memory error (GNOME/gnome-terminal#1)