diff --git a/0001-fix-TypeError-must-be-str-or-None-not-bytes.patch b/0001-fix-TypeError-must-be-str-or-None-not-bytes.patch new file mode 100644 index 0000000..9e81cc7 --- /dev/null +++ b/0001-fix-TypeError-must-be-str-or-None-not-bytes.patch @@ -0,0 +1,27 @@ +From 63dec85b326c8b0adde5b811e668117f236fc14c Mon Sep 17 00:00:00 2001 +From: maminjie +Date: Mon, 26 Oct 2020 09:11:24 +0800 +Subject: [PATCH] fix TypeError: must be str or None, not bytes + +--- + SConstruct | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 1468913..9b811cc 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -719,8 +719,8 @@ def is_userspace_32bit(cpuinfo): + # /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 +-- +2.23.0 + diff --git a/0001-fix-the-AttributeError-module-posixpath-has-no-attribute-walk.patch b/0001-fix-the-AttributeError-module-posixpath-has-no-attribute-walk.patch new file mode 100644 index 0000000..21a7130 --- /dev/null +++ b/0001-fix-the-AttributeError-module-posixpath-has-no-attribute-walk.patch @@ -0,0 +1,41 @@ +From a94776b22f0a50116c8c017a08e2a6e9646fd4f5 Mon Sep 17 00:00:00 2001 +From: maminjie +Date: Tue, 13 Oct 2020 20:15:41 +0800 +Subject: [PATCH] fix the AttributeError: module 'posixpath' has no attribute + 'walk' + +--- + support/mixer-qt4/SConscript | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +diff --git a/support/mixer-qt4/SConscript b/support/mixer-qt4/SConscript +index 1d57984..eebb8ca 100644 +--- a/support/mixer-qt4/SConscript ++++ b/support/mixer-qt4/SConscript +@@ -28,17 +28,13 @@ Import( 'env' ) + + if env['BUILD_MIXER'] == 'true': + e = env.Clone() +- +- def findfiles( arg, dirname, names ): +- for name in names: +- if name.startswith("."): +- names.remove(name) +- for name in names: +- if '.pyc' not in name and '.in' not in name: +- arg.append( os.path.join( dirname, name ) ) +- ++ + pythonfiles = [ 'ffado/config.py' ] +- os.path.walk( "ffado", findfiles, pythonfiles ) ++ for root, dirs, files in os.walk( "ffado" ): ++ for name in files: ++ if name.endswith( '.pyc' ) or '.in' in name or name.startswith("."): ++ continue ++ pythonfiles.append( os.path.join( root, name ) ) + + e.ScanReplace( "ffado/config.py.in" ) + e.Depends( "ffado/config.py", "#/SConstruct" ) +-- +2.23.0 + diff --git a/libffado.spec b/libffado.spec index 1446c96..4e7a42f 100644 --- a/libffado.spec +++ b/libffado.spec @@ -5,17 +5,20 @@ export LDFLAGS="%{build_ldflags}" Name: libffado Version: 2.4.1 -Release: 5 +Release: 6 Summary: Free firewire audio driver library License: LGPLv2+ and GPLv2 and GPLv3 and GPLv3+ URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz Source1: libffado-snapshot.sh -BuildRequires: alsa-lib-devel dbus-c++-devel dbus-devel python2-dbus desktop-file-utils doxygen gcc-c++ glibmm24-devel +Patch0: 0001-fix-the-AttributeError-module-posixpath-has-no-attribute-walk.patch +Patch1: 0001-fix-TypeError-must-be-str-or-None-not-bytes.patch + +BuildRequires: alsa-lib-devel dbus-c++-devel dbus-devel python3-dbus desktop-file-utils doxygen gcc-c++ glibmm24-devel BuildRequires: graphviz libappstream-glib libconfig-devel libiec61883-devel libraw1394-devel libxml++-devel pkgconfig -BuildRequires: python2-PyQt5-devel python2-devel python2-enum34 python2-scons subversion -Requires: udev dbus python2-dbus python2-qt5 +BuildRequires: python3-qt5-devel python3-devel python3-enum34 python3-scons subversion +Requires: udev dbus python3-dbus python3-qt5 Provides: ffado = %{version}-%{release} Obsoletes: ffado < %{version}-%{release} @@ -43,19 +46,19 @@ The libffado-help package conatins manual pages for libffado. sed -i '/Install/d' tests/{,*/}SConscript sed -i 's|hi64-apps-ffado.png|ffado.png|' support/mixer-qt4/ffado/ffadowindow.py -sed -i 's|/usr/bin/.*python$|/usr/bin/python2|' admin/*.py doc/SConscript tests/python/*.py tests/*.py \ +sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' admin/*.py doc/SConscript tests/python/*.py tests/*.py \ support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript support/tools/*.py support/tools/SConscript %build %{_export_PLAGS} -scons %{?_smp_mflags} \ +scons-3 %{?_smp_mflags} \ ENABLE_SETBUFFERSIZE_API_VER=True ENABLE_OPTIMIZATIONS=True CUSTOM_ENV=True BUILD_DOC=user \ PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} UDEVDIR=%{_prefix}/lib/udev/rules.d/ \ - PYPKGDIR=%{python_sitelib}/ffado/ PYTHON_INTERPRETER=/usr/bin/python2 BUILD_TESTS=1 + PYPKGDIR=%{python3_sitelib}/ffado/ PYTHON_INTERPRETER=/usr/bin/python3 BUILD_TESTS=1 %install %{_export_PLAGS} -scons DESTDIR=%{buildroot} install +scons-3 DESTDIR=%{buildroot} install install -d %{buildroot}%{_datadir}/applications desktop-file-install --dir %{buildroot}%{_datadir}/applications --add-category="Settings" --set-icon=ffado support/xdg/ffado.org-ffadomixer.desktop @@ -86,7 +89,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/ffado-mi %{_datadir}/applications/ffado.org-ffadomixer.desktop %{_datadir}/icons/hicolor/64x64/apps/ffado.png %{_datadir}/metainfo/ffado-mixer.appdata.xml -%{python_sitelib}/ffado/ +%{python3_sitelib}/ffado/ %files devel %doc doc/reference/html/ @@ -99,5 +102,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/ffado-mi %{_mandir}/man1/ffado-*.1* %changelog +* Tue Oct 13 2020 maminjie - 2.4.1-6 +- Rebuilt for python3 + * Tue Dec 03 2019 liujing - 2.4.1-5 - Package init