[PR PATCH] zutty: update to 0.14

[PR PATCH] zutty: update to 0.14

[paxet]

[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]

There is a new pull request by paxet against master on the void-packages repository

https://github.com/paxet/void-packages master
https://github.com/void-linux/void-packages/pull/42617

zutty: update to 0.14
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl
  - armv6l
  - armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/42617.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-42617.patch --]
[-- Type: text/x-diff, Size: 3632 bytes --]

From 0a28dc7e6ef3b9c8fb83258317347f50f70fc88e Mon Sep 17 00:00:00 2001
From: Javier Caballero <jacallo@protonmail.com>
Date: Mon, 6 Mar 2023 07:47:18 +0100
Subject: [PATCH] zutty: update to 0.14

---
 srcpkgs/zutty/patches/python-3.11.patch | 48 -------------------------
 srcpkgs/zutty/template                  | 17 ++-------
 2 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/zutty/patches/python-3.11.patch

diff --git a/srcpkgs/zutty/patches/python-3.11.patch b/srcpkgs/zutty/patches/python-3.11.patch
deleted file mode 100644
index 07fbf1f8b4f9..000000000000
--- a/srcpkgs/zutty/patches/python-3.11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: zutty-0.12/.waf3/waflib/ConfigSet.py
-===================================================================
---- zutty-0.12.orig/.waf3/waflib/ConfigSet.py
-+++ zutty-0.12/.waf3/waflib/ConfigSet.py
-@@ -146,7 +146,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))
-Index: zutty-0.12/.waf3/waflib/Context.py
-===================================================================
---- zutty-0.12.orig/.waf3/waflib/Context.py
-+++ zutty-0.12/.waf3/waflib/Context.py
-@@ -105,7 +105,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)
-@@ -351,7 +351,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)
-Index: zutty-0.12/wscript
-===================================================================
---- zutty-0.12.orig/wscript
-+++ zutty-0.12/wscript
-@@ -70,7 +70,7 @@ def configure(cfg):
-     else:
-         cfg.env.target = 'zutty'
-         cfg.env.append_value('CXXFLAGS',
--           ['-Werror', '-O3', '-flto'])
-+           ['-flto'])
-         cfg.env.append_value('LINKFLAGS',
-            ['-flto'])
- 
diff --git a/srcpkgs/zutty/template b/srcpkgs/zutty/template
index be7aa7913997..f9e9250bd69b 100644
--- a/srcpkgs/zutty/template
+++ b/srcpkgs/zutty/template
@@ -1,6 +1,6 @@
 # Template file for 'zutty'
 pkgname=zutty
-version=0.12
+version=0.14
 revision=1
 build_style=waf3
 hostmakedepends="pkg-config"
@@ -10,19 +10,8 @@ short_desc="X terminal emulator rendering through OpenGL ES Compute Shaders"
 maintainer="Javier Caballero <jacallo@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://tomscii.sig7.se/zutty"
-distfiles="https://github.com/tomszilagyi/zutty/archive/refs/tags/${version}.tar.gz"
-checksum=750daed8625a2486a33b872d59242efba7ee21af282ccfd4a7dbf12d21d7cee7
-
-post_extract() {
-	# waf file is self extracting archive written in python
-	# it self extracts in top level, then runs extracted module in __main__
-	# importing allows to patch contents of archive
-	cp waf waf.py
-	sed -i '/__name__.*__main__/i sys.exit(0)' waf.py
-	python3 waf.py
-	ln -s .waf3-* .waf3
-	rm waf.py
-}
+distfiles="https://github.com/tomscii/zutty/archive/refs/tags/${version}.tar.gz"
+checksum=6de17d6b7a3fe6991df30ba1ca7d6a08e605369cf92247deeb19758379b5af2f
 
 post_install() {
 	# Copy icons

Re: zutty: update to 0.14

[paxet]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by paxet on void-packages repository

https://github.com/void-linux/void-packages/pull/42617#issuecomment-1455617581

Comment:
Since zutty updated waf version and it supports python 3.11 now, we can ommit the patch.

Re: [PR PATCH] [Merged]: zutty: update to 0.14

[abenson]

[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]

There's a merged pull request on the void-packages repository

zutty: update to 0.14
https://github.com/void-linux/void-packages/pull/42617

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl
  - armv6l
  - armv6l-musl