Compare commits

..

No commits in common. "4d4e5fbcb03e3ec599eba6eba02a7af88eacb679" and "88f944595566cdd393c6f80449cd702bd1189c88" have entirely different histories.

8 changed files with 909 additions and 1467 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,28 +0,0 @@
From c9ea02e40a13316619d7c20ad3b3a6c666941d88 Mon Sep 17 00:00:00 2001
From: kkz <zhaoshuang@uniontech.com>
Date: Wed, 26 Jul 2023 17:28:08 +0800
Subject: [PATCH] allow non-UTF8 locale
---
src/server.cc | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/server.cc b/src/server.cc
index 199df22..cbbb711 100644
--- a/src/server.cc
+++ b/src/server.cc
@@ -123,11 +123,6 @@ init_server (int argc,
g_unsetenv ("CHARSET");
g_unsetenv ("OUTPUT_CHARSET");
- const char *charset;
- if (!g_get_charset (&charset)) {
- g_printerr ("Non UTF-8 locale (%s) is not supported!\n", charset);
- return _EXIT_FAILURE_NO_UTF8;
- }
/* Sanitise environment */
g_unsetenv ("DBUS_STARTER_BUS_TYPE");
--
2.27.0

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -1,20 +1,19 @@
Name: gnome-terminal Name: gnome-terminal
Version: 3.48.1 Version: 3.37.90
Release: 1 Release: 1
Summary: A terminal emulator for GNOME Summary: A terminal emulator for GNOME
License: GPL-3.0-or-later and GFDL-1.3-only and LGPL-2.0-or-later License: GPLv3+ and GFDL and LGPLv2+
URL: http://www.gnome.org/ URL: http://www.gnome.org/
Source0: https://gitlab.gnome.org/GNOME/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-terminal/3.37/gnome-terminal-%{version}.tar.xz
Source1: org.gnome.Terminal.gschema.override
Patch0000: gnome-terminal-cntr-ntfy-autottl-ts.patch Patch0000: gnome-terminal-cntr-ntfy-autottl-ts.patch
Patch0001: allow-non-UTF8-locale.patch Patch0001: 0001-build-Don-t-treat-warnings-as-errors.patch
BuildRequires: glib2-devel gtk3-devel gsettings-desktop-schemas-devel BuildRequires: glib2-devel gtk3-devel gsettings-desktop-schemas-devel
BuildRequires: desktop-file-utils gettext-devel autoconf automake BuildRequires: desktop-file-utils gettext-devel autoconf automake
BuildRequires: systemd libtool itstool dconf-devel libuuid-devel nautilus-devel BuildRequires: systemd libtool itstool dconf-devel libuuid-devel nautilus-devel
BuildRequires: gnome-shell pcre2-devel vala-devel vte291-devel gcc-c++ BuildRequires: gnome-shell pcre2-devel vala-devel vte291-devel
BuildRequires: docbook-style-xsl libxslt yelp-tools meson libappstream-glib BuildRequires: docbook-style-xsl libxslt yelp-tools
Requires: dbus dbus-x11 glib2%{?_isa} gsettings-desktop-schemas gtk3%{?_isa} vte291%{?_isa} Requires: dbus dbus-x11 glib2%{?_isa} gsettings-desktop-schemas gtk3%{?_isa} vte291%{?_isa}
@ -28,25 +27,24 @@ This package provides a terminal emulator application for GNOME.
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
%build %build
%meson \ autoreconf -f -i
-Ddebug=true \ %configure \
-Ddocs=true \ --disable-silent-rules \
-Dnautilus_extension=true \ --disable-static \
-Dsearch_provider=true --enable-debug \
--with-gtk=3.0 \
%meson_build --with-nautilus-extension
%make_build
%install %install
%meson_install %make_install
install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas %delete_la
%find_lang %{name} --with-gnome %find_lang %{name} --with-gnome
%check %check
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.Terminal*.metainfo.xml make check
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.desktop
%meson_test
%pre %pre
@ -57,47 +55,24 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.de
%postun %postun
%files -f %{name}.lang %files -f %{name}.lang
%license COPYING COPYING.GFDL %defattr(-,root,root)
%doc README.md %license COPYING AUTHORS
%doc NEWS
%{_bindir}/gnome-terminal %{_bindir}/gnome-terminal
%{_datadir}/metainfo/org.gnome.Terminal.appdata.xml
%{_datadir}/applications/org.gnome.Terminal.desktop %{_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}/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.xml
%{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.override
%{_datadir}/gnome-shell %{_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/scalable/apps/org.gnome.Terminal.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.Preferences.svg %{_datadir}/man/man1/gnome-terminal.1*
%{_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 %changelog
* Mon Nov 27 2023 lwg <liweiganga@uniontech.com> - 3.48.1-1
- update to version 3.48.1
* Wed Jul 26 2023 zhaoshuang <zhaoshuang@uniontech.com> - 3.46.7-2
- fix: allow-non-UTF8-locale
* 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
* Mon Jun 21 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.3-1
- Upgrade to 3.38.3
* Tue Dec 22 2020 huanghaitao <huanghaitao8@huawei.com> - 3.37.90-1 * Tue Dec 22 2020 huanghaitao <huanghaitao8@huawei.com> - 3.37.90-1
- Update to 3.37.90 - Update to 3.37.90

View File

@ -1,4 +1,4 @@
version_control: gitlab.gnome version_control: gitlab.gnome
src_repo: gnome-terminal src_repo: gnome-terminal
tag_prefix: GNOME_TERMINAL_ tag_prefix: GNOME_TERMINAL_
separator: _ seperator: _

View File

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