public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/thunderbird] f43: Fixed build failures
@ 2026-06-11 11:05 Jan Horak
0 siblings, 0 replies; 2+ messages in thread
From: Jan Horak @ 2026-06-11 11:05 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/thunderbird
Branch : f43
Commit : 8b54e0c7cfb7d7ea57367856b7a0a577118b80ff
Author : Jan Horak <jhorak@redhat.com>
Date : 2026-06-11T09:37:26+02:00
Stats : +7/-0 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/thunderbird/c/8b54e0c7cfb7d7ea57367856b7a0a577118b80ff?branch=f43
Log:
Fixed build failures
[skip changelog]
---
diff --git a/thunderbird.spec b/thunderbird.spec
index 6b1b3e6..2b34108 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -123,6 +123,10 @@ 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
Patch71: 0001-GLIBCXX-fix-for-GCC-12.patch
@@ -284,6 +288,9 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%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
^ permalink raw reply related [flat|nested] 2+ messages in thread* [rpms/thunderbird] f43: Fixed build failures
@ 2026-06-11 11:05 Jan Horak
0 siblings, 0 replies; 2+ messages in thread
From: Jan Horak @ 2026-06-11 11:05 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/thunderbird
Branch : f43
Commit : 8236ea7e6c911c31b8686fe8f89a077e358f7a55
Author : Jan Horak <jhorak@redhat.com>
Date : 2026-06-11T09:36:57+02:00
Stats : +126/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/thunderbird/c/8236ea7e6c911c31b8686fe8f89a077e358f7a55?branch=f43
Log:
Fixed build failures
[skip changelog]
---
diff --git a/D303205.1781242667.diff b/D303205.1781242667.diff
new file mode 100644
index 0000000..f4b0743
--- /dev/null
+++ b/D303205.1781242667.diff
@@ -0,0 +1,55 @@
+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"
+
diff --git a/D303424.1781004200.diff b/D303424.1781004200.diff
new file mode 100644
index 0000000..2abbd65
--- /dev/null
+++ b/D303424.1781004200.diff
@@ -0,0 +1,71 @@
+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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-06-11 11:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-11 11:05 [rpms/thunderbird] f43: Fixed build failures Jan Horak
-- strict thread matches above, loose matches on Subject: below --
2026-06-11 11:05 Jan Horak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox