!4 Update to 3.37.90

From: @hht8
Reviewed-by: @chengzihan2,@small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2020-12-29 17:41:27 +08:00 committed by Gitee
commit 88f9445955
6 changed files with 5891 additions and 58 deletions

View File

@ -0,0 +1,35 @@
From 8709588cc5ec11e7b1007e7d67aa4df74faf5c68 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 f22050d6a2e3..d6d936eb0a96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,12 +225,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.19.1

View File

@ -1,52 +0,0 @@
From b99cbf89328d978c57a69413d76e1670316615ab Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 28 Mar 2018 18:50:16 +0200
Subject: [PATCH 07/15] prefs: Fix the visibility of the new-terminal-mode
GSetting UI
... when the new-terminal menus are disunified.
Since it's not possible to use DISUNIFY_NEW_TERMINAL_SECTION, it
should check the unified-menu GSetting instead.
Fallout from 30efce621ad04276771aa311f52731b468c4adfd
https://gitlab.gnome.org/GNOME/gnome-terminal/issues/37
---
src/terminal-prefs.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
index 5bc7718632f2..1cccfa923dd3 100644
--- a/src/terminal-prefs.c
+++ b/src/terminal-prefs.c
@@ -849,16 +849,16 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
gtk_widget_set_visible (theme_variant_combo, FALSE);
#endif /* GTK+ 3.19 */
-#ifndef DISUNIFY_NEW_TERMINAL_SECTION
- g_settings_bind (settings,
- TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY,
- new_terminal_mode_combo,
- "active-id",
- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
-#else
- gtk_widget_set_visible (new_terminal_mode_label, FALSE);
- gtk_widget_set_visible (new_terminal_mode_combo, FALSE);
-#endif
+ if (terminal_app_get_menu_unified (app)) {
+ g_settings_bind (settings,
+ TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY,
+ new_terminal_mode_combo,
+ "active-id",
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ } else {
+ gtk_widget_set_visible (new_terminal_mode_label, FALSE);
+ gtk_widget_set_visible (new_terminal_mode_combo, FALSE);
+ }
if (shell_shows_menubar) {
gtk_widget_set_visible (disable_mnemonics_button, FALSE);
--
2.14.4

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -1,19 +1,21 @@
Name: gnome-terminal
Version: 3.30.1
Release: 3
Version: 3.37.90
Release: 1
Summary: A terminal emulator for GNOME
License: GPLv3+ and GFDL and LGPLv2+
URL: http://www.gnome.org/
Source0: http://download.gnome.org/sources/gnome-terminal/3.30/gnome-terminal-%{version}.tar.xz
Source0: http://download.gnome.org/sources/gnome-terminal/3.37/gnome-terminal-%{version}.tar.xz
Patch0000: Fix-the-visibility-of-the-new-terminal-mode.patch
Patch0000: gnome-terminal-cntr-ntfy-autottl-ts.patch
Patch0001: 0001-build-Don-t-treat-warnings-as-errors.patch
BuildRequires: glib2-devel gtk3-devel gsettings-desktop-schemas-devel
BuildRequires: desktop-file-utils gettext intltool gnome-common autoconf automake
BuildRequires: desktop-file-utils gettext-devel autoconf automake
BuildRequires: systemd libtool itstool dconf-devel libuuid-devel nautilus-devel
BuildRequires: gnome-shell pcre2-devel vala-devel vte291-devel
BuildRequires: docbook-style-xsl libxslt yelp-tools
Requires: dbus-x11 glib2%{?_isa} gsettings-desktop-schemas gtk3%{?_isa} vte291%{?_isa}
Requires: dbus dbus-x11 glib2%{?_isa} gsettings-desktop-schemas gtk3%{?_isa} vte291%{?_isa}
Provides: %{name}-nautilus nautilus-open-terminal
Obsoletes: %{name}-nautilus nautilus-open-terminal
@ -29,6 +31,7 @@ autoreconf -f -i
%configure \
--disable-silent-rules \
--disable-static \
--enable-debug \
--with-gtk=3.0 \
--with-nautilus-extension
%make_build
@ -65,7 +68,13 @@ make check
%{_libexecdir}/gnome-terminal-server
%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so
%{_userunitdir}/gnome-terminal-server.service
%{_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*
%changelog
* Tue Dec 22 2020 huanghaitao <huanghaitao8@huawei.com> - 3.37.90-1
- Update to 3.37.90
* Mon Nov 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.30.1-3
- Package init