AlmaLinux changes
Add gcc-toolset-%{gts_version}-gcc-c++ to BR
This commit is contained in:
Eduard Abdullin
root
commit
9ba4201b98
4
.gitignore
vendored
4
.gitignore
vendored
@ -2,5 +2,5 @@ SOURCES/cbindgen-vendor.tar.xz
|
||||
SOURCES/nspr-4.36.0-2.el8_2.src.rpm
|
||||
SOURCES/nss-3.112.0-1.el9_4.src.rpm
|
||||
SOURCES/nss-3.112.0-4.el8_2.src.rpm
|
||||
SOURCES/thunderbird-140.5.0esr.processed-source.tar.xz
|
||||
SOURCES/thunderbird-langpacks-140.5.0esr-20251111.tar.xz
|
||||
SOURCES/thunderbird-140.6.0esr.processed-source.tar.xz
|
||||
SOURCES/thunderbird-langpacks-140.6.0esr-20251209.tar.xz
|
||||
|
||||
@ -2,5 +2,5 @@ bc4adac8f38f5103d8f88564a1545063dd8d6402 SOURCES/cbindgen-vendor.tar.xz
|
||||
0d0ddbd2a73340b3cbc977997f57222946b1e775 SOURCES/nspr-4.36.0-2.el8_2.src.rpm
|
||||
fd3879b176634d66f8ef64d18fdaeec98e140c23 SOURCES/nss-3.112.0-1.el9_4.src.rpm
|
||||
c3f0aaef37972107442e2796efad71be3a98ce3c SOURCES/nss-3.112.0-4.el8_2.src.rpm
|
||||
d520f59fc94847639c7fad352c70806f1e9387ea SOURCES/thunderbird-140.5.0esr.processed-source.tar.xz
|
||||
93aae73f4a8d28e76adcb9298fb3074fa86aa6f7 SOURCES/thunderbird-langpacks-140.5.0esr-20251111.tar.xz
|
||||
ab767e5b54fba95763688dff619dbca1242d684b SOURCES/thunderbird-140.6.0esr.processed-source.tar.xz
|
||||
049156e2a11453644a8b203f0f9bfa5ab2ef6a71 SOURCES/thunderbird-langpacks-140.6.0esr-20251209.tar.xz
|
||||
|
||||
49
SOURCES/build-workaround-s390x.patch
Normal file
49
SOURCES/build-workaround-s390x.patch
Normal file
@ -0,0 +1,49 @@
|
||||
From 13858b4787c24a40cdce819b963baebff186cfe0 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Murphy <murp@redhat.com>
|
||||
Date: Tue, 25 Nov 2025 08:55:25 -0600
|
||||
Subject: [PATCH] HACK: workaround s390x
|
||||
|
||||
Attempt to workaround what seems to be a codegen related bug on s390x.
|
||||
|
||||
This seems to avoid a crash related to Ident or Punct structures on
|
||||
s390x.
|
||||
|
||||
For: RHEL-118250
|
||||
---
|
||||
third_party/rust/proc-macro2/.cargo-checksum.json | 2 +-
|
||||
third_party/rust/proc-macro2/src/lib.rs | 4 ++++
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/third_party/rust/proc-macro2/.cargo-checksum.json b/third_party/rust/proc-macro2/.cargo-checksum.json
|
||||
index b0d735a3a2d6..c47ce4ac5611 100644
|
||||
--- a/third_party/rust/proc-macro2/.cargo-checksum.json
|
||||
+++ b/third_party/rust/proc-macro2/.cargo-checksum.json
|
||||
@@ -1 +1 @@
|
||||
-{"files":{"Cargo.toml":"41a9465146a2b62a642e29f065718649e686d3c9585736596392dd941c9b0bef","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"c609b6865476d6c35879784e9155367a97a0da496aa5c3c61488440a20f59883","build.rs":"cf78c0005f11d54ca42dbaee77cb76a440e6fa2e0b64798d3f74c04770a0ad2b","build/probe.rs":"971fd2178dc506ccdc5c2065c37b77696a4aee8e00330ca52625db4a857f68d3","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/detection.rs":"ed9a5f9a979ab01247d7a68eeb1afa3c13209334c5bfff0f9289cb07e5bb4e8b","src/extra.rs":"29f094473279a29b71c3cc9f5fa27c2e2c30c670390cf7e4b7cf451486cc857e","src/fallback.rs":"be1ce5e32c88c29d41d2ab663375951817d52decce3dc9e335ec22378be8fa65","src/lib.rs":"97ca48f50ad15fbcef42b31fb4fbfb8e4a1c5f946d776aa44fd04b37d7c64b32","src/location.rs":"9225c5a55f03b56cce42bc55ceb509e8216a5e0b24c94aa1cd071b04e3d6c15f","src/marker.rs":"c11c5a1be8bdf18be3fcd224393f350a9aae7ce282e19ce583c84910c6903a8f","src/parse.rs":"4b77cddbc2752bc4d38a65acd8b96b6786c5220d19b1e1b37810257b5d24132d","src/rcvec.rs":"1c3c48c4f819927cc445ae15ca3bb06775feff2fd1cb21901ae4c40c7e6b4e82","src/wrapper.rs":"e41df9abc846b40f0cf01150d22b91944d07cde93bc72aa34798101652675844","tests/comments.rs":"31115b3a56c83d93eef2fb4c9566bf4543e302560732986161b98aef504785ed","tests/features.rs":"a86deb8644992a4eb64d9fd493eff16f9cf9c5cb6ade3a634ce0c990cf87d559","tests/marker.rs":"473e962ee1aa0633dd5cf9a973b3bbd0ef43b740d4b7f6d008ff455a6b89d386","tests/test.rs":"2e7106f582367d168638be7364d4e9aadbe0affca8b51dd80f0b3977cc2fcf83","tests/test_fmt.rs":"b7743b612af65f2c88cbe109d50a093db7aa7e87f9e37bf45b7bbaeb240aa020","tests/test_size.rs":"62d8373ea46b669b87bc90a9c49b6d02f90ff4c21f9a25acebf60c9926e01fb7"},"package":"5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"}
|
||||
\ No newline at end of file
|
||||
+{"files":{},"package":"5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"}
|
||||
diff --git a/third_party/rust/proc-macro2/src/lib.rs b/third_party/rust/proc-macro2/src/lib.rs
|
||||
index 1430306bb31d..81f8c15a67e4 100644
|
||||
--- a/third_party/rust/proc-macro2/src/lib.rs
|
||||
+++ b/third_party/rust/proc-macro2/src/lib.rs
|
||||
@@ -806,6 +806,8 @@ impl Debug for Group {
|
||||
/// `Punct` with different forms of `Spacing` returned.
|
||||
#[derive(Clone)]
|
||||
pub struct Punct {
|
||||
+ #[cfg(target_arch = "s390x")]
|
||||
+ foo: u64,
|
||||
ch: char,
|
||||
spacing: Spacing,
|
||||
span: Span,
|
||||
@@ -834,6 +836,8 @@ impl Punct {
|
||||
/// which can be further configured with the `set_span` method below.
|
||||
pub fn new(ch: char, spacing: Spacing) -> Self {
|
||||
Punct {
|
||||
+ #[cfg(target_arch = "s390x")]
|
||||
+ foo: 0xabcd,
|
||||
ch,
|
||||
spacing,
|
||||
span: Span::call_site(),
|
||||
--
|
||||
2.51.1
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<component type="desktop-application">
|
||||
<id>thunderbird</id>
|
||||
<id>thunderbird.desktop</id>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<name>Thunderbird</name>
|
||||
<summary>Thunderbird is a free and open source email, newsfeed, chat, and calendaring client</summary>
|
||||
@ -36,6 +36,15 @@
|
||||
<project_license>MPL-2.0</project_license>
|
||||
<developer_name>Thunderbird Project</developer_name>
|
||||
|
||||
<screenshots>
|
||||
<screenshot type="default">
|
||||
<image>https://raw.githubusercontent.com/thunderbird/flatpak-screenshots/main/image_1.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://raw.githubusercontent.com/thunderbird/flatpak-screenshots/main/image_2.png</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
|
||||
<mimetypes>
|
||||
<mimetype>message/rfc822</mimetype>
|
||||
<mimetype>x-scheme-handler/mailto</mimetype>
|
||||
|
||||
@ -137,8 +137,8 @@ end}
|
||||
|
||||
Summary: Mozilla Thunderbird mail/newsgroup client
|
||||
Name: thunderbird
|
||||
Version: 140.5.0
|
||||
Release: 2%{?dist}.alma.1
|
||||
Version: 140.6.0
|
||||
Release: 1%{?dist}.alma.1
|
||||
URL: http://www.mozilla.org/projects/thunderbird/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
|
||||
@ -165,7 +165,7 @@ ExcludeArch: %{ix86}
|
||||
#Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz
|
||||
Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
|
||||
%if %{with langpacks}
|
||||
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20251111.tar.xz
|
||||
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20251209.tar.xz
|
||||
%endif
|
||||
Source2: cbindgen-vendor.tar.xz
|
||||
Source3: process-official-tarball
|
||||
@ -199,6 +199,7 @@ Patch11: rust-file-removal.patch
|
||||
Patch14: build-cargo-lock-version.patch
|
||||
Patch15: build-system-nss.patch
|
||||
Patch16: build-tb-system-nss.patch
|
||||
Patch17: build-workaround-s390x.patch
|
||||
|
||||
# -- Upstreamed patches --
|
||||
Patch51: mozilla-bmo1170092.patch
|
||||
@ -1137,6 +1138,9 @@ echo "--------------------------------------------"
|
||||
%ifarch aarch64
|
||||
%patch -P155 -p1 -b .rhbz-1354671
|
||||
%endif
|
||||
%ifarch s390x
|
||||
%patch -P17 -p1 -b .build-workaround-s390x
|
||||
%endif
|
||||
|
||||
# ---- Security patches ----
|
||||
|
||||
@ -1451,8 +1455,11 @@ echo "export STRIP=/bin/true" >> .mozconfig
|
||||
export PATH=%{_buildrootdir}/%{bundled_install_path}/bin:$PATH
|
||||
echo $PKG_CONFIG_PATH
|
||||
%endif
|
||||
|
||||
./mach build -v 2>&1 || exit 1
|
||||
%ifarch s390x
|
||||
setarch s390x -R ./mach build -v 2>&1 || exit 1
|
||||
%else
|
||||
./mach build -v 2>&1 || exit 1
|
||||
%endif
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
%install
|
||||
@ -1705,10 +1712,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#===============================================================================
|
||||
|
||||
%changelog
|
||||
* Thu Nov 20 2025 Eduard Abdullin <eabdullin@almalinux.org> - 140.5.0-2.alma.1
|
||||
* Tue Dec 23 2025 Eduard Abdullin <eabdullin@almalinux.org> - 140.6.0-1.alma.1
|
||||
- AlmaLinux changes
|
||||
- Add gcc-toolset-%{gts_version}-gcc-c++ to BR
|
||||
|
||||
* Tue Dec 9 2025 Jan Horak <jhorak@redhat.com> - 140.6.0-1
|
||||
- Update to 140.6.0 ESR
|
||||
|
||||
* Tue Nov 11 2025 Jan Horak <jhorak@redhat.com> - 140.5.0-2
|
||||
- Update to 140.5.0 ESR
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user