Date: Tuesday, February 19, 2013 @ 00:56:29 Author: andrea Revision: 178266
archrelease: copy trunk to staging-x86_64 Added: phonon/repos/staging-x86_64/PKGBUILD (from rev 178265, phonon/trunk/PKGBUILD) phonon/repos/staging-x86_64/fix-plugindir-for-qt-app.patch (from rev 178265, phonon/trunk/fix-plugindir-for-qt-app.patch) phonon/repos/staging-x86_64/fix-qmake.patch (from rev 178265, phonon/trunk/fix-qmake.patch) Deleted: phonon/repos/staging-x86_64/PKGBUILD phonon/repos/staging-x86_64/fix-plugindir-for-qt-app.patch phonon/repos/staging-x86_64/fix-qmake.patch --------------------------------+ PKGBUILD | 86 +++++++++++++++++++-------------------- fix-plugindir-for-qt-app.patch | 22 ++++----- fix-qmake.patch | 54 ++++++++++++------------ 3 files changed, 82 insertions(+), 80 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-02-18 23:56:23 UTC (rev 178265) +++ PKGBUILD 2013-02-18 23:56:29 UTC (rev 178266) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> - -pkgname=phonon -pkgver=4.6.0 -pkgrel=4 -epoch=1 -arch=('i686' 'x86_64') -url='http://phonon.kde.org/' -license=('LGPL') -pkgdesc="The multimedia framework for KDE" -depends=('qt4' 'phonon-backend' 'libpulse' 'libqzeitgeist') -optdepends=('pulseaudio: PulseAudio support') -makedepends=('cmake' 'automoc4' 'pulseaudio') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'fix-plugindir-for-qt-app.patch' - 'fix-qmake.patch') -md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173' - 'e37d67038c2501f25ac7ee7c2de54a9a' - 'c17d8617e9482f02b3e098842946b679') - -build() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch - patch -p1 -i "${srcdir}"/fix-qmake.patch - cd ../ - - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt4/mkspecs/modules \ - -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt4/plugins/designer - make -} - -package(){ - cd build - make DESTDIR="${pkgdir}" install -} Copied: phonon/repos/staging-x86_64/PKGBUILD (from rev 178265, phonon/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-02-18 23:56:29 UTC (rev 178266) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> + +pkgname=phonon +pkgver=4.6.0 +pkgrel=4 +epoch=1 +arch=('i686' 'x86_64') +url='http://phonon.kde.org/' +license=('LGPL') +pkgdesc="The multimedia framework for KDE" +depends=('qt4' 'phonon-backend' 'libpulse' 'libqzeitgeist') +optdepends=('pulseaudio: PulseAudio support') +makedepends=('cmake' 'automoc4' 'pulseaudio') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'fix-plugindir-for-qt-app.patch' + 'fix-qmake.patch') +md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173' + 'e37d67038c2501f25ac7ee7c2de54a9a' + 'c17d8617e9482f02b3e098842946b679') + +build() { + . /etc/profile.d/qt4.sh + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch + patch -p1 -i "${srcdir}"/fix-qmake.patch + cd ../ + + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt4/mkspecs/modules \ + -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt4/plugins/designer + make +} + +package(){ + cd build + make DESTDIR="${pkgdir}" install +} Deleted: fix-plugindir-for-qt-app.patch =================================================================== --- fix-plugindir-for-qt-app.patch 2013-02-18 23:56:23 UTC (rev 178265) +++ fix-plugindir-for-qt-app.patch 2013-02-18 23:56:29 UTC (rev 178266) @@ -1,11 +0,0 @@ ---- a/phonon/CMakeLists.txt -+++ b/phonon/CMakeLists.txt -@@ -78,7 +78,7 @@ if (PHONON_NO_PLATFORMPLUGIN) - add_definitions(-DQT_NO_PHONON_PLATFORMPLUGIN) - endif (PHONON_NO_PLATFORMPLUGIN) - --add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins") -+add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins") - - automoc4_add_library(phonon SHARED ${phonon_LIB_SRCS}) - target_link_libraries(phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) Copied: phonon/repos/staging-x86_64/fix-plugindir-for-qt-app.patch (from rev 178265, phonon/trunk/fix-plugindir-for-qt-app.patch) =================================================================== --- fix-plugindir-for-qt-app.patch (rev 0) +++ fix-plugindir-for-qt-app.patch 2013-02-18 23:56:29 UTC (rev 178266) @@ -0,0 +1,11 @@ +--- a/phonon/CMakeLists.txt ++++ b/phonon/CMakeLists.txt +@@ -78,7 +78,7 @@ if (PHONON_NO_PLATFORMPLUGIN) + add_definitions(-DQT_NO_PHONON_PLATFORMPLUGIN) + endif (PHONON_NO_PLATFORMPLUGIN) + +-add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins") ++add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins") + + automoc4_add_library(phonon SHARED ${phonon_LIB_SRCS}) + target_link_libraries(phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) Deleted: fix-qmake.patch =================================================================== --- fix-qmake.patch 2013-02-18 23:56:23 UTC (rev 178265) +++ fix-qmake.patch 2013-02-18 23:56:29 UTC (rev 178266) @@ -1,27 +0,0 @@ -From: Oswald Buddenhagen <o...@kde.org> -Date: Sat, 27 Oct 2012 07:58:16 +0000 -Subject: remove unnecessary if() statement -X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=a8c431494d2a6f3785c132f14d00d38ea0e5b328 ---- -remove unnecessary if() statement - -as it happens, this works around a qmake breakage relating to parsing if() - -BUG: 295037 -FIXED-IN: 4.6.1 ---- - - ---- a/qt_phonon.pri -+++ b/qt_phonon.pri -@@ -3,7 +3,7 @@ - # 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)): \ -+!exists($$_QMAKE_CACHE_)| \ -+ !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build): \ - QT_CONFIG += phonon - - Copied: phonon/repos/staging-x86_64/fix-qmake.patch (from rev 178265, phonon/trunk/fix-qmake.patch) =================================================================== --- fix-qmake.patch (rev 0) +++ fix-qmake.patch 2013-02-18 23:56:29 UTC (rev 178266) @@ -0,0 +1,27 @@ +From: Oswald Buddenhagen <o...@kde.org> +Date: Sat, 27 Oct 2012 07:58:16 +0000 +Subject: remove unnecessary if() statement +X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=a8c431494d2a6f3785c132f14d00d38ea0e5b328 +--- +remove unnecessary if() statement + +as it happens, this works around a qmake breakage relating to parsing if() + +BUG: 295037 +FIXED-IN: 4.6.1 +--- + + +--- a/qt_phonon.pri ++++ b/qt_phonon.pri +@@ -3,7 +3,7 @@ + # 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)): \ ++!exists($$_QMAKE_CACHE_)| \ ++ !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build): \ + QT_CONFIG += phonon + +