From dbca00052b9b9aacdfe59b40f77829861f735476 Mon Sep 17 00:00:00 2001 From: Marius Schamschula Date: Sun, 23 Jun 2024 18:22:28 -0500 Subject: [PATCH] jack: use Python 3.12 See: https://github.com/jackaudio/jack2/issues/898#issuecomment-2185323342 --- audio/jack/Portfile | 8 ++++++-- audio/jack/files/patch-waflib-Context.py.diff | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 audio/jack/files/patch-waflib-Context.py.diff diff --git a/audio/jack/Portfile b/audio/jack/Portfile index d8f5e25c50f52..cbc43a99c916b 100644 --- a/audio/jack/Portfile +++ b/audio/jack/Portfile @@ -7,7 +7,7 @@ PortGroup waf 1.0 name jack github.setup jackaudio jack2 1.9.22 v -revision 0 +revision 1 checksums rmd160 1f13a7ac5020d95b5b51f1c43d7cfe3507e7b8b0 \ sha256 1e42b9fc4ad7db7befd414d45ab2f8a159c0b30fcd6eee452be662298766a849 \ size 933448 @@ -45,7 +45,11 @@ compiler.blacklist-append \ compiler.cxx_standard \ 2011 -waf.python_branch 3.11 +# This won't be needed after the next update +# see: https://github.com/jackaudio/jack2/issues/898#issuecomment-2185323342 +patchfiles-append patch-waflib-Context.py.diff + +waf.python_branch 3.12 depends_build-append \ port:pkgconfig diff --git a/audio/jack/files/patch-waflib-Context.py.diff b/audio/jack/files/patch-waflib-Context.py.diff new file mode 100644 index 0000000000000..29ecda5baf553 --- /dev/null +++ b/audio/jack/files/patch-waflib-Context.py.diff @@ -0,0 +1,20 @@ +--- waflib/Context.py.orig 2023-02-02 05:04:10 ++++ waflib/Context.py 2024-06-23 15:42:02 +@@ -6,7 +6,7 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, sys, types + from waflib import Utils, Errors, Logs + import waflib.Node + +@@ -660,7 +660,7 @@ + except KeyError: + pass + +- module = imp.new_module(WSCRIPT_FILE) ++ module = types.ModuleType(WSCRIPT_FILE) + try: + code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: