From nobody Wed Nov 16 22:23:24 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NCHcr3fCyz4hD74; Wed, 16 Nov 2022 22:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NCHcr30myz43lC; Wed, 16 Nov 2022 22:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668637404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+Azb63nIhP308JVe+J9hrael1BwlA5sN08aBlA4jc0=; b=Ot6jNGPuVAlE0dsHc5ILfmdjm2jp6gDBIGG3RzjEt0XUgrQCOX7AEnSie/dEkctre9vw9I 99KctP00iL/ptc8TX4sYGQaYgTYlMAN33dvpF2+6A7rfdgkcHFzL9yGn/Bijxry4Na91ae zDuTkxLi3uxXfpOHVoFPLhWWg8aNNvC5BsLKhblBKXPCBlRwmnw4jEAKDVVr5/yc7KjMnq DkMK9LE2fFEmnWR5HPORTMTX6qhdydblagGub9Gjc1fAtShgXGAco305iaDflrSdmv2+9t t+iiqRrVcUBZ5Tn8jc6scvoXzQBytwmghvTPqgIye3Exh9puESsuQyETgOSoTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668637404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+Azb63nIhP308JVe+J9hrael1BwlA5sN08aBlA4jc0=; b=EogQwqKmZ8x2hLIIX5BbvMp/OZG5jlxP8HjLkyOm1bDT89sRXUEPO7rvKJ+HGXEAQct6ox SqulyWFNV75++CuIWZR9YDPX9sAWIDM6EGR3gVFEAyxSNcFiAoM/xE89xbdvKzMCKKY32f 7eEFaNFafKxs5i6MB8BA2RIv+qGkJNMxS7CUoUKZRxtO31pGRui8c4AdjCJb/rCfyWMi5S xPvaA8yAei/y2MQY052h8mlkzgvoYDmB3Xq0aZ5wmjYlz7UHTfnxFucROXpZtY57h4mpLv N1ky6WbiAjBv2Cdm5FXjmgzdlsOAjxv6D/4StcTgKb4Xh2+35OqbmipdA5OUcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668637404; a=rsa-sha256; cv=none; b=Uk6xPo4pIv9BwzA/N66rYVIB9wAaoEkaPBGJrI5yzhqa0dfy9jXQnh6GoVPoaLM+NTW6VD RybPoSc/6ioxs2Y3BqEdSmOQi3beihT60nDyrkytYpeChgChd/NuJ6RNYkxXXMrLkxoz6K PGy7dcxzb9t2Uzhg1TL0spmYDXie7zfpkus4FYKpEBmweuMbPMT5UiI0ZcvK6LExBRKP7O Y5FK8JyWnlc6QSdsCxNVOdU+yXg5CG58M6qf5vnYLlW+dhywGBmqlD+Ej+T68s9d1v3YvZ lP9WFk6zONcYZf3rKpfQgOlyx6e4CQv4eI9rB5me4hvxdwpONodwVI/dUt9gug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NCHcr1lHZzJrt; Wed, 16 Nov 2022 22:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AGMNOMa076774; Wed, 16 Nov 2022 22:23:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AGMNOln076773; Wed, 16 Nov 2022 22:23:24 GMT (envelope-from git) Date: Wed, 16 Nov 2022 22:23:24 GMT Message-Id: <202211162223.2AGMNOln076773@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 0b3ec4bd7b7a - main - Mk/bsd.gecko.mk: release python limitation List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b3ec4bd7b7a21467fb1f0d2ee6e9699947b811d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b3ec4bd7b7a21467fb1f0d2ee6e9699947b811d commit 0b3ec4bd7b7a21467fb1f0d2ee6e9699947b811d Author: Christoph Moench-Tegeder AuthorDate: 2022-11-16 22:21:55 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-11-16 22:21:55 +0000 Mk/bsd.gecko.mk: release python limitation upstream patch should allow building with newer pythons, while the old python still works --- Mk/bsd.gecko.mk | 2 +- mail/thunderbird/files/patch-bug1799982 | 60 +++++++++++++++++++++++++++++++++ www/firefox-esr/files/patch-bug1799982 | 60 +++++++++++++++++++++++++++++++++ www/firefox/files/patch-bug1799982 | 60 +++++++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index c0e9e999b3b5..4e2a77c5107c 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -61,7 +61,7 @@ MOZILLA_VER?= ${PORTVERSION} MOZILLA_BIN?= ${PORTNAME}-bin MOZILLA_EXEC_NAME?=${MOZILLA} USES+= compiler:c++17-lang cpe gl gmake gnome iconv localbase perl5 pkgconfig \ - python:3.6-3.10,build desktop-file-utils + python:3.6+,build desktop-file-utils CPE_VENDOR?=mozilla USE_GL= gl USE_GNOME= cairo gdkpixbuf2 gtk30 diff --git a/mail/thunderbird/files/patch-bug1799982 b/mail/thunderbird/files/patch-bug1799982 new file mode 100644 index 000000000000..dac77d73390b --- /dev/null +++ b/mail/thunderbird/files/patch-bug1799982 @@ -0,0 +1,60 @@ +Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers,kmag + +Apparently the use of these is being turned into an error in Python 3.11. +Fortunately, our uses appears to be rather trivial. + +For t_multilinecomment and t_LCDATA, I dropped the (?s) flag and just +replaced the one use of . with (\n|.). (?s) means DOTALL, which means +that dot includes any character, including a newline. Otherwise it means +dot includes any character except a newline. + +I took the new t_singlelinecomment from IPDL's parser.py, so I assume +it is reasonable enough. t_multilinecomment is also now the same as +in IPDL. + +Differential Revision: https://phabricator.services.mozilla.com/D161738 + +diff --git xpcom/idl-parser/xpidl/xpidl.py xpcom/idl-parser/xpidl/xpidl.py +--- xpcom/idl-parser/xpidl/xpidl.py ++++ xpcom/idl-parser/xpidl/xpidl.py +@@ -1634,36 +1634,36 @@ class IDLParser(object): + t_LSHIFT = r"<<" + t_RSHIFT = r">>" + + literals = '"(){}[]<>,;:=|+-*' + + t_ignore = " \t" + + def t_multilinecomment(self, t): +- r"/\*(?s).*?\*/" ++ r"/\*(\n|.)*?\*/" + t.lexer.lineno += t.value.count("\n") + if t.value.startswith("/**"): + self._doccomments.append(t.value) + + def t_singlelinecomment(self, t): +- r"(?m)//.*?$" ++ r"//[^\n]*" + + def t_IID(self, t): + return t + + t_IID.__doc__ = r"%(c)s{8}-%(c)s{4}-%(c)s{4}-%(c)s{4}-%(c)s{12}" % {"c": hexchar} + + def t_IDENTIFIER(self, t): + r"(unsigned\ long\ long|unsigned\ short|unsigned\ long|long\ long)(?!_?[A-Za-z][A-Za-z_0-9])|_?[A-Za-z][A-Za-z_0-9]*" # NOQA: E501 + t.type = self.keywords.get(t.value, "IDENTIFIER") + return t + + def t_LCDATA(self, t): +- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P.*?\n?)%\}[ ]*(C\+\+)?" ++ r"%\{[ ]*C\+\+[ ]*\n(?P(\n|.)*?\n?)%\}[ ]*(C\+\+)?" + t.type = "CDATA" + t.value = t.lexer.lexmatch.group("cdata") + t.lexer.lineno += t.value.count("\n") + return t + + def t_INCLUDE(self, t): + r'\#include[ \t]+"[^"\n]+"' + inc, value, end = t.value.split('"') + diff --git a/www/firefox-esr/files/patch-bug1799982 b/www/firefox-esr/files/patch-bug1799982 new file mode 100644 index 000000000000..dac77d73390b --- /dev/null +++ b/www/firefox-esr/files/patch-bug1799982 @@ -0,0 +1,60 @@ +Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers,kmag + +Apparently the use of these is being turned into an error in Python 3.11. +Fortunately, our uses appears to be rather trivial. + +For t_multilinecomment and t_LCDATA, I dropped the (?s) flag and just +replaced the one use of . with (\n|.). (?s) means DOTALL, which means +that dot includes any character, including a newline. Otherwise it means +dot includes any character except a newline. + +I took the new t_singlelinecomment from IPDL's parser.py, so I assume +it is reasonable enough. t_multilinecomment is also now the same as +in IPDL. + +Differential Revision: https://phabricator.services.mozilla.com/D161738 + +diff --git xpcom/idl-parser/xpidl/xpidl.py xpcom/idl-parser/xpidl/xpidl.py +--- xpcom/idl-parser/xpidl/xpidl.py ++++ xpcom/idl-parser/xpidl/xpidl.py +@@ -1634,36 +1634,36 @@ class IDLParser(object): + t_LSHIFT = r"<<" + t_RSHIFT = r">>" + + literals = '"(){}[]<>,;:=|+-*' + + t_ignore = " \t" + + def t_multilinecomment(self, t): +- r"/\*(?s).*?\*/" ++ r"/\*(\n|.)*?\*/" + t.lexer.lineno += t.value.count("\n") + if t.value.startswith("/**"): + self._doccomments.append(t.value) + + def t_singlelinecomment(self, t): +- r"(?m)//.*?$" ++ r"//[^\n]*" + + def t_IID(self, t): + return t + + t_IID.__doc__ = r"%(c)s{8}-%(c)s{4}-%(c)s{4}-%(c)s{4}-%(c)s{12}" % {"c": hexchar} + + def t_IDENTIFIER(self, t): + r"(unsigned\ long\ long|unsigned\ short|unsigned\ long|long\ long)(?!_?[A-Za-z][A-Za-z_0-9])|_?[A-Za-z][A-Za-z_0-9]*" # NOQA: E501 + t.type = self.keywords.get(t.value, "IDENTIFIER") + return t + + def t_LCDATA(self, t): +- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P.*?\n?)%\}[ ]*(C\+\+)?" ++ r"%\{[ ]*C\+\+[ ]*\n(?P(\n|.)*?\n?)%\}[ ]*(C\+\+)?" + t.type = "CDATA" + t.value = t.lexer.lexmatch.group("cdata") + t.lexer.lineno += t.value.count("\n") + return t + + def t_INCLUDE(self, t): + r'\#include[ \t]+"[^"\n]+"' + inc, value, end = t.value.split('"') + diff --git a/www/firefox/files/patch-bug1799982 b/www/firefox/files/patch-bug1799982 new file mode 100644 index 000000000000..dac77d73390b --- /dev/null +++ b/www/firefox/files/patch-bug1799982 @@ -0,0 +1,60 @@ +Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers,kmag + +Apparently the use of these is being turned into an error in Python 3.11. +Fortunately, our uses appears to be rather trivial. + +For t_multilinecomment and t_LCDATA, I dropped the (?s) flag and just +replaced the one use of . with (\n|.). (?s) means DOTALL, which means +that dot includes any character, including a newline. Otherwise it means +dot includes any character except a newline. + +I took the new t_singlelinecomment from IPDL's parser.py, so I assume +it is reasonable enough. t_multilinecomment is also now the same as +in IPDL. + +Differential Revision: https://phabricator.services.mozilla.com/D161738 + +diff --git xpcom/idl-parser/xpidl/xpidl.py xpcom/idl-parser/xpidl/xpidl.py +--- xpcom/idl-parser/xpidl/xpidl.py ++++ xpcom/idl-parser/xpidl/xpidl.py +@@ -1634,36 +1634,36 @@ class IDLParser(object): + t_LSHIFT = r"<<" + t_RSHIFT = r">>" + + literals = '"(){}[]<>,;:=|+-*' + + t_ignore = " \t" + + def t_multilinecomment(self, t): +- r"/\*(?s).*?\*/" ++ r"/\*(\n|.)*?\*/" + t.lexer.lineno += t.value.count("\n") + if t.value.startswith("/**"): + self._doccomments.append(t.value) + + def t_singlelinecomment(self, t): +- r"(?m)//.*?$" ++ r"//[^\n]*" + + def t_IID(self, t): + return t + + t_IID.__doc__ = r"%(c)s{8}-%(c)s{4}-%(c)s{4}-%(c)s{4}-%(c)s{12}" % {"c": hexchar} + + def t_IDENTIFIER(self, t): + r"(unsigned\ long\ long|unsigned\ short|unsigned\ long|long\ long)(?!_?[A-Za-z][A-Za-z_0-9])|_?[A-Za-z][A-Za-z_0-9]*" # NOQA: E501 + t.type = self.keywords.get(t.value, "IDENTIFIER") + return t + + def t_LCDATA(self, t): +- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P.*?\n?)%\}[ ]*(C\+\+)?" ++ r"%\{[ ]*C\+\+[ ]*\n(?P(\n|.)*?\n?)%\}[ ]*(C\+\+)?" + t.type = "CDATA" + t.value = t.lexer.lexmatch.group("cdata") + t.lexer.lineno += t.value.count("\n") + return t + + def t_INCLUDE(self, t): + r'\#include[ \t]+"[^"\n]+"' + inc, value, end = t.value.split('"') +