1 |
dilfridge 11/10/30 23:22:41 |
2 |
|
3 |
Added: phonon-4.5.1-qmakeworkaround.patch |
4 |
Log: |
5 |
Add workaround for qmake misbehaviour, bug 388675 |
6 |
|
7 |
(Portage version: 2.1.10.31/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: phonon-4.5.1-qmakeworkaround.patch |
16 |
=================================================================== |
17 |
Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/cmake und phonon-4.5.1/cmake. |
18 |
Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/demos und phonon-4.5.1/demos. |
19 |
Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/designer und phonon-4.5.1/designer. |
20 |
Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/includes und phonon-4.5.1/includes. |
21 |
Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/phonon und phonon-4.5.1/phonon. |
22 |
diff -u phonon-4.5.1.orig/qt_phonon.pri phonon-4.5.1/qt_phonon.pri |
23 |
--- phonon-4.5.1.orig/qt_phonon.pri 2011-10-21 21:03:49.000000000 +0200 |
24 |
+++ phonon-4.5.1/qt_phonon.pri 2011-10-31 00:16:58.081648105 +0100 |
25 |
@@ -3,6 +3,5 @@ |
26 |
# the next build of Qt. So pretend we're not there in this case. |
27 |
# This file is loaded by qt_config.prf, before .qmake.cache has been loaded. |
28 |
# Consequently, we have to do some stunts to get values out of the cache. |
29 |
-if(!exists($$_QMAKE_CACHE_)| \ |
30 |
- !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \ |
31 |
+if(!exists($$_QMAKE_CACHE_)|!contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \ |
32 |
QT_CONFIG += phonon |