diff options
Diffstat (limited to 'extra/libffado/python2-qt.patch')
| -rw-r--r-- | extra/libffado/python2-qt.patch | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/extra/libffado/python2-qt.patch b/extra/libffado/python2-qt.patch index 042aa2665..0d8cf586b 100644 --- a/extra/libffado/python2-qt.patch +++ b/extra/libffado/python2-qt.patch @@ -1,30 +1,24 @@ diff -baur libffado-2.1.0.orig/SConstruct libffado-2.1.0/SConstruct --- libffado-2.1.0.orig/SConstruct 2012-09-19 14:18:53.827448582 +0800 +++ libffado-2.1.0/SConstruct 2012-09-19 14:20:01.670414379 +0800 -@@ -1,4 +1,4 @@ --#! /usr/bin/python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - # - # Copyright (C) 2007, 2008, 2010 Arnold Krille @@ -134,7 +134,7 @@ - + def CheckForPyModule( context, module ): context.Message( "Checking for the python module '" + module + "' " ) - ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" ) + ret = context.TryAction( "python2 $SOURCE", "import %s" % module, ".py" ) context.Result( ret[0] ) return ret[0] - + @@ -351,7 +351,7 @@ - + # PyQT checks build_mixer = False -if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): +if conf.CheckForApp( 'which python2-pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): env['PYUIC4'] = True build_mixer = True - + diff -baur libffado-2.1.0.orig/admin/dbus.py libffado-2.1.0/admin/dbus.py --- libffado-2.1.0.orig/admin/dbus.py 2012-09-19 14:18:53.857448419 +0800 +++ libffado-2.1.0/admin/dbus.py 2012-09-19 14:19:02.957399122 +0800 @@ -73,14 +67,14 @@ diff -baur libffado-2.1.0.orig/admin/pyuic4.py libffado-2.1.0/admin/pyuic4.py @@ -21,10 +21,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # - + -import imp - def pyuic4_action( target, source, env ): - env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) + env.Execute( "python2-pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) return 0 - + def pyuic4_string( target, source, env ): @@ -34,7 +32,7 @@ context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " ) @@ -106,9 +100,9 @@ diff -baur libffado-2.1.0.orig/doc/SConscript libffado-2.1.0/doc/SConscript @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 - + Import( 'env' ) - + diff -baur libffado-2.1.0.orig/support/dbus/SConscript libffado-2.1.0/support/dbus/SConscript --- libffado-2.1.0.orig/support/dbus/SConscript 2012-09-19 14:18:53.827448582 +0800 +++ libffado-2.1.0/support/dbus/SConscript 2012-09-19 14:19:02.957399123 +0800 @@ -166,12 +160,12 @@ diff -baur libffado-2.1.0.orig/support/tools/SConscript libffado-2.1.0/support/t @@ -43,7 +43,7 @@ # For the installation of the stuff e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e ) - + -e.Command( "static_info.txt", "#/SConstruct", "python support/tools/ffado-diag-static > $TARGET" ) +e.Command( "static_info.txt", "#/SConstruct", "python2 support/tools/ffado-diag-static > $TARGET" ) - + e.ScanReplace( "ffado-diag.in" ) - + diff -baur libffado-2.1.0.orig/support/tools/ffado-diag-static libffado-2.1.0/support/tools/ffado-diag-static --- libffado-2.1.0.orig/support/tools/ffado-diag-static 2012-09-19 14:18:53.830781898 +0800 +++ libffado-2.1.0/support/tools/ffado-diag-static 2012-09-19 14:19:02.957399123 +0800 @@ -179,7 +173,7 @@ diff -baur libffado-2.1.0.orig/support/tools/ffado-diag-static libffado-2.1.0/su -#!/usr/bin/python +#!/usr/bin/python2 # - + # @@ -74,7 +74,7 @@ # check libraries @@ -197,7 +191,7 @@ diff -baur libffado-2.1.0.orig/support/tools/ffado-diag.in libffado-2.1.0/suppor -#!/usr/bin/python +#!/usr/bin/python2 # - + # @@ -120,7 +120,7 @@ print " Prerequisites (dynamic at run-time)..." @@ -215,7 +209,7 @@ diff -baur libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py libffado-2 -#!/usr/bin/python +#!/usr/bin/python2 # - + # diff -baur libffado-2.1.0.orig/support/tools/listirqinfo.py libffado-2.1.0/support/tools/listirqinfo.py --- libffado-2.1.0.orig/support/tools/listirqinfo.py 2012-09-19 14:18:53.830781898 +0800 @@ -224,7 +218,7 @@ diff -baur libffado-2.1.0.orig/support/tools/listirqinfo.py libffado-2.1.0/suppo -#!/usr/bin/python +#!/usr/bin/python2 # - + # diff -baur libffado-2.1.0.orig/tests/dbus_test.py libffado-2.1.0/tests/dbus_test.py --- libffado-2.1.0.orig/tests/dbus_test.py 2012-09-19 14:18:53.837448529 +0800 |