From nobody Thu Dec 08 11:39:56 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 4NSXJF1NVZz4jFw4; Thu, 8 Dec 2022 11:39:57 +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 4NSXJF0h4pz4NKw; Thu, 8 Dec 2022 11:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670499597; 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=U3M4aypbbDx1RLx0Xg5wPpuOvrg/pFwgY4dobosj5vs=; b=YIVAyl0H78ln/p3VXc1U42eavjXYZwuUP1PX3ypP+G1nixRBUMCd7t2HmNfchzaTsrJUhW 4tyE4efSHfh4zl57rGcEMWrfiCU4mlV7NP/Z7l0Kir0wHZFLioaGCcNqspSazCFi6+DsFH 88YmfNnQeqKxFyxBWFiaCMhTF1wj02LVTStgFMSPOyh+NiwhSaJeTuBZwBirwDcxENOBeY KQdGRHMNMIfXKPIVhxmxZyezwguAChZ7qZn3jn2CZBWFRbbix1BDKbNFdT4BdhsPUWiqiJ fAmhNyNzWQcRSZMQx287n31QkyuqvDO7oFVVEE8PianKFAJySklYuXeHucqmXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670499597; 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=U3M4aypbbDx1RLx0Xg5wPpuOvrg/pFwgY4dobosj5vs=; b=DFyr1ManerBOerRNlE7Qsks2NfSDrm1ZQEpKFRos9bAalLOhHSFulCaw72WuYCBzc5Y95E s3G6U07t/CpyUpNhgNh+LJjAUYAPe11VpUE3NQvYeN/uGqHA1XPtINFjQkJ3C2Ug7Pytij NKwhTbmlwqQfD4NKRs8hW8/Hp3K9oKBgnJjB2dgpDIhk6WEbEIPqI9J6lUPDqe4U3LL4hf RpYJ6jUbnbkzy/mSWE940Hhxph9Qvdd583l5oyxYLOdWPYWKAYqvSHgxehnKSZM/IUViDT dSGZi1RhmQJ3DT44G74YHeeWs1We2pA3SCzmBQ1CsAtZNT20tmvqq472P0GdVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670499597; a=rsa-sha256; cv=none; b=vfqIMZ8dcNaBeX1LlpPGGK/iMLCoxL7OkbTPljfGKM62+7Yhj6fgq2GyyZLXCpZW9+7ywD DlYE8RifiJVV44pYCrnIP+rWc8nDfz3cPgPMFDEl02B1Gygbf4e0/3jig1Q2LyqUr+l67a PG+75RT/9aLldGhM2lr9erYjglV41QT10bU/iUBtjJ/sU3JkfgZKvH4szd3KdxTZFqXnzq ffshUJasUFhdb1DKbcbpEjJcYq8+u57hbAVAbpBOpM96nzR6K3rv6SNPw6B3Z3+rCots5r BK0w7zqb0o3F0BzmFCg0zP0pvMtGjXEBWC8d0bJh+wFPmM/e3TIty52AacPxtA== 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 4NSXJD6PvFzv7Q; Thu, 8 Dec 2022 11:39:56 +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 2B8BduIT071751; Thu, 8 Dec 2022 11:39:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B8BduaU071750; Thu, 8 Dec 2022 11:39:56 GMT (envelope-from git) Date: Thu, 8 Dec 2022 11:39:56 GMT Message-Id: <202212081139.2B8BduaU071750@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f32e6d8d8ab8 - main - benchmarks/glmark2: unbreak build with python311 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f32e6d8d8ab83d6545ac19354751f564cf577630 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f32e6d8d8ab83d6545ac19354751f564cf577630 commit f32e6d8d8ab83d6545ac19354751f564cf577630 Author: Jan Beich AuthorDate: 2022-12-06 03:44:09 +0000 Commit: Jan Beich CommitDate: 2022-12-08 11:39:24 +0000 benchmarks/glmark2: unbreak build with python311 Traceback (most recent call last): File "waflib/Scripting.py", line 104, in waf_entry_point set_main_module(os.path.normpath(os.path.join(Context.run_dir,Context.WSCRIPT_FILE))) File "waflib/Scripting.py", line 135, in set_main_module Context.g_module=Context.load_module(file_path) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "waflib/Context.py", line 343, in load_module code=Utils.readf(path,m='rU',encoding=encoding) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "waflib/Utils.py", line 117, in readf f=open(fname,m) ^^^^^^^^^^^^^ ValueError: invalid mode: 'rUb' --- benchmarks/glmark2/files/patch-python311 | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/benchmarks/glmark2/files/patch-python311 b/benchmarks/glmark2/files/patch-python311 new file mode 100644 index 000000000000..6f77aae72de6 --- /dev/null +++ b/benchmarks/glmark2/files/patch-python311 @@ -0,0 +1,33 @@ +https://gitlab.com/ita1024/waf/-/commit/68997828c850 + +--- waflib/ConfigSet.py.orig 2021-12-23 14:46:11 UTC ++++ waflib/ConfigSet.py +@@ -140,7 +140,7 @@ class ConfigSet(object): + Utils.writef(filename,''.join(buf)) + def load(self,filename): + tbl=self.table +- code=Utils.readf(filename,m='rU') ++ code=Utils.readf(filename,m='r') + for m in re_imp.finditer(code): + g=m.group + tbl[g(2)]=eval(g(3)) +--- waflib/Context.py.orig 2021-12-23 14:46:11 UTC ++++ waflib/Context.py +@@ -109,7 +109,7 @@ class Context(ctx): + cache[node]=True + self.pre_recurse(node) + try: +- function_code=node.read('rU',encoding) ++ function_code=node.read('r',encoding) + exec(compile(function_code,node.abspath(),'exec'),self.exec_dict) + finally: + self.post_recurse(node) +@@ -340,7 +340,7 @@ def load_module(path,encoding=None): + pass + module=imp.new_module(WSCRIPT_FILE) + try: +- code=Utils.readf(path,m='rU',encoding=encoding) ++ code=Utils.readf(path,m='r',encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r'%path) + module_dir=os.path.dirname(path)