diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-12 10:18:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-12 10:18:52 +0200 |
| commit | a4a706ff05afab9bb61870c0049aedb23072cec1 (patch) | |
| tree | c2200f0a6e7d6eb40e46a91443ef61b7774b5d9e /extra/qt5/use-python2.patch | |
| parent | 5d57336390ba107efd75b271608fde2fa6172193 (diff) | |
| parent | d976aa5e1544c80dc2457ea20b27f28f3fa05899 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/mcelog/PKGBUILD
extra/calligra/PKGBUILD
extra/libmpdclient/PKGBUILD
extra/mpc/PKGBUILD
extra/opencv/PKGBUILD
extra/qt5/PKGBUILD
Diffstat (limited to 'extra/qt5/use-python2.patch')
| -rw-r--r-- | extra/qt5/use-python2.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/extra/qt5/use-python2.patch b/extra/qt5/use-python2.patch index 8a7075a97..eb53b10f6 100644 --- a/extra/qt5/use-python2.patch +++ b/extra/qt5/use-python2.patch @@ -94,3 +94,14 @@ message_receiver_generator.input = MESSAGE_RECEIVERS message_receiver_generator.depends = $$SCRIPTS message_receiver_generator.output_function = message_receiver_generator_output +--- qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~ 2013-04-11 08:05:15.149214600 +0000 ++++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf 2013-04-11 08:05:28.829105110 +0000 +@@ -116,7 +116,7 @@ + production_build:blackberry { + addReasonForSkippingBuild("Build not supported on BB10 yet.") + } +- requiredPrograms = gperf python perl bison ruby flex ++ requiredPrograms = gperf python2 perl bison ruby flex + for(program, requiredPrograms): \ + !programExistsInPath($$program): \ + addReasonForSkippingBuild("Missing $$program from PATH") |