Rebase to 102.1.0

.gitignore

@@ -365,3 +365,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-langpacks-91.11.0-20220628.tar.xz
 /thunderbird-91.12.0.source.tar.xz
 /thunderbird-langpacks-91.12.0-20220725.tar.xz
+/thunderbird-102.1.0.source.tar.xz
+/thunderbird-langpacks-102.1.0-20220803.tar.xz

gcc12-D139088.patch

@@ -1,13 +0,0 @@
-diff --git a/gfx/wr/swgl/src/gl.cc b/gfx/wr/swgl/src/gl.cc
---- a/gfx/wr/swgl/src/gl.cc
-+++ b/gfx/wr/swgl/src/gl.cc
-@@ -82,7 +82,7 @@
- 
- #define FALLTHROUGH [[fallthrough]]
- 
--#ifdef MOZILLA_CLIENT
-+#if defined(MOZILLA_CLIENT) && defined(MOZ_CLANG_PLUGIN)
- #  define IMPLICIT __attribute__((annotate("moz_implicit")))
- #else
- #  define IMPLICIT
-

python3.11-open-U.patch

@@ -1,102 +0,0 @@
---- thunderbird-91.11.0/dom/base/usecounters.py.python-open-U	2022-06-28 04:37:00.000000000 +0200
-+++ thunderbird-91.11.0/dom/base/usecounters.py	2022-07-11 19:17:46.266517761 +0200
-@@ -8,7 +8,7 @@ import re
- 
- def read_conf(conf_filename):
-     # Can't read/write from a single StringIO, so make a new one for reading.
--    stream = open(conf_filename, "rU")
-+    stream = open(conf_filename, "r")
- 
-     def parse_counters(stream):
-         for line_num, line in enumerate(stream):
---- thunderbird-91.11.0/python/mozbuild/mozbuild/action/process_define_files.py.python-open-U	2022-06-28 04:37:39.000000000 +0200
-+++ thunderbird-91.11.0/python/mozbuild/mozbuild/action/process_define_files.py	2022-07-11 19:18:24.056417112 +0200
-@@ -36,7 +36,7 @@ def process_define_file(output, input):
-     ) and not config.substs.get("JS_STANDALONE"):
-         config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
- 
--    with open(path, "rU") as input:
-+    with open(path, "r") as input:
-         r = re.compile(
-             "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
-         )
---- thunderbird-91.11.0/python/mozbuild/mozbuild/backend/base.py.python-open-U	2022-06-28 04:37:39.000000000 +0200
-+++ thunderbird-91.11.0/python/mozbuild/mozbuild/backend/base.py	2022-07-11 19:18:34.165390187 +0200
-@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin):
-         return status
- 
-     @contextmanager
--    def _write_file(self, path=None, fh=None, readmode="rU"):
-+    def _write_file(self, path=None, fh=None, readmode="r"):
-         """Context manager to write a file.
- 
-         This is a glorified wrapper around FileAvoidWrite with integration to
---- thunderbird-91.11.0/python/mozbuild/mozbuild/preprocessor.py.python-open-U	2022-06-28 04:37:20.000000000 +0200
-+++ thunderbird-91.11.0/python/mozbuild/mozbuild/preprocessor.py	2022-07-11 19:19:30.677239685 +0200
-@@ -531,7 +531,7 @@ class Preprocessor:
- 
-         if args:
-             for f in args:
--                with io.open(f, "rU", encoding="utf-8") as input:
-+                with io.open(f, "r", encoding="utf-8") as input:
-                     self.processFile(input=input, output=out)
-             if depfile:
-                 mk = Makefile()
-@@ -860,7 +860,7 @@ class Preprocessor:
-                     args = self.applyFilters(args)
-                 if not os.path.isabs(args):
-                     args = os.path.join(self.curdir, args)
--                args = io.open(args, "rU", encoding="utf-8")
-+                args = io.open(args, "r", encoding="utf-8")
-             except Preprocessor.Error:
-                 raise
-             except Exception:
-@@ -914,7 +914,7 @@ class Preprocessor:
- def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
-     pp = Preprocessor(defines=defines, marker=marker)
-     for f in includes:
--        with io.open(f, "rU", encoding="utf-8") as input:
-+        with io.open(f, "r", encoding="utf-8") as input:
-             pp.processFile(input=input, output=output)
-     return pp.includes
- 
---- thunderbird-91.11.0/python/mozbuild/mozbuild/util.py.python-open-U	2022-06-28 04:37:40.000000000 +0200
-+++ thunderbird-91.11.0/python/mozbuild/mozbuild/util.py	2022-07-11 19:19:19.903268374 +0200
-@@ -225,7 +225,7 @@ class FileAvoidWrite(BytesIO):
-     still occur, as well as diff capture if requested.
-     """
- 
--    def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
-+    def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
-         BytesIO.__init__(self)
-         self.name = filename
-         assert type(capture_diff) == bool
-@@ -1447,7 +1447,7 @@ def patch_main():
- 
-         def my_get_command_line():
-             with open(
--                os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "rU"
-+                os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "r"
-             ) as fork_file:
-                 fork_code = fork_file.read()
-             # Add our relevant globals.
---- thunderbird-91.11.0/python/mozbuild/mozpack/files.py.python-open-U	2022-06-28 04:37:40.000000000 +0200
-+++ thunderbird-91.11.0/python/mozbuild/mozpack/files.py	2022-07-11 19:19:40.372213866 +0200
-@@ -574,7 +574,7 @@ class PreprocessedFile(BaseFile):
-         pp = Preprocessor(defines=self.defines, marker=self.marker)
-         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
- 
--        with _open(self.path, "rU") as input:
-+        with _open(self.path, "r") as input:
-             with _open(os.devnull, "w") as output:
-                 pp.processFile(input=input, output=output)
- 
-@@ -631,7 +631,7 @@ class PreprocessedFile(BaseFile):
-         pp = Preprocessor(defines=self.defines, marker=self.marker)
-         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
- 
--        with _open(self.path, "rU") as input:
-+        with _open(self.path, "r") as input:
-             pp.processFile(input=input, output=dest, depfile=deps_out)
- 
-         dest.close()

sources

@@ -1,3 +1,5 @@
-SHA512 (cbindgen-vendor.tar.xz) = 105a7d93d63920d8c232421a29f6330c171343d27807feaeadb1737374e5cf1d48916cb6e9ce04773dd81bb3c52a6f5cef12e633b0922cb9f91ca99acc9e4b78
 SHA512 (thunderbird-91.12.0.source.tar.xz) = 1c0200a84ccc4124127d472713d72c4ff7ece8d61ad120d5c45c732a3ab4f86a2edfea23a8bf26e4739d24956654aec30e7bc59a28af17fbbf10f3d67466649a
 SHA512 (thunderbird-langpacks-91.12.0-20220725.tar.xz) = ba2818d79cf70e27efba829243da910324ba1ebfdc07fc22fe348992b090a016dadacc9ab0a4543de1fc3b4881ce083b25d01fa9282d965e5ce7b16c3f4fc1f0
+SHA512 (thunderbird-102.1.0.source.tar.xz) = 6b7818a7406dc7ff5b81d0428d0425aa9f3149617a3216d7846a5bf0ab7475556163a1c19da9882314db70f3d31f12733608079b899e87c23a79ed924e60351a
+SHA512 (thunderbird-langpacks-102.1.0-20220803.tar.xz) = 804d03fd7b4fe0cc5c9d756825fd36f9f0102141e2cb4b3b3a9c1c102b443476e7e9c21c9fee5b00d5ed6b8c76373159f9eb70442d27f3ed1148266779ac7396
+SHA512 (cbindgen-vendor.tar.xz) = d681ca855f3779553b4a452f9dc1e3acea6253b7ef33a65948ab2d32d9848e8c06f0b3f3504ef237d6b9adb4813bdad990f7a79fa9f89333ce0d4e8da7e12d94

thunderbird.spec

@@ -99,13 +99,13 @@ ExcludeArch: s390x
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        91.12.0
+Version:        102.1.0
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 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}-20220725.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20220803.tar.xz
 %endif
 Source3:        get-calendar-langpacks.sh
 Source4:        cbindgen-vendor.tar.xz
@@ -129,10 +129,8 @@ Patch418:       mozilla-1512162.patch
 #Patch419:       bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch
 Patch103:       rhbz-1219542-s390-build.patch
 # gcc 12 build fix patches
-Patch421:       gcc12-D139088.patch
 Patch422:       0001-GLIBCXX-fix-for-GCC-12.patch
 # Python 3.11 "ValueError: invalid mode: 'rU'"; 'U' is deprecated since Python 3 and default, error with Python 3.11
-Patch423:       python3.11-open-U.patch
 # Python 3.11 "Invalid regular expression for rule '...'. global flags not at the start of the expression at position ...
 Patch424:       python3.11-regex-inline-flags.patch
 
@@ -312,9 +310,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 pushd comm
 popd
 
-%patch421 -p1 -b .gcc12-D139088
 %patch422 -p1 -b .0001-GLIBCXX-fix-for-GCC-12
-%patch423 -p1 -b .python3.11-open-U
 %patch424 -p1 -b .python3.11-regex-inline-flags
 
 %patch501 -p1 -b .expat-CVE-2022-25235
@@ -751,6 +747,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Wed Aug  3 2022 Jan Horak <jhorak@redhat.com> - 102.1.0-1
+- Update to 102.1.0
+
 * Thu Jul 28 2022 Eike Rathke <erack@redhat.com> - 91.12.0-1
 - Update to 91.12.0