From 636978f6e11e8f0c7bc18a7b260a24ec61043fb4 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 20 Sep 2020 17:24:31 +0200 Subject: [PATCH] - updated to 3.38.0 - updated transparency patch --- gnome-terminal-transparency.patch | 39 ++++++++++++++----------------- gnome-terminal.spec | 17 +++++++------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/gnome-terminal-transparency.patch b/gnome-terminal-transparency.patch index 9025b7b..3879cc1 100644 --- a/gnome-terminal-transparency.patch +++ b/gnome-terminal-transparency.patch @@ -112,13 +112,12 @@ index 6259aac0f02f..f5c366f14e10 100644 diff --git a/src/profile-editor.c b/src/profile-editor.c index eaad9182fed2..e03e35fc1bea 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -1254,6 +1254,22 @@ profile_prefs_load (const char *uuid, GSettings *profile) - w, +--- gnome-terminal-3.38.0/src/profile-editor.c.orig 2020-09-20 11:56:27.749274156 +0200 ++++ gnome-terminal-3.38.0/src/profile-editor.c 2020-09-20 11:59:49.354848632 +0200 +@@ -1427,6 +1427,22 @@ "active-id", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); -+ + + profile_prefs_settings_bind (profile, + TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, + gtk_builder_get_object (builder, "use-transparent-background"), @@ -134,9 +133,10 @@ index eaad9182fed2..e03e35fc1bea 100644 + gtk_builder_get_object (builder, "background-transparent-adjustment"), + "value", + G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); - } - - /* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */ ++ + w = (GtkWidget *) gtk_builder_get_object (builder, "enable-sixel-checkbutton"); + profile_prefs_settings_bind (profile, TERMINAL_PROFILE_ENABLE_SIXEL_KEY, w, + "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h index 5b0d8c3ed416..4da44232e491 100644 --- a/src/terminal-schemas.h @@ -1297,22 +1297,19 @@ index 87a8e0ff46d4..2eacb4584f32 100644 #~ msgid "Whether to allow bold text" #~ msgstr "Indique s’il faut autoriser le texte en gras" -diff --git a/po/fur.po b/po/fur.po -index 3f5429cfecd8..e637a6c0dc5f 100644 ---- a/po/fur.po -+++ b/po/fur.po -@@ -454,6 +454,10 @@ msgstr "" - msgid "Which encoding to use" - msgstr "Codifiche di doprâ" +--- gnome-terminal-3.38.0/po/fur.po.orig 2020-09-12 21:18:27.000000000 +0200 ++++ gnome-terminal-3.38.0/po/fur.po 2020-09-20 12:01:34.634278284 +0200 +@@ -2417,6 +2417,9 @@ + msgid "C_lose Window" + msgstr "_Siere barcon" -+#: ../src/gnome-terminal.glade2.h:86 +msgid "Transparent background" +msgstr "Fondâl trasparent" + - #: ../src/org.gnome.Terminal.gschema.xml.h:68 - msgid "" - "Whether ambiguous-width characters are narrow or wide when using UTF-8 " -@@ -3371,6 +3375,9 @@ msgstr "_Siere barcon" + #~ msgid "Hindi" + #~ msgstr "Hindi" + +@@ -3546,6 +3549,9 @@ #~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge." #~ msgstr "Il test fracât nol samee jessi un OTP challenge." @@ -1322,7 +1319,7 @@ index 3f5429cfecd8..e637a6c0dc5f 100644 #~ msgid "Switch to Tab 3" #~ msgstr "Passe a la schede 3" -@@ -3426,8 +3433,8 @@ msgstr "_Siere barcon" +@@ -3601,8 +3607,8 @@ #~ msgid "_Input Methods" #~ msgstr "_Cemût inserî test" diff --git a/gnome-terminal.spec b/gnome-terminal.spec index cecb7df..5cc51ae 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -6,12 +6,12 @@ Summary: GNOME Terminal Summary(pl.UTF-8): Terminal dla GNOME Name: gnome-terminal -Version: 3.36.2 +Version: 3.38.0 Release: 1 License: GPL v3+ Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.36/%{name}-%{version}.tar.xz -# Source0-md5: 08150cbf2e23dd4f60f959a6eca8ef0c +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.38/%{name}-%{version}.tar.xz +# Source0-md5: 947facc65c12735ac586e9dbf6228502 Patch1: %{name}-transparency.patch URL: https://wiki.gnome.org/Apps/Terminal/ BuildRequires: autoconf >= 2.53 @@ -19,7 +19,7 @@ BuildRequires: automake >= 1:1.9 BuildRequires: dconf-devel >= 0.14 BuildRequires: docbook-dtd412-xml BuildRequires: gettext-tools >= 0.19.8 -BuildRequires: glib2-devel >= 1:2.50.0 +BuildRequires: glib2-devel >= 1:2.52.0 BuildRequires: gnome-shell-devel >= 3.12.0 BuildRequires: gsettings-desktop-schemas-devel >= 0.1.0 BuildRequires: gtk+3-devel >= 3.22.27 @@ -32,16 +32,16 @@ BuildRequires: pkgconfig >= 1:0.12.0 BuildRequires: rpmbuild(find_lang) >= 1.23 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: tar >= 1:1.22 -BuildRequires: vte-devel >= 0.60.2 +BuildRequires: vte-devel >= 0.62.0 BuildRequires: xz BuildRequires: yelp-tools -Requires(post,postun): glib2 >= 1:2.50.0 +Requires(post,postun): glib2 >= 1:2.52.0 Requires: dconf >= 0.14 -Requires: glib2 >= 1:2.50.0 +Requires: glib2 >= 1:2.52.0 Requires: gsettings-desktop-schemas >= 0.1.0 Requires: gtk+3 >= 3.22.27 Requires: terminfo -Requires: vte >= 0.60.2 +Requires: vte >= 0.62.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -121,6 +121,7 @@ fi %{_iconsdir}/hicolor/scalable/apps/org.gnome.Terminal.svg %{_iconsdir}/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg %{systemduserunitdir}/gnome-terminal-server.service +%{_mandir}/man1/gnome-terminal.1* %if %{with nautilus} %files -n nautilus-extension-terminal -- 2.43.0