zutty: patch for Python 3.11

This commit is contained in:
Đoàn Trần Công Danh 2022-12-04 01:05:55 +07:00
parent 7f7dc74ace
commit 8f90752556
2 changed files with 59 additions and 0 deletions

View file

@ -0,0 +1,48 @@
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'])

View file

@ -13,6 +13,17 @@ 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
}
post_install() {
# Copy icons
vinstall icons/zutty.svg 644 usr/share/icons/hicolor/scalable/apps