From 4319d238082bcfa3ccbb9d4f572c65c0547d8269 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Fri, 25 May 2012 01:53:50 +0000 Subject: 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 --- multimedia/phonon/files/patch-CMakeLists.txt | 30 ---------------------------- 1 file changed, 30 deletions(-) delete mode 100644 multimedia/phonon/files/patch-CMakeLists.txt (limited to 'multimedia/phonon/files/patch-CMakeLists.txt') 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 -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) -- cgit v1.2.3