From 552fdb7925569e0de98a3fb695677d64ba73bd72 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Feb 17 2023 12:46:59 +0000 Subject: Update to 102.8.0 --- diff --git a/.gitignore b/.gitignore index 94b27bb..f4b2165 100644 --- a/.gitignore +++ b/.gitignore @@ -390,3 +390,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2 /thunderbird-langpacks-102.7.1-20230131.tar.xz /thunderbird-102.7.2.source.tar.xz /thunderbird-langpacks-102.7.2-20230208.tar.xz +/thunderbird-102.8.0.source.tar.xz +/thunderbird-langpacks-102.8.0-20230215.tar.xz diff --git a/D147721-python-ru.diff b/D147721-python-ru.diff deleted file mode 100644 index d935f59..0000000 --- a/D147721-python-ru.diff +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py ---- a/dom/base/usecounters.py -+++ b/dom/base/usecounters.py -@@ -6,11 +6,11 @@ - 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): - line = line.rstrip("\n") - if not line or line.startswith("//"): -diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py ---- a/python/mozbuild/mozbuild/action/process_define_files.py -+++ b/python/mozbuild/mozbuild/action/process_define_files.py -@@ -34,11 +34,11 @@ - if mozpath.basedir( - path, [mozpath.join(topsrcdir, "js/src")] - ) 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[a-z]+)(?:\s+(?P\S+)(?:\s+(?P\S+))?)?", re.U - ) - for l in input: - m = r.match(l) -diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py ---- a/python/mozbuild/mozbuild/backend/base.py -+++ b/python/mozbuild/mozbuild/backend/base.py -@@ -270,11 +270,11 @@ - self._write_purgecaches(config) - - 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 - update the summary data on this instance. - -diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py ---- a/python/mozbuild/mozbuild/preprocessor.py -+++ b/python/mozbuild/mozbuild/preprocessor.py -@@ -529,11 +529,11 @@ - ) - depfile = get_output_file(options.depend) - - 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() - mk.create_rule([six.ensure_text(options.output)]).add_dependencies( - self.includes -@@ -858,11 +858,11 @@ - args = _to_text(args) - if filters: - 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: - raise Preprocessor.Error(self, "FILE_NOT_FOUND", _to_text(args)) - self.checkLineNumbers = bool( -@@ -912,11 +912,11 @@ - - - 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 - - - # Keep this module independently executable. -diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py ---- a/python/mozbuild/mozbuild/util.py -+++ b/python/mozbuild/mozbuild/util.py -@@ -234,11 +234,11 @@ - Additionally, there is dry run mode where the file is not actually written - out, but reports whether the file was existing and would have been updated - 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 - assert type(dry_run) == bool - assert "r" in readmode -diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py ---- a/python/mozbuild/mozpack/files.py -+++ b/python/mozbuild/mozpack/files.py -@@ -552,11 +552,11 @@ - - def inputs(self): - 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) - - # This always yields at least self.path. - return pp.includes -@@ -609,11 +609,11 @@ - if self.depfile: - deps_out = FileAvoidWrite(self.depfile) - 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() - if self.depfile: - deps_out.close() - diff --git a/python3.11-regex-inline-flags.patch b/python3.11-regex-inline-flags.patch deleted file mode 100644 index 39481ec..0000000 --- a/python3.11-regex-inline-flags.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- thunderbird-91.11.0/xpcom/idl-parser/xpidl/xpidl.py.python-inline-flags 2022-06-28 04:39:56.000000000 +0200 -+++ thunderbird-91.11.0/xpcom/idl-parser/xpidl/xpidl.py 2022-07-11 21:55:05.287553042 +0200 -@@ -1563,13 +1563,13 @@ class IDLParser(object): - t_ignore = " \t" - - def t_multilinecomment(self, t): -- r"/\*(?s).*?\*/" -+ r"/\*(?s:.*?)\*/" - t.lexer.lineno += t.value.count("\n") - if t.value.startswith("/**"): - self._doccomments.append(t.value) - - def t_singlelinecomment(self, t): -- r"(?m)//.*?$" -+ r"(?m://.*?$)" - - def t_IID(self, t): - return t -@@ -1582,7 +1582,7 @@ class IDLParser(object): - return t - - def t_LCDATA(self, t): -- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P.*?\n?)%\}[ ]*(C\+\+)?" -+ r"(?s:%\{[ ]*C\+\+[ ]*\n(?P.*?\n?)%\}[ ]*(C\+\+)?)" - t.type = "CDATA" - t.value = t.lexer.lexmatch.group("cdata") - t.lexer.lineno += t.value.count("\n") diff --git a/sources b/sources index 7bd8794..110ca13 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (cbindgen-vendor.tar.xz) = 590e27b6c093a5c1bd839ca39c68537097d0849087a4a385ee6d7b180e9ceadbbb8974fa997f5f75af03e2c243a2f232d0d4c4c46e253ea464521b76c6886067 -SHA512 (thunderbird-102.7.2.source.tar.xz) = 7371079d59cceb47fdd0e9661f79eae7510ab0f5bf8e80c21952dfb5fed3db72279a4ac9d3a3de3617194fb36a9420ae814a69ee19a93ba242d2aa2b921e3010 -SHA512 (thunderbird-langpacks-102.7.2-20230208.tar.xz) = 398beb434739c096cb47cbadcd3701545cf31c49844781331692104542e12cccc1e8623bad954a44c1f03f5021e898c07fcf7631448f641fc6247ba765dd62ac +SHA512 (thunderbird-102.8.0.source.tar.xz) = 2431eb8799184b261609c96bed3c9368bec9035a831aa5f744fa89e48aedb130385b268dd90f03bbddfec449dc3e5fad1b5f8727fe9e11e1d1f123a81b97ddf8 +SHA512 (thunderbird-langpacks-102.8.0-20230215.tar.xz) = c85933b2c2f90ad0c1584c740fa7ce0657b023a80968e0924eaa34599b3167161e6eb493645fc4ea84290f7532b4b30a229bbb3e0691a1147eecd27456a7abdc diff --git a/thunderbird.spec b/thunderbird.spec index 3aaccc3..ebe4dda 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -99,7 +99,7 @@ ExcludeArch: s390x Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 102.7.2 +Version: 102.8.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPL-2.0 OR GPL-2.0-or-later OR LGPL-2.0-or-later @@ -132,7 +132,6 @@ Patch103: rhbz-1219542-s390-build.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 # 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 Patch425: build-disable-elfhack.patch Patch426: gcc13-header-dependencies.patch @@ -144,7 +143,6 @@ Patch304: mozilla-1245783.patch # Upstream patches Patch402: mozilla-526293.patch Patch406: mozilla-1170092.patch -Patch407: D147721-python-ru.diff Patch408: D165150.diff Patch409: D165152.diff @@ -318,7 +316,6 @@ debug %{name}, you want to install %{name}-debuginfo instead. %patch402 -p1 -b .526293 %patch406 -p1 -b .1170092-etc-conf -%patch407 -p1 -b .D147721-python-ru.diff %patch408 -p1 -b .D165150 %patch409 -p1 -b .D165152 @@ -326,7 +323,6 @@ pushd comm popd %patch422 -p1 -b .0001-GLIBCXX-fix-for-GCC-12 -%patch424 -p1 -b .python3.11-regex-inline-flags %patch426 -p1 -b .gcc13-header-dependencies %patch501 -p1 -b .expat-CVE-2022-25235 @@ -763,6 +759,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Fri Feb 17 2023 Eike Rathke - 102.8.0-1 +- Update to 102.8.0 + * Wed Feb 08 2023 Eike Rathke - 102.7.2-1 - Update to 102.7.2