diff options
author | Max Brazhnikov <makc@FreeBSD.org> | 2012-05-25 01:53:50 +0000 |
---|---|---|
committer | Max Brazhnikov <makc@FreeBSD.org> | 2012-05-25 01:53:50 +0000 |
commit | 4319d238082bcfa3ccbb9d4f572c65c0547d8269 (patch) | |
tree | f741cb9b9edb6341f2a77e6b3a29b49072ecc220 /multimedia/phonon/files/patch-CMakeLists.txt | |
parent | Chase PyQT update (diff) |
Update KDE related ports:
databases/akonadi to 1.7.2
devel/libdbusmenu-qt to 0.9.2
devel/qtscriptgenerator to 0.2.0
multimedia/phonon to 4.6.0
multimedia/phonon-gstreamer to 4.6.0
multimedia/phonon-vlc to 0.5.0
sysutils/qzeitgeist to 0.8.0
Diffstat (limited to 'multimedia/phonon/files/patch-CMakeLists.txt')
-rw-r--r-- | multimedia/phonon/files/patch-CMakeLists.txt | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/multimedia/phonon/files/patch-CMakeLists.txt b/multimedia/phonon/files/patch-CMakeLists.txt deleted file mode 100644 index 9d6f2b74f048..000000000000 --- a/multimedia/phonon/files/patch-CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -commit 353bf15657c9a93138bce7431c5180b25efaede7 -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Mon Nov 14 19:14:02 2011 -0200 - - Fix if() clause the same way 13ec1718 does. - - QT_QTDESIGNER_FOUND should not be expanded, as if it is not found the if - clause will effectively become `if(AND PHONON_BUILD_DESIGNER_PLUGIN)`. - - This was fixed in master by commit 13ec1718, which for some reason has - never made its way to the 4.5 branch. - - CCMAIL: kde-multimedia@kde.org - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7fbb816..71cb14a 100644 ---- ./CMakeLists.txt -+++ ./CMakeLists.txt -@@ -55,9 +55,9 @@ endif(QT_QTDBUS_FOUND) - set(BUILDSYSTEM_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/phonon-buildsystem/) - - add_subdirectory(cmake) --if(${QT_QTDESIGNER_FOUND} AND PHONON_BUILD_DESIGNER_PLUGIN) -+if(QT_QTDESIGNER_FOUND AND PHONON_BUILD_DESIGNER_PLUGIN) - add_subdirectory(designer) --endif(${QT_QTDESIGNER_FOUND} AND PHONON_BUILD_DESIGNER_PLUGIN) -+endif(QT_QTDESIGNER_FOUND AND PHONON_BUILD_DESIGNER_PLUGIN) - add_subdirectory(phonon) - add_subdirectory(includes) - if(PHONON_BUILD_DEMOS) |