Compare commits

..

No commits in common. "d5ba56ecf4a909a5e10c8f1a8257a5bdb010f036" and "6a579495c389911b22334f03ecfa6589789a0b46" have entirely different histories.

7 changed files with 198 additions and 289 deletions

3
.gitignore vendored
View File

@ -71,6 +71,3 @@
/vte-0.62.0.tar.xz
/vte-0.62.1.tar.xz
/vte-0.62.2.tar.xz
/vte-0.62.3.tar.xz
/vte-0.64.1.tar.xz
/vte-0.64.2.tar.xz

View File

@ -1 +0,0 @@
bdd2629d6776c93ad2bd420f0c7882d7a3f4bfb7 vte-0.64.2.tar.xz

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -1 +1 @@
SHA512 (vte-0.64.2.tar.xz) = 67facea1f2507183aa5fd51215a404d6e754be5694e49c8511d7dd841192178a583e9416b2611dc6b5f635555ac2fb9f48a8a6e68e6e4673c4d93422b7555061
SHA512 (vte-0.62.2.tar.xz) = 61ea130d43d60531dcaa8bddfecacfd4a934a2e868da69b598fad0a2feb04885fc0b5dd520dac4b0d3a4daf11ea70c5357066ed15759e36436346dae498e8ef8

File diff suppressed because it is too large Load Diff

13
vte291-gcc11.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/vtetypebuiltins.cc.template b/src/vtetypebuiltins.cc.template
index dade41d..4c8b5c4 100644
--- a/src/vtetypebuiltins.cc.template
+++ b/src/vtetypebuiltins.cc.template
@@ -11,7 +11,7 @@
GType
@enum_name@_get_type (void)
{
- static volatile gsize g_define_type_id__volatile = 0;
+ static gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile)) {
static const G@Type@Value values[] = {

View File

@ -10,19 +10,18 @@
%global pcre2_version 10.21
Name: vte291
Version: 0.64.2
Release: 2%{?dist}
Version: 0.62.2
Release: 1%{?dist}
Summary: Terminal emulator library
# libvte-2.91.so is generated from LGPLv3+ and MIT sources
License: LGPLv3+ and MIT
URL: https://wiki.gnome.org/Apps/Terminal/VTE
Source0: https://download.gnome.org/sources/vte/0.64/vte-%{version}.tar.xz
License: LGPLv2+
URL: http://www.gnome.org/
Source0: http://download.gnome.org/sources/vte/0.62/vte-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=711059
# https://bugzilla.redhat.com/show_bug.cgi?id=1103380
# https://pagure.io/fedora-workstation/issue/216
Patch100: vte291-cntnr-precmd-preexec-scroll.patch
Patch101: %{name}-gcc11.patch
BuildRequires: gcc-c++
BuildRequires: gettext
@ -62,9 +61,6 @@ console/terminal in games, editors, IDEs, etc.
%package devel
Summary: Development files for %{name}
# vte-2.91 is generated from GPLv3+ sources, while the public headers are
# LGPLv3+
License: GPLv3+ and LGPLv3+
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -88,6 +84,7 @@ emulator library.
%prep
%setup -q -n vte-%{version}
%patch100 -p1 -b .cntnr-precmd-preexec-scroll
%patch101 -p1 -b .gcc11
%if 0%{?flatpak}
# Install user units where systemd macros expect them
sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
@ -103,56 +100,26 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
%find_lang vte-%{apiver}
%files -f vte-%{apiver}.lang
%license COPYING.LGPL3
%license COPYING.XTERM
%license COPYING.GPL3
%{_libdir}/libvte-%{apiver}.so.0*
%{_libdir}/girepository-1.0/
%{_userunitdir}/vte-spawn-.scope.d
%files devel
%license COPYING.GPL3
%{_bindir}/vte-%{apiver}
%{_includedir}/vte-%{apiver}/
%{_libdir}/libvte-%{apiver}.so
%{_libdir}/pkgconfig/vte-%{apiver}.pc
%{_datadir}/gir-1.0/
%{_datadir}/glade/
%doc %{_datadir}/gtk-doc/
%{_datadir}/vala/
%files -n vte-profile
%license COPYING.GPL3
%{_libexecdir}/vte-urlencode-cwd
%{_sysconfdir}/profile.d/vte.csh
%{_sysconfdir}/profile.d/vte.sh
%changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.64.2-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Jun 17 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.64.2-1
- Update to 0.64.2
- Add missing _VTE_CXX_NOEXCEPT to downstream patches (#1973174)
- Fix the License fields and ship the correct license texts (#1973299)
* Thu May 06 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.64.1-1
- Update to 0.64.1
Resolves: #1957970
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.62.3-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 0.62.3-2
- Revert a change that limited select all, as decided by Workstation WG
* Tue Feb 16 2021 Kalev Lember <klember@redhat.com> - 0.62.3-1
- Update to 0.62.3
- Use https URLs for upstream
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.62.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jan 25 2021 Kalev Lember <klember@redhat.com> - 0.62.2-1
- Update to 0.62.2