diff options
| author | wiz <wiz@pkgsrc.org> | 2022-12-16 07:36:41 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2022-12-16 07:36:41 +0000 |
| commit | f7e401cc39483b44ccb9ac73fa3331f918f155c5 (patch) | |
| tree | b00328c2f4a7cdba774fd3f414dc81b5f1e3b2cb | |
| parent | 42733d9634e5685ccd1a0c2780992b61a042df91 (diff) | |
| download | pkgsrc-f7e401cc39483b44ccb9ac73fa3331f918f155c5.tar.gz | |
jack: fix build with Python 3.11
| -rw-r--r-- | audio/jack/distinfo | 4 | ||||
| -rw-r--r-- | audio/jack/patches/patch-waflib_ConfigSet.py | 16 | ||||
| -rw-r--r-- | audio/jack/patches/patch-waflib_Context.py | 25 |
3 files changed, 44 insertions, 1 deletions
diff --git a/audio/jack/distinfo b/audio/jack/distinfo index 7c86c73b8f6..e4064713d2f 100644 --- a/audio/jack/distinfo +++ b/audio/jack/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2022/03/26 22:36:19 tnn Exp $ +$NetBSD: distinfo,v 1.33 2022/12/16 07:36:41 wiz Exp $ BLAKE2s (jack2-1.9.19.tar.gz) = aa43a3ae606c00e7c8e047e89250e068717f44fa0443b8531a6d83ca2a9dff71 SHA512 (jack2-1.9.19.tar.gz) = d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d @@ -22,4 +22,6 @@ SHA1 (patch-posix_JackPosixThread.h) = 0aa94425ad44cc36fb583e48bdfa9f5f33a5eaa3 SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314 SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0 SHA1 (patch-tools_wscript) = fab7472b29fc6e46ba1e8ca94c12aa8808b075da +SHA1 (patch-waflib_ConfigSet.py) = 8f4cf15e16dae9f64ee7d5f65fe8c633cea7d1c0 +SHA1 (patch-waflib_Context.py) = b68ec440239d877680e1425907a42f8412f7e7da SHA1 (patch-wscript) = a49c6e7ebd84bb5156576351308676b0b3486492 diff --git a/audio/jack/patches/patch-waflib_ConfigSet.py b/audio/jack/patches/patch-waflib_ConfigSet.py new file mode 100644 index 00000000000..ec06fcf09d4 --- /dev/null +++ b/audio/jack/patches/patch-waflib_ConfigSet.py @@ -0,0 +1,16 @@ +$NetBSD: patch-waflib_ConfigSet.py,v 1.1 2022/12/16 07:36:41 wiz Exp $ + +Fix build with Python 3.11. +https://github.com/jackaudio/jack2/issues/898 + +--- waflib/ConfigSet.py.orig 2021-07-15 06:18:26.000000000 +0000 ++++ waflib/ConfigSet.py +@@ -312,7 +312,7 @@ class ConfigSet(object): + :type filename: string + """ + 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)) diff --git a/audio/jack/patches/patch-waflib_Context.py b/audio/jack/patches/patch-waflib_Context.py new file mode 100644 index 00000000000..ff8a42c72e3 --- /dev/null +++ b/audio/jack/patches/patch-waflib_Context.py @@ -0,0 +1,25 @@ +$NetBSD: patch-waflib_Context.py,v 1.1 2022/12/16 07:36:41 wiz Exp $ + +Fix build with Python 3.11. +https://github.com/jackaudio/jack2/issues/898 + +--- waflib/Context.py.orig 2021-07-15 06:18:26.000000000 +0000 ++++ waflib/Context.py +@@ -266,7 +266,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) +@@ -662,7 +662,7 @@ def load_module(path, encoding=None): + + 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) + |