Source: aubio
Followup-For: Bug #1028178
Dear Maintainer,
i've prepared and uploaded an NMU that fixes the problem.
Unfortunately, I failed to upload to a DELAYED/n queue (and instead uploaded
directly into the archives).
I sincerely apologize for that mistake.
In any case, i'm attaching the debdiff for the NMU.
Also note, that this NMU (along with the previous two NMUs) can be found in
https://salsa.debian.org/piem/aubio/-/merge_requests/1
cheers,
mfdsa
IOhannes
diff -Nru aubio-0.4.9/debian/changelog aubio-0.4.9/debian/changelog
--- aubio-0.4.9/debian/changelog2022-06-30 22:35:01.0 +0200
+++ aubio-0.4.9/debian/changelog2023-01-15 21:40:50.0 +0100
@@ -1,3 +1,10 @@
+aubio (0.4.9-4.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * waf compatibility with Python3.11 (Closes: #1028178)
+
+ -- IOhannes m zmölnig (Debian/GNU) Sun, 15 Jan 2023
21:40:50 +0100
+
aubio (0.4.9-4.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru aubio-0.4.9/debian/patches/series aubio-0.4.9/debian/patches/series
--- aubio-0.4.9/debian/patches/series 2022-06-30 22:35:01.0 +0200
+++ aubio-0.4.9/debian/patches/series 2023-01-15 21:40:50.0 +0100
@@ -3,4 +3,5 @@
fixpowerpc.patch
fixi386.patch
wscript_py3.patch
+waflib-py311.patch
ffmpeg5.patch
diff -Nru aubio-0.4.9/debian/patches/waflib-py311.patch
aubio-0.4.9/debian/patches/waflib-py311.patch
--- aubio-0.4.9/debian/patches/waflib-py311.patch 1970-01-01
01:00:00.0 +0100
+++ aubio-0.4.9/debian/patches/waflib-py311.patch 2023-01-15
21:40:50.0 +0100
@@ -0,0 +1,45 @@
+From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?=
+
+Date: Sun, 15 Jan 2023 21:33:38 +0100
+Subject: Make 'waflib' compatible with Python3.11
+
+---
+ waflib/ConfigSet.py | 2 +-
+ waflib/Context.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py
+index 8212586..8142817 100644
+--- a/waflib/ConfigSet.py
b/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))
+diff --git a/waflib/Context.py b/waflib/Context.py
+index ab6b154..cbe16c1 100644
+--- a/waflib/Context.py
b/waflib/Context.py
+@@ -106,7 +106,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)
+@@ -346,7 +346,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)
