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

[Antonio Rojas]

    Date: Friday, July 26, 2019 @ 23:06:50
  Author: arojas
Revision: 492981

Fix build with python3 scons

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-26 23:02:21 UTC (rev 492980)
+++ PKGBUILD	2019-07-26 23:06:50 UTC (rev 492981)
@@ -15,10 +15,11 @@
 optdepends=('python-pyqt5: ffado-mixer')
 provides=('ffado')
 source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz"
-        "${pkgname}-fix-python3-pyqt5.diff"
+        "${pkgname}-fix-python3-pyqt5.diff" scons-python3.patch
 )
 sha512sums=('0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74'
-            '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e')
+            '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e'
+            '69890fd26d3c07dce7c1a9789eb34a86d27207fc58040afc1c9c53ad157bf62d751cf1cf80f2d7b88b88ac9fd3ecb04e2cf41a2644103db8aeed3701555cc6d2')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -26,6 +27,7 @@
   # fix icon name, so it's coherent with XDG desktop file name
   sed -e 's/hi64-apps-ffado/ffado-mixer/g' \
     -i support/xdg/ffado.org-ffadomixer.desktop
+  patch -p1 -i ../scons-python3.patch
 }
 
 build() {

Added: scons-python3.patch
===================================================================
--- scons-python3.patch	                        (rev 0)
+++ scons-python3.patch	2019-07-26 23:06:50 UTC (rev 492981)
@@ -0,0 +1,24 @@
+--- libffado-2.4.1/SConstruct.orig	2019-07-26 22:54:47.409490023 +0000
++++ libffado-2.4.1/SConstruct	2019-07-26 22:55:33.906830766 +0000
+@@ -719,8 +719,8 @@
+         # /bin/mount:     file format elf64-x86-64
+         # or like this:
+         # /bin/mount:     file format elf32-powerpc
+-        for line in x.split(b'\n'):
+-            line = line.strip().decode()
++        for line in x.split('\n'):
++            line = line.strip()
+             if line.startswith(real_exe):
+                 x, fmt = line.rsplit(None, 1)
+                 answer = 'elf32' in fmt
+--- libffado-2.4.1/support/mixer-qt4/SConscript.orig	2019-07-26 23:02:25.349419059 +0000
++++ libffado-2.4.1/support/mixer-qt4/SConscript	2019-07-26 23:02:43.363010354 +0000
+@@ -38,7 +38,7 @@
+                 arg.append( os.path.join( dirname, name ) )
+ 
+     pythonfiles = [ 'ffado/config.py' ]
+-    os.path.walk( "ffado", findfiles, pythonfiles )
++    os.walk( "ffado", findfiles, pythonfiles )
+ 
+     e.ScanReplace( "ffado/config.py.in" )
+     e.Depends( "ffado/config.py", "#/SConstruct" )