From 0e22db972d52310b0c9616194bfd4931c95addca Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 5 Jan 2021 16:55:38 +0100 Subject: [PATCH] Avoid using sed to patch files where sensible Signed-off-by: Nils Philippsen --- libffado-2.4.4-icon-name.patch | 12 ++++++++++++ libffado-2.4.4-no-test-apps.patch | 30 ++++++++++++++++++++++++++++++ libffado.spec | 23 ++++++++--------------- 3 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 libffado-2.4.4-icon-name.patch create mode 100644 libffado-2.4.4-no-test-apps.patch diff --git a/libffado-2.4.4-icon-name.patch b/libffado-2.4.4-icon-name.patch new file mode 100644 index 0000000..d5fc600 --- /dev/null +++ b/libffado-2.4.4-icon-name.patch @@ -0,0 +1,12 @@ +diff -up libffado-2.4.4/support/mixer-qt4/ffado/ffadowindow.py.icon-name libffado-2.4.4/support/mixer-qt4/ffado/ffadowindow.py +--- libffado-2.4.4/support/mixer-qt4/ffado/ffadowindow.py.icon-name 2020-05-29 08:59:52.000000000 +0200 ++++ libffado-2.4.4/support/mixer-qt4/ffado/ffadowindow.py 2021-01-05 16:30:40.293184745 +0100 +@@ -267,7 +267,7 @@ def ffadomain(args): + log.debug("Using %s with Qt: %s PyQt: %s" % (get_ffado_version(), QtCore.QT_VERSION_STR, QtCore.PYQT_VERSION_STR)) + + app = QApplication(args) +- app.setWindowIcon( QIcon( SHAREDIR + "/icons/hi64-apps-ffado.png" ) ) ++ app.setWindowIcon( QIcon( SHAREDIR + "/icons/ffado.png" ) ) + + app.setOrganizationName("FFADO") + app.setOrganizationDomain("ffado.org") diff --git a/libffado-2.4.4-no-test-apps.patch b/libffado-2.4.4-no-test-apps.patch new file mode 100644 index 0000000..3cffc74 --- /dev/null +++ b/libffado-2.4.4-no-test-apps.patch @@ -0,0 +1,30 @@ +diff -up libffado-2.4.4/tests/SConscript.no-test-apps libffado-2.4.4/tests/SConscript +--- libffado-2.4.4/tests/SConscript.no-test-apps 2018-03-04 07:12:18.000000000 +0100 ++++ libffado-2.4.4/tests/SConscript 2021-01-05 16:26:04.561795120 +0100 +@@ -83,7 +83,7 @@ if env['ENABLE_DICE']: + + for app in apps.keys(): + env.Program( target=app, source = env.Split( apps[app] ) ) +- env.Install( "$bindir", app ) ++ # env.Install( "$bindir", app ) + + env.SConscript( dirs=["streaming", "systemtests"], exports="env" ) + +diff -up libffado-2.4.4/tests/streaming/SConscript.no-test-apps libffado-2.4.4/tests/streaming/SConscript +--- libffado-2.4.4/tests/streaming/SConscript.no-test-apps 2018-03-04 07:12:18.000000000 +0100 ++++ libffado-2.4.4/tests/streaming/SConscript 2021-01-05 16:25:56.357813274 +0100 +@@ -38,4 +38,4 @@ apps = { + + for app in apps.keys(): + env.Program( target=app, source = env.Split( apps[app] ) ) +- env.Install( "$bindir", app ) ++ # env.Install( "$bindir", app ) +diff -up libffado-2.4.4/tests/systemtests/SConscript.no-test-apps libffado-2.4.4/tests/systemtests/SConscript +--- libffado-2.4.4/tests/systemtests/SConscript.no-test-apps 2018-03-04 07:12:18.000000000 +0100 ++++ libffado-2.4.4/tests/systemtests/SConscript 2021-01-05 16:26:07.104789496 +0100 +@@ -49,4 +49,4 @@ apps = { + + for app in apps.keys(): + env.Program( target=app, source = env.Split( apps[app] ) ) +- env.Install( "$bindir", app ) ++ # env.Install( "$bindir", app ) diff --git a/libffado.spec b/libffado.spec index c86bbc7..4d4d3ff 100644 --- a/libffado.spec +++ b/libffado.spec @@ -9,6 +9,8 @@ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz # bash libffado-snapshot.sh 2088 # The fetch script Source9: libffado-snapshot.sh +Patch0: libffado-2.4.4-no-test-apps.patch +Patch1: libffado-2.4.4-icon-name.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel @@ -28,7 +30,7 @@ BuildRequires: libxml++-devel BuildRequires: pkgconfig BuildRequires: python3-qt5-devel BuildRequires: python3-devel -BuildRequires: python3-scons +BuildRequires: python3-scons >= 3.0.2 BuildRequires: subversion ExcludeArch: s390 s390x Requires: udev @@ -63,18 +65,9 @@ Applications and utilities for use with libffado. %prep -%setup -q - -# Work around a bug in scons < 3.0.2 -if %{__python3} -c 'import SCons; import sys; sys.exit(not tuple(int(d) for d in SCons.__version__.split(".")) < (3, 0, 2))'; then - sed -i '/^CacheDir/d' SConstruct -fi - -# We don't want to install all tests -sed -i '/Install/d' tests/{,*/}SConscript - -# Use standard icon name -sed -i 's|hi64-apps-ffado.png|ffado.png|' support/mixer-qt4/ffado/ffadowindow.py +%autosetup -N +%patch0 -p1 -b .no-test-apps +%patch1 -p1 -b .icon-name # Fix Python shebangs sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ @@ -82,13 +75,12 @@ sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript \ support/tools/*.py support/tools/SConscript -sed -i 's|-m32||' SConstruct - %build export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" scons-3 %{?_smp_mflags} \ + DETECT_USERSPACE_ENV=False \ ENABLE_SETBUFFERSIZE_API_VER=True \ ENABLE_OPTIMIZATIONS=True \ CUSTOM_ENV=True \ @@ -161,6 +153,7 @@ appstream-util validate-relax --nonet \ * Tue Jan 05 2020 Nils Philippsen - 2.4.4-1 - Version 2.4.4 - Document license of binary package +- Avoid using sed to patch files where feasible * Tue Jul 28 2020 Fedora Release Engineering - 2.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild