rpms/thunderbird
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 152.0

Browse source
This commit is contained in:
Jan Horak 2026-06-23 10:46:35 +02:00
commit b7023d43da
8 changed files with 33 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -542,3 +542,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
/thunderbird-langpacks-151.0-20260521.tar.xz
/thunderbird-151.0.1.source.tar.xz
/thunderbird-langpacks-151.0.1-20260604.tar.xz
/thunderbird-152.0.source.tar.xz
/thunderbird-langpacks-152.0-20260618.tar.xz

55
D303205.1781242667.diff
View file

@ -1,55 +0,0 @@
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1504,22 +1504,39 @@
ensure_exit_code=True,
)
with open(os.path.join(command_context.topobjdir, "buildid.h")) as fd:
_, _, buildid = fd.read().split()
- source_url = ""
- if substs.get("MOZ_INCLUDE_SOURCE_INFO"):
- repo = substs.get("MOZ_SOURCE_REPO")
- changeset = substs.get("MOZ_SOURCE_CHANGESET")
- if repo and changeset:
- source_url = f"{repo}/rev/{changeset}"
-
# FIXME: don't create this in topsrcdir
- with open(
- os.path.join(command_context.topsrcdir, "sourcestamp.txt"), "w"
- ) as fd:
- fd.write(f"{buildid}\n{source_url}")
+ sourcestamp_path = os.path.join(command_context.topsrcdir, "sourcestamp.txt")
+ if conditions.is_thunderbird(command_context):
+ comm_repo = substs.get("MOZ_COMM_SOURCE_REPO")
+ comm_changeset = substs.get("MOZ_COMM_SOURCE_CHANGESET")
+ gecko_repo = substs.get("MOZ_GECKO_SOURCE_REPO")
+ gecko_changeset = substs.get("MOZ_GECKO_SOURCE_CHANGESET")
+
+ # Thunderbird tarball builds require sourcestamp.txt to contain
+ # three lines, e.g.:
+ # 20260522210329
+ # https://hg.mozilla.org/releases/comm-esr140/rev/191059ac655733d24c4fd32c94dfe6d79af7028b
+ # https://hg.mozilla.org/releases/mozilla-esr140/rev/2e36c464a92f1942683abbed6ceb442308db5eb0
+ with open(sourcestamp_path, "w") as fd:
+ fd.write(
+ f"{buildid}\n"
+ f"{comm_repo}/rev/{comm_changeset}\n"
+ f"{gecko_repo}/rev/{gecko_changeset}\n"
+ )
+ else:
+ source_url = ""
+ if substs.get("MOZ_INCLUDE_SOURCE_INFO"):
+ repo = substs.get("MOZ_SOURCE_REPO")
+ changeset = substs.get("MOZ_SOURCE_CHANGESET")
+ if repo and changeset:
+ source_url = f"{repo}/rev/{changeset}"
+
+ with open(sourcestamp_path, "w") as fd:
+ fd.write(f"{buildid}\n{source_url}")
# this should match SOURCE_TAR in packager.mk.
archive_prefix = f"{substs['MOZ_APP_NAME']}-{substs['MOZ_APP_VERSION']}"
archive_path = os.path.join(
substs["DIST"], output or f"{archive_prefix}.tar.xz"

71
D303424.1781004200.diff
View file

@ -1,71 +0,0 @@
diff -up thunderbird-151.0.1/comm/build/moz.configure/gecko_source.configure.D303424.1781004200 thunderbird-151.0.1/comm/build/moz.configure/gecko_source.configure
--- thunderbird-151.0.1/comm/build/moz.configure/gecko_source.configure.D303424.1781004200 2026-05-23 15:31:09.000000000 +0200
+++ thunderbird-151.0.1/comm/build/moz.configure/gecko_source.configure 2026-06-11 07:55:19.312957046 +0200
@@ -47,11 +47,11 @@ def read_sourcestamp(repository):
if exists(sourcestamp_file):
try:
lines = open(sourcestamp_file).readlines()
- except:
- pass
+ except OSError:
+ lines = []
if len(lines) != 3:
- log.warn("sourcestamp.txt is corrupt!")
+ log.info("sourcestamp.txt is corrupt!")
return
if lines and lines[line2read].startswith("http"):
diff -up thunderbird-151.0.1/comm/build/source_repos.py.D303424.1781004200 thunderbird-151.0.1/comm/build/source_repos.py
--- thunderbird-151.0.1/comm/build/source_repos.py.D303424.1781004200 2026-05-23 15:31:09.000000000 +0200
+++ thunderbird-151.0.1/comm/build/source_repos.py 2026-06-11 07:48:25.166215765 +0200
@@ -2,16 +2,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-import os
import sys
import buildconfig
-sourcestamp_tmpl = """{buildid}
-{comm_repo}/rev/{comm_rev}
-{gecko_repo}/rev/{gecko_rev}
-"""
-
def mk_hg_url(repo, revision):
"""
@@ -39,18 +33,6 @@ def gen_platformini(output, platform_ini
output.write("platform.ini updated.\n")
-def gen_sourcestamp(output):
- data = dict(
- buildid=os.environ.get("MOZ_BUILD_DATE", "unknown"),
- gecko_repo=buildconfig.substs.get("MOZ_GECKO_SOURCE_REPO", None),
- gecko_rev=buildconfig.substs.get("MOZ_GECKO_SOURCE_CHANGESET", None),
- comm_repo=buildconfig.substs.get("MOZ_COMM_SOURCE_REPO", None),
- comm_rev=buildconfig.substs.get("MOZ_COMM_SOURCE_CHANGESET", None),
- )
-
- output.write(sourcestamp_tmpl.format(**data))
-
-
def source_repo_header(output):
"""
Appends the Gecko source repository information to source-repo.h
diff -up thunderbird-151.0.1/comm/mail/installer/Makefile.in.D303424.1781004200 thunderbird-151.0.1/comm/mail/installer/Makefile.in
--- thunderbird-151.0.1/comm/mail/installer/Makefile.in.D303424.1781004200 2026-05-23 15:31:10.000000000 +0200
+++ thunderbird-151.0.1/comm/mail/installer/Makefile.in 2026-06-11 07:48:25.166306205 +0200
@@ -206,10 +206,6 @@ package-compare:: $(MOZ_PKG_MANIFEST)
-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
-# Overwrite the one made by Firefox with our own.
-make-sourcestamp-file::
- $(PYTHON3) $(commtopsrcdir)/build/source_repos.py gen_sourcestamp > $(MOZ_SOURCESTAMP_FILE)
-
ifdef ENABLE_WEBDRIVER
DEFINES += -DENABLE_WEBDRIVER=1
endif

12
build-botan-target.patch
View file

@ -1,12 +0,0 @@
diff -up thunderbird-147.0/comm/third_party/openpgp.configure.build-botan thunderbird-147.0/comm/third_party/openpgp.configure
--- thunderbird-147.0/comm/third_party/openpgp.configure.build-botan 2026-01-08 22:45:29.000000000 +0100
+++ thunderbird-147.0/comm/third_party/openpgp.configure 2026-01-14 15:43:34.946025500 +0100
@@ -348,7 +348,7 @@ with only_when(in_tree_librnp):
botan_flags = [
"--cc-bin={}".format(cxx_compiler.compiler),
- "--cc-abi-flags={}".format(" ".join(abi_flags)),
+ #"--cc-abi-flags={}".format(" ".join(abi_flags)),
"--cpu={}".format(target.cpu),
"--os={}".format(botan_os),
"--with-build-dir={}".format(botan_objdir),

72
build-c11-threads-avail.patch
View file

File diff suppressed because one or more lines are too long

50
mozilla-1170092.patch
View file

@ -1,8 +1,8 @@
diff -up firefox-140.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.mozilla-bmo1170092 firefox-140.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
--- firefox-140.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.mozilla-bmo1170092 2025-06-02 15:26:44.000000000 +0200
+++ firefox-140.0/extensions/pref/autoconfig/src/nsReadConfig.cpp 2025-06-04 13:24:00.344728697 +0200
@@ -263,8 +263,20 @@ nsresult nsReadConfig::openAndEvaluateJS
if (NS_FAILED(rv)) return rv;
diff -up thunderbird-152.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092-etc-conf thunderbird-152.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
--- thunderbird-152.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092-etc-conf 2026-06-12 19:58:03.000000000 +0200
+++ thunderbird-152.0/extensions/pref/autoconfig/src/nsReadConfig.cpp 2026-06-22 17:56:54.068493301 +0200
@@ -268,8 +268,20 @@ nsresult nsReadConfig::openAndEvaluateJS
#endif // defined(MOZ_WIDGET_GTK)
rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
- if (NS_FAILED(rv)) return rv;
@ -11,22 +11,22 @@ diff -up firefox-140.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.mozilla-b
+ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
+ getter_AddRefs(jsFile));
+ NS_ENSURE_SUCCESS(rv, rv);
+
+ rv = jsFile->AppendNative(nsLiteralCString("pref"));
+ NS_ENSURE_SUCCESS(rv, rv);
+ rv = jsFile->AppendNative(nsDependentCString(aFileName));
+ NS_ENSURE_SUCCESS(rv, rv);
+
+ rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
+ NS_ENSURE_SUCCESS(rv, rv);
+ }
} else {
nsAutoCString location("resource://gre/defaults/autoconfig/");
location += aFileName;
diff -up firefox-140.0/modules/libpref/Preferences.cpp.mozilla-bmo1170092 firefox-140.0/modules/libpref/Preferences.cpp
--- firefox-140.0/modules/libpref/Preferences.cpp.mozilla-bmo1170092 2025-06-02 15:26:51.000000000 +0200
+++ firefox-140.0/modules/libpref/Preferences.cpp 2025-06-04 13:24:00.345430064 +0200
@@ -4914,6 +4914,9 @@ nsresult Preferences::InitInitialObjects
diff -up thunderbird-152.0/modules/libpref/Preferences.cpp.1170092-etc-conf thunderbird-152.0/modules/libpref/Preferences.cpp
--- thunderbird-152.0/modules/libpref/Preferences.cpp.1170092-etc-conf 2026-06-12 19:58:10.000000000 +0200
+++ thunderbird-152.0/modules/libpref/Preferences.cpp 2026-06-22 17:56:54.069017777 +0200
@@ -5157,6 +5157,9 @@ nsresult Preferences::InitInitialObjects
//
// Thus, in the omni.jar case, we always load app-specific default
// preferences from omni.jar, whether or not `$app == $gre`.
@ -36,18 +36,20 @@ diff -up firefox-140.0/modules/libpref/Preferences.cpp.mozilla-bmo1170092 firefo
nsresult rv = NS_ERROR_FAILURE;
UniquePtr<nsZipFind> find;
diff -up firefox-140.0/toolkit/xre/nsXREDirProvider.cpp.mozilla-bmo1170092 firefox-140.0/toolkit/xre/nsXREDirProvider.cpp
--- firefox-140.0/toolkit/xre/nsXREDirProvider.cpp.mozilla-bmo1170092 2025-06-02 15:27:00.000000000 +0200
+++ firefox-140.0/toolkit/xre/nsXREDirProvider.cpp 2025-06-04 15:44:09.413562326 +0200
@@ -76,6 +76,7 @@
diff -up thunderbird-152.0/toolkit/xre/nsXREDirProvider.cpp.1170092-etc-conf thunderbird-152.0/toolkit/xre/nsXREDirProvider.cpp
--- thunderbird-152.0/toolkit/xre/nsXREDirProvider.cpp.1170092-etc-conf 2026-06-12 19:58:23.000000000 +0200
+++ thunderbird-152.0/toolkit/xre/nsXREDirProvider.cpp 2026-06-22 19:47:37.170112709 +0200
@@ -81,6 +81,9 @@
# include <sys/stat.h>
# include <unistd.h>
#endif
#ifdef XP_UNIX
# include <ctype.h>
+#ifdef XP_UNIX
+# include "nsIXULAppInfo.h"
#endif
+#endif
#ifdef XP_IOS
# include "UIKitDirProvider.h"
@@ -462,6 +463,17 @@ nsXREDirProvider::GetFile(const char* aP
#endif
@@ -518,6 +521,17 @@ nsXREDirProvider::GetFile(const char* aP
rv = file->AppendNative(nsLiteralCString(PREF_OVERRIDE_DIRNAME));
NS_ENSURE_SUCCESS(rv, rv);
rv = EnsureDirectoryExists(file);
@ -65,7 +67,7 @@ diff -up firefox-140.0/toolkit/xre/nsXREDirProvider.cpp.mozilla-bmo1170092 firef
} else {
// We don't know anything about this property. Fail without warning, because
// otherwise we'll get too much warning spam due to
@@ -518,6 +530,16 @@ nsXREDirProvider::GetFiles(const char* a
@@ -574,6 +588,16 @@ nsXREDirProvider::GetFiles(const char* a
}
#endif
@ -82,10 +84,10 @@ diff -up firefox-140.0/toolkit/xre/nsXREDirProvider.cpp.mozilla-bmo1170092 firef
rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
} else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
// NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
diff -up firefox-140.0/xpcom/io/nsAppDirectoryServiceDefs.h.mozilla-bmo1170092 firefox-140.0/xpcom/io/nsAppDirectoryServiceDefs.h
--- firefox-140.0/xpcom/io/nsAppDirectoryServiceDefs.h.mozilla-bmo1170092 2025-06-02 15:27:01.000000000 +0200
+++ firefox-140.0/xpcom/io/nsAppDirectoryServiceDefs.h 2025-06-04 13:24:00.346423861 +0200
@@ -58,6 +58,7 @@
diff -up thunderbird-152.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092-etc-conf thunderbird-152.0/xpcom/io/nsAppDirectoryServiceDefs.h
--- thunderbird-152.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092-etc-conf 2026-06-12 19:58:24.000000000 +0200
+++ thunderbird-152.0/xpcom/io/nsAppDirectoryServiceDefs.h 2026-06-22 17:56:54.071183188 +0200
@@ -56,6 +56,7 @@
#define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
#define NS_APP_PREFS_OVERRIDE_DIR \
"PrefDOverride" // Directory for per-profile defaults

4
sources
View file

@ -1,3 +1,3 @@
SHA512 (cbindgen-vendor.tar.xz) = 4127d3060577284eea29d697ccc2394742674f6094b7f497a95a0c3b8aa9e0494b720de8858ad31d4a6b0cd1b9586454f3c52c8088163c2709883d882e0136db
SHA512 (thunderbird-151.0.1.source.tar.xz) = a09c1e18faa8d7fdccf39e905542c21e817230e68c7cc6050beec048d0fec0f8eb92e51278d2ccd8d8cfa842762662235517e20238b555a4ad48ee5648dc3589
SHA512 (thunderbird-langpacks-151.0.1-20260604.tar.xz) = b9af21980339190d3234efbfa487dd242c28145cdb24de8ec16809510bdc6ed3f576858c391ae5fff81fb7205542619de4c4a8f00dea4deda454147e6008fd6a
SHA512 (thunderbird-152.0.source.tar.xz) = 51b950af634e7c7dfb7c043d69f925ed6d50d4c44341761e7e3ef02d5db28d2c539cd8d9286195e3facf84869f57b12a58760105b5195c449b4e1e4c9b6200d2
SHA512 (thunderbird-langpacks-152.0-20260618.tar.xz) = 534be3c46ff7769bff1a0b6f95c38702414bc4fede9adfc397b24bb8b8b9827889044bdebd834cd8ae3c2ff29b4b25950d2999b3d83f35636a3dc172be2870d6

16
thunderbird.spec
View file

@ -91,13 +91,13 @@ ExcludeArch: armv7hl
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 151.0.1
Version: 152.0
Release: %autorelease
URL: http://www.mozilla.org/projects/thunderbird/
License: MPL-2.0 OR GPL-2.0-or-later OR LGPL-2.0-or-later
Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20260604.tar.xz
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20260618.tar.xz
%endif
Source3: get-calendar-langpacks.sh
Source4: cbindgen-vendor.tar.xz
@ -121,11 +121,6 @@ Patch425: build-disable-elfhack.patch
# Build patches
Patch32: build-rust-ppc64le.patch
Patch35: build-ppc-jit.patch
Patch36: build-botan-target.patch
Patch37: build-c11-threads-avail.patch
# Fix for "sourcestamp.txt is corrupt"
Patch38: D303424.1781004200.diff
Patch39: D303205.1781242667.diff
# Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
Patch44: build-arm-libopus.patch
@ -142,7 +137,7 @@ Patch83: build-seccomp.patch
# Upstream patches
Patch402: mozilla-526293.patch
Patch406: mozilla-1170092.patch
Patch406: mozilla-1170092.patch
# https://bugzilla.mozilla.org/show_bug.cgi?id=1998188
# this is the Firefox patch, manually rediffed against 146.0.1
# https://bugzilla.mozilla.org/show_bug.cgi?id=2008377
@ -286,11 +281,6 @@ debug %{name}, you want to install %{name}-debuginfo instead.
# Build patches
%patch -P36 -p1 -b .build-botan
%patch -P37 -p1 -b .build-c11-threads-avail
%patch -P38 -p1 -b .D303424.1781004200
%patch -P39 -p1 -b .D303205.1781242667
%patch -P 418 -p1 -b .mozbz-1512162
%patch -P 402 -p1 -b .526293
%patch -P 406 -p1 -b .1170092-etc-conf