From 8f907525563fdfffff186949fb5d832d039dd008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 4 Dec 2022 01:05:55 +0700 Subject: [PATCH] zutty: patch for Python 3.11 --- srcpkgs/zutty/patches/python-3.11.patch | 48 +++++++++++++++++++++++++ srcpkgs/zutty/template | 11 ++++++ 2 files changed, 59 insertions(+) create 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 new file mode 100644 index 00000000000..07fbf1f8b4f --- /dev/null +++ b/srcpkgs/zutty/patches/python-3.11.patch @@ -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']) + diff --git a/srcpkgs/zutty/template b/srcpkgs/zutty/template index 1f648da90b7..be7aa791399 100644 --- a/srcpkgs/zutty/template +++ b/srcpkgs/zutty/template @@ -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