Received: by mail.netbsd.org (Postfix, from userid 605) id 31E2084E5B; Fri, 16 Dec 2022 07:36:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5DADE84DA9 for ; Fri, 16 Dec 2022 07:36:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id HkNkh-4EDONF for ; Fri, 16 Dec 2022 07:36:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id AF9CC84D4E for ; Fri, 16 Dec 2022 07:36:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9E672FA90; Fri, 16 Dec 2022 07:36:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167117620114630" MIME-Version: 1.0 Date: Fri, 16 Dec 2022 07:36:41 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/audio/jack To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20221216073641.9E672FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167117620114630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Fri Dec 16 07:36:41 UTC 2022 Modified Files: pkgsrc/audio/jack: distinfo Added Files: pkgsrc/audio/jack/patches: patch-waflib_ConfigSet.py patch-waflib_Context.py Log Message: jack: fix build with Python 3.11 To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 pkgsrc/audio/jack/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/audio/jack/patches/patch-waflib_ConfigSet.py \ pkgsrc/audio/jack/patches/patch-waflib_Context.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_167117620114630 Content-Disposition: inline Content-Length: 3060 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/jack/distinfo diff -u pkgsrc/audio/jack/distinfo:1.32 pkgsrc/audio/jack/distinfo:1.33 --- pkgsrc/audio/jack/distinfo:1.32 Sat Mar 26 22:36:19 2022 +++ pkgsrc/audio/jack/distinfo Fri Dec 16 07:36:41 2022 @@ -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) = 0 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 Added files: Index: pkgsrc/audio/jack/patches/patch-waflib_ConfigSet.py diff -u /dev/null pkgsrc/audio/jack/patches/patch-waflib_ConfigSet.py:1.1 --- /dev/null Fri Dec 16 07:36:41 2022 +++ pkgsrc/audio/jack/patches/patch-waflib_ConfigSet.py Fri Dec 16 07:36:41 2022 @@ -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)) Index: pkgsrc/audio/jack/patches/patch-waflib_Context.py diff -u /dev/null pkgsrc/audio/jack/patches/patch-waflib_Context.py:1.1 --- /dev/null Fri Dec 16 07:36:41 2022 +++ pkgsrc/audio/jack/patches/patch-waflib_Context.py Fri Dec 16 07:36:41 2022 @@ -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) + --_----------=_167117620114630--