!7 升级gnome-terminal到3.46.7版本,修复nautilus升级导致的编译失败

From: @lyn1001 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2023-02-07 13:23:47 +00:00 committed by Gitee
commit ae3648d7f9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 944 additions and 889 deletions

View File

@ -1,32 +0,0 @@
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 c732caf..e0c2514 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,12 +234,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 \

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -1,19 +1,19 @@
Name: gnome-terminal
Version: 3.38.3
Release: 2
Version: 3.46.7
Release: 1
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/
Source0: http://download.gnome.org/sources/gnome-terminal/3.38/gnome-terminal-%{version}.tar.xz
Source0: https://gitlab.gnome.org/GNOME/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
Source1: org.gnome.Terminal.gschema.override
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-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
BuildRequires: gnome-shell pcre2-devel vala-devel vte291-devel gcc-c++
BuildRequires: docbook-style-xsl libxslt yelp-tools meson libappstream-glib
Requires: dbus dbus-x11 glib2%{?_isa} gsettings-desktop-schemas gtk3%{?_isa} vte291%{?_isa}
@ -27,24 +27,25 @@ This package provides a terminal emulator application for GNOME.
%autosetup -n %{name}-%{version} -p1
%build
autoreconf -f -i
%configure \
--disable-silent-rules \
--disable-static \
--enable-debug \
--with-gtk=3.0 \
--with-nautilus-extension
%make_build
%meson \
-Ddebug=true \
-Ddocs=true \
-Dnautilus_extension=true \
-Dsearch_provider=true
%meson_build
%install
%make_install
%meson_install
%delete_la
install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas
%find_lang %{name} --with-gnome
%check
make check
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.Terminal*.metainfo.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.desktop
%meson_test
%pre
@ -55,24 +56,35 @@ make check
%postun
%files -f %{name}.lang
%defattr(-,root,root)
%license COPYING AUTHORS
%doc NEWS
%license COPYING COPYING.GFDL
%doc README.md
%{_bindir}/gnome-terminal
%{_datadir}/metainfo/org.gnome.Terminal.appdata.xml
%{_datadir}/applications/org.gnome.Terminal.desktop
%{_datadir}/applications/org.gnome.Terminal.Preferences.desktop
%{_libexecdir}/gnome-terminal-preferences
%{_libexecdir}/gnome-terminal-server
%{_datadir}/dbus-1/services/org.gnome.Terminal.service
%{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.override
%{_datadir}/gnome-shell
%{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
%{_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*
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.Preferences.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal.Preferences-symbolic.svg
%dir %{_datadir}/xdg-terminals
%{_datadir}/xdg-terminals/org.gnome.Terminal.desktop
%dir %{_libdir}/gnome-terminal
%{_libdir}/gnome-terminal/gschemas.compiled
%{_mandir}/man1/gnome-terminal.1*
%{_metainfodir}/org.gnome.Terminal.metainfo.xml
%{_userunitdir}/gnome-terminal-server.service
%{_libdir}/nautilus/extensions-4/libterminal-nautilus.so
%{_metainfodir}/org.gnome.Terminal.Nautilus.metainfo.xml
%changelog
* Tue Feb 7 2023 liyanan <liyanan32@h-partners.com> - 3.46.7-1
- Update to 3.46.7
* Wed Jul 27 2022 yaoxin <yaoxin30@h-partners.com> - 3.38.3-2
- license compliance rectification

View File

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