Control: tags 947568 + patch Dear maintainer,
It looks like the relevant upstream patch is https://github.com/mixxxdj/mixxx/pull/2201/commits/03fad27e1f0f18ec83c9a4bc5f03f28948cd44fb I've prepared an NMU for mixxx (versioned as 2.2.3~dfsg-1.1). The diff is attached to this message. Regards. SR
diff -Nru mixxx-2.2.3~dfsg/debian/changelog mixxx-2.2.3~dfsg/debian/changelog --- mixxx-2.2.3~dfsg/debian/changelog 2020-01-10 13:33:58.000000000 -0800 +++ mixxx-2.2.3~dfsg/debian/changelog 2020-05-12 16:07:23.000000000 -0700 @@ -1,3 +1,11 @@ +mixxx (2.2.3~dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Cherry-pick an upstream patch to fix a FTBFS with Scons under Python 3. + (Closes: #947568) + + -- Stefano Rivera <stefa...@debian.org> Tue, 12 May 2020 16:07:23 -0700 + mixxx (2.2.3~dfsg-1) unstable; urgency=medium [ Ondřej Nový ] diff -Nru mixxx-2.2.3~dfsg/debian/patches/0005-scons-3.patch mixxx-2.2.3~dfsg/debian/patches/0005-scons-3.patch --- mixxx-2.2.3~dfsg/debian/patches/0005-scons-3.patch 1969-12-31 16:00:00.000000000 -0800 +++ mixxx-2.2.3~dfsg/debian/patches/0005-scons-3.patch 2020-05-12 16:06:52.000000000 -0700 @@ -0,0 +1,21 @@ +Description: Build correctly under scons on Python 3 +Bug-Upstream: https://bugs.launchpad.net/mixxx/+bug/1817742 +Bug-Debian: https://bugs.debian.org/947568 +Author: Jan Holthuis <jan.holth...@ruhr-uni-bochum.de> +Origin: upstream, https://github.com/mixxxdj/mixxx/pull/2201/commits/03fad27e1f0f18ec83c9a4bc5f03f28948cd44fb + +--- a/build/depends.py ++++ b/build/depends.py +@@ -1285,7 +1285,11 @@ + 'preferences/dialog/dlgprefvinyldlg.ui', + 'preferences/dialog/dlgprefwaveformdlg.ui', + ] +- map(Qt.uic(build), ui_files) ++ ++ # In Python 3.x, map() returns a "map object" (instead of a list), ++ # which is evaluated on-demand rather than at once. To invoke uic ++ # for all *.ui files at once, we need to cast it to a list here. ++ list(map(Qt.uic(build), ui_files)) + + if build.platform_is_windows: + # Add Windows resource file with icons and such diff -Nru mixxx-2.2.3~dfsg/debian/patches/series mixxx-2.2.3~dfsg/debian/patches/series --- mixxx-2.2.3~dfsg/debian/patches/series 2020-01-10 13:32:29.000000000 -0800 +++ mixxx-2.2.3~dfsg/debian/patches/series 2020-05-12 15:56:06.000000000 -0700 @@ -2,3 +2,4 @@ 0002-desktop_file.patch 0003-soundtouch.patch 0004-remove_inappropriate_arm_flags.patch +0005-scons-3.patch
