diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-10-30 23:22:41 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-10-30 23:22:41 +0000 |
| commit | ac45fd0fe2567426052faac25fbf08de5f8a500d (patch) | |
| tree | 2cc5fa5a8af5f9a1780c8f71cb6d2783a4a04222 /media-libs/phonon/files | |
| parent | Version bump #387999 by Kilburn Abrahams. (diff) | |
| download | gentoo-2-ac45fd0fe2567426052faac25fbf08de5f8a500d.tar.gz gentoo-2-ac45fd0fe2567426052faac25fbf08de5f8a500d.tar.bz2 gentoo-2-ac45fd0fe2567426052faac25fbf08de5f8a500d.zip | |
Add workaround for qmake misbehaviour, bug 388675
(Portage version: 2.1.10.31/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/phonon/files')
| -rw-r--r-- | media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch b/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch new file mode 100644 index 000000000000..a656889880ac --- /dev/null +++ b/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch @@ -0,0 +1,16 @@ +Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/cmake und phonon-4.5.1/cmake. +Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/demos und phonon-4.5.1/demos. +Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/designer und phonon-4.5.1/designer. +Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/includes und phonon-4.5.1/includes. +Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/phonon und phonon-4.5.1/phonon. +diff -u phonon-4.5.1.orig/qt_phonon.pri phonon-4.5.1/qt_phonon.pri +--- phonon-4.5.1.orig/qt_phonon.pri 2011-10-21 21:03:49.000000000 +0200 ++++ phonon-4.5.1/qt_phonon.pri 2011-10-31 00:16:58.081648105 +0100 +@@ -3,6 +3,5 @@ + # the next build of Qt. So pretend we're not there in this case. + # This file is loaded by qt_config.prf, before .qmake.cache has been loaded. + # Consequently, we have to do some stunts to get values out of the cache. +-if(!exists($$_QMAKE_CACHE_)| \ +- !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \ ++if(!exists($$_QMAKE_CACHE_)|!contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \ + QT_CONFIG += phonon |