rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use python3.11 instead of python3.12

Browse Source
This commit is contained in:
Jan Horak 2023-07-27 12:41:17 +02:00
parent 28f70df4a7
commit a5dc8a324f
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build-python312.patch
View File

@ -1,12 +0,0 @@
diff -up thunderbird-115.0.1/mach.python312 thunderbird-115.0.1/mach
--- thunderbird-115.0.1/mach.python312 2023-07-26 14:30:25.336532252 +0200
+++ thunderbird-115.0.1/mach 2023-07-26 14:31:19.056512905 +0200
@@ -67,7 +67,7 @@ def try_alternate_python3_executables(ar
def main(args):
# Ensure we are running Python 3.7+. We run this check as soon as
# possible to avoid a cryptic import/usage error.
- if sys.version_info < MIN_PYTHON_VERSION:
+ if sys.version_info < MIN_PYTHON_VERSION or sys.version_info > MAX_PYTHON_VERSION_TO_CONSIDER:
print(f"Python {MIN_PYTHON_VERSION[0]}.{MIN_PYTHON_VERSION[1]}+ is required to run mach.")
print("You are running Mach with Python {0}".format(platform.python_version()))
try_alternate_python3_executables(args)

5
thunderbird.spec
View File

@ -109,7 +109,6 @@ Patch103: rhbz-1219542-s390-build.patch
Patch422: 0001-GLIBCXX-fix-for-GCC-12.patch Patch422: 0001-GLIBCXX-fix-for-GCC-12.patch
Patch425: build-disable-elfhack.patch Patch425: build-disable-elfhack.patch
Patch426: build-rnp.patch Patch426: build-rnp.patch
Patch427: build-python312.patch
# PPC fix # PPC fix
Patch304: mozilla-1245783.patch Patch304: mozilla-1245783.patch
@ -279,8 +278,6 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%patch -P 425 -p1 -b .build-disable-elfhack %patch -P 425 -p1 -b .build-disable-elfhack
%endif %endif
%patch -P 426 -p1 -b .build-rnp %patch -P 426 -p1 -b .build-rnp
# python3.12 is not supported yet
%patch -P 427 -p1 -b .build-python312
# most likely fixed # most likely fixed
#%patch -P 419 -p1 -b .bindgen #%patch -P 419 -p1 -b .bindgen
@ -522,6 +519,8 @@ MOZ_SMP_FLAGS=-j1
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export STRIP=/bin/true export STRIP=/bin/true
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
#Use python 3.11 for mach
sed -i -e 's|#!/usr/bin/env python3|#!/usr/bin/env python3.11|' mach
./mach build -v ./mach build -v
# create debuginfo for crash-stats.mozilla.com # create debuginfo for crash-stats.mozilla.com