diff options
Diffstat (limited to 'audio/mixxx')
-rw-r--r-- | audio/mixxx/mixxx-list-fix.patch | 26 | ||||
-rw-r--r-- | audio/mixxx/mixxx.SlackBuild | 4 |
2 files changed, 30 insertions, 0 deletions
diff --git a/audio/mixxx/mixxx-list-fix.patch b/audio/mixxx/mixxx-list-fix.patch new file mode 100644 index 0000000000..1d457e15c9 --- /dev/null +++ b/audio/mixxx/mixxx-list-fix.patch @@ -0,0 +1,26 @@ +From 03fad27e1f0f18ec83c9a4bc5f03f28948cd44fb Mon Sep 17 00:00:00 2001 +From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> +Date: Fri, 23 Aug 2019 15:26:21 +0200 +Subject: [PATCH] scons: Fix UIC invocation via map() in Python 3 + +--- + build/depends.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/build/depends.py b/build/depends.py +index bf81d20cb89..152a6de5c11 100644 +--- a/build/depends.py ++++ b/build/depends.py +@@ -1297,7 +1297,11 @@ def sources(self, build): + 'src/preferences/dialog/dlgprefvinyldlg.ui', + 'src/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 --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild index 43f8245165..ff0e7f66fd 100644 --- a/audio/mixxx/mixxx.SlackBuild +++ b/audio/mixxx/mixxx.SlackBuild @@ -72,6 +72,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# scons is now python3 based +sed -i "s|from features|from .features|" build/depends.py +patch -p1 < $CWD/mixxx-list-fix.patch + # Fix library installation path sed -i "s|'lib'|'lib$LIBDIRSUFFIX'|" build/depends.py src/SConscript || exit 1 sed -i "s|usr/lib|usr/lib$LIBDIRSUFFIX|" src/SConscript || exit 1 |