Attachment 240343 Details for Bug 269776 – v1 (apply via "git am")

[patch] v1 (apply via "git am")

bug269776.diff (text/plain), 2.81 KB, created by Jan Beich on 2023-02-23 12:37:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2023-02-23 12:37:48 UTC

Size: 2.81 KB

patch

obsolete

>From fa3a574cb8d9b352c6333fe0abe58e148f053e77 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Thu, 23 Feb 2023 12:17:40 +0000
>Subject: [PATCH] benchmarks/glmark2: update to 2023.01
>
>Changes:	https://github.com/glmark2/glmark2/compare/2021.12...2023.01
>PR:		269776
>Approved by:	danfe (maintainer)
>---
> benchmarks/glmark2/Makefile              |  2 +-
> benchmarks/glmark2/distinfo              |  6 ++---
> benchmarks/glmark2/files/patch-python311 | 33 ------------------------
> 3 files changed, 4 insertions(+), 37 deletions(-)
> delete mode 100644 benchmarks/glmark2/files/patch-python311
>
>diff --git a/benchmarks/glmark2/Makefile b/benchmarks/glmark2/Makefile
>index e3303910cab3..28a763e2eef8 100644
>--- a/benchmarks/glmark2/Makefile
>+++ b/benchmarks/glmark2/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	glmark2
>-PORTVERSION=	2021.12
>+PORTVERSION=	2023.01
> CATEGORIES=	benchmarks
> 
> MAINTAINER=	danfe@FreeBSD.org
>diff --git a/benchmarks/glmark2/distinfo b/benchmarks/glmark2/distinfo
>index c6b4e81b168d..e68342651331 100644
>--- a/benchmarks/glmark2/distinfo
>+++ b/benchmarks/glmark2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1640270771
>-SHA256 (glmark2-glmark2-2021.12_GH0.tar.gz) = 9f111284b2ef1d3fce91928e249e6ca00796a036831b063a549a0f3b03557a95
>-SIZE (glmark2-glmark2-2021.12_GH0.tar.gz) = 9360052
>+TIMESTAMP = 1677154637
>+SHA256 (glmark2-glmark2-2023.01_GH0.tar.gz) = 8fece3fc323b643644a525be163dc4931a4189971eda1de8ad4c1712c5db3d67
>+SIZE (glmark2-glmark2-2023.01_GH0.tar.gz) = 9366116
>diff --git a/benchmarks/glmark2/files/patch-python311 b/benchmarks/glmark2/files/patch-python311
>deleted file mode 100644
>index 6f77aae72de6..000000000000
>--- a/benchmarks/glmark2/files/patch-python311
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-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)

Actions: View | Diff

Attachments on bug 269776: 240343