[arch-commits] Commit in mixxx/trunk (PKGBUILD scons-python3.patch)

[Antonio Rojas]

    Date: Saturday, July 27, 2019 @ 11:25:47
  Author: arojas
Revision: 493164

Fix build with python3 scons

Added:
  mixxx/trunk/scons-python3.patch
Modified:
  mixxx/trunk/PKGBUILD

---------------------+
 PKGBUILD            |    6 ++++--
 scons-python3.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-27 11:25:21 UTC (rev 493163)
+++ PKGBUILD	2019-07-27 11:25:47 UTC (rev 493164)
@@ -19,12 +19,14 @@
 makedepends=('qt5-tools' 'qtkeychain' 'scons')
 optdepends=('qtkeychain: Credentials storage support for Live Broadcasting profiles')
 checkdepends=('xorg-server-xvfb')
-source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz")
-sha512sums=('16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3')
+source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz" scons-python3.patch)
+sha512sums=('16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3'
+            '599bb66acc372daebe10b9dfe65690290027876799a51a8cf0cc2a8f7ed5e9370936ab3e3c004f2a762495b0c73acfa1e9fb60ee757347ccc7699c3fb01a7020')
 
 prepare() {
   mv -v "${pkgname}-release-${pkgver}" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
+  patch -p1 -i ../scons-python3.patch
 }
 
 build() {

Added: scons-python3.patch
===================================================================
--- scons-python3.patch	                        (rev 0)
+++ scons-python3.patch	2019-07-27 11:25:47 UTC (rev 493164)
@@ -0,0 +1,31 @@
+--- mixxx-2.2.1/build/depends.py.orig	2019-07-26 23:29:29.253916199 +0000
++++ mixxx-2.2.1/build/depends.py	2019-07-26 23:30:03.631040632 +0000
+@@ -30,8 +30,8 @@
+         return
+ 
+     def sources(self, build):
+-    	if build.platform_is_osx:
+-        	return ['util/filepathurl.mm']
++        if build.platform_is_osx:
++            return ['util/filepathurl.mm']
+         return []
+ 
+ 
+@@ -615,7 +615,7 @@
+             env.Append(CPPPATH=[self.SOUNDTOUCH_INTERNAL_PATH])
+ 
+             # Prevents circular import.
+-            from features import Optimize
++            from .features import Optimize
+ 
+             # If we do not want optimizations then disable them.
+             optimize = (build.flags['optimize'] if 'optimize' in build.flags
+@@ -1304,7 +1305,7 @@
+             'preferences/dialog/dlgprefvinyldlg.ui',
+             'preferences/dialog/dlgprefwaveformdlg.ui',
+         ]
+-        map(Qt.uic(build), ui_files)
++        list(map(Qt.uic(build), ui_files))
+
+         if build.platform_is_windows:
+             # Add Windows resource file with icons and such