diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-26 17:57:29 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-26 17:57:29 +0100 |
| commit | 025f5565da8ee014457f56851fca55c36619787c (patch) | |
| tree | 1705231f784a4ec514287e99d3967b3495dacc23 /extra/phonon | |
| parent | d4891d626bd0699dafdcfa776ad0ee48df04f2d4 (diff) | |
| parent | e39d5f838c08b5b57eae4c1aec4ae00acd18b239 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/percona-server/PKGBUILD
community/libdnet/PKGBUILD
extra/libxfce4ui/PKGBUILD
extra/libxi/PKGBUILD
extra/live-media/PKGBUILD
extra/python-urwid/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/xfconf/PKGBUILD
kde-unstable/kactivities/PKGBUILD
kde-unstable/kdeaccessibility-jovie/PKGBUILD
kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
kde-unstable/kdeaccessibility-kmag/PKGBUILD
kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
kde-unstable/kdeaccessibility-kmouth/PKGBUILD
kde-unstable/kdeadmin/PKGBUILD
kde-unstable/kdeartwork/PKGBUILD
kde-unstable/kdebase-konsole/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase/PKGBUILD
kde-unstable/kdebindings-kimono/PKGBUILD
kde-unstable/kdebindings-kross/PKGBUILD
kde-unstable/kdebindings-perlkde/PKGBUILD
kde-unstable/kdebindings-perlqt/PKGBUILD
kde-unstable/kdebindings-python/PKGBUILD
kde-unstable/kdebindings-qtruby/PKGBUILD
kde-unstable/kdebindings-qyoto/PKGBUILD
kde-unstable/kdebindings-smokegen/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdebindings-smokeqt/PKGBUILD
kde-unstable/kdeedu-analitza/PKGBUILD
kde-unstable/kdeedu-blinken/PKGBUILD
kde-unstable/kdeedu-cantor/PKGBUILD
kde-unstable/kdeedu-kalgebra/PKGBUILD
kde-unstable/kdeedu-kalzium/PKGBUILD
kde-unstable/kdeedu-kanagram/PKGBUILD
kde-unstable/kdeedu-kbruch/PKGBUILD
kde-unstable/kdeedu-kgeography/PKGBUILD
kde-unstable/kdeedu-khangman/PKGBUILD
kde-unstable/kdeedu-kig/PKGBUILD
kde-unstable/kdeedu-kiten/PKGBUILD
kde-unstable/kdeedu-klettres/PKGBUILD
kde-unstable/kdeedu-kmplot/PKGBUILD
kde-unstable/kdeedu-kstars/PKGBUILD
kde-unstable/kdeedu-ktouch/PKGBUILD
kde-unstable/kdeedu-kturtle/PKGBUILD
kde-unstable/kdeedu-kwordquiz/PKGBUILD
kde-unstable/kdeedu-marble/PKGBUILD
kde-unstable/kdeedu-parley/PKGBUILD
kde-unstable/kdeedu-rocs/PKGBUILD
kde-unstable/kdeedu-step/PKGBUILD
kde-unstable/kdegames/PKGBUILD
kde-unstable/kdegraphics-gwenview/PKGBUILD
kde-unstable/kdegraphics-kamera/PKGBUILD
kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
kde-unstable/kdegraphics-kgamma/PKGBUILD
kde-unstable/kdegraphics-kolourpaint/PKGBUILD
kde-unstable/kdegraphics-kruler/PKGBUILD
kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
kde-unstable/kdegraphics-ksnapshot/PKGBUILD
kde-unstable/kdegraphics-mobipocket/PKGBUILD
kde-unstable/kdegraphics-okular/PKGBUILD
kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
kde-unstable/kdegraphics-svgpart/PKGBUILD
kde-unstable/kdegraphics-thumbnailers/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
kde-unstable/kdemultimedia/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
kde-unstable/kdepim/PKGBUILD
kde-unstable/kdepimlibs/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
kde-unstable/kdesdk-kate/PKGBUILD
kde-unstable/kdesdk-kate/kdesdk-kate.install
kde-unstable/kdesdk/PKGBUILD
kde-unstable/kdetoys/PKGBUILD
kde-unstable/kdeutils-filelight/PKGBUILD
kde-unstable/kdeutils-kcalc/PKGBUILD
kde-unstable/kdeutils-kcharselect/PKGBUILD
kde-unstable/kdeutils-kdf/PKGBUILD
kde-unstable/kdeutils-kfloppy/PKGBUILD
kde-unstable/kdeutils-kgpg/PKGBUILD
kde-unstable/kdeutils-kremotecontrol/PKGBUILD
kde-unstable/kdeutils-ktimer/PKGBUILD
kde-unstable/kdeutils-kwallet/PKGBUILD
kde-unstable/kdeutils-printer-applet/PKGBUILD
kde-unstable/kdeutils-superkaramba/PKGBUILD
kde-unstable/kdeutils-sweeper/PKGBUILD
kde-unstable/kdewebdev/PKGBUILD
kde-unstable/libkdcraw/PKGBUILD
kde-unstable/libkdeedu/PKGBUILD
kde-unstable/libkexiv2/PKGBUILD
kde-unstable/libkipi/PKGBUILD
kde-unstable/libksane/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-libxi/PKGBUILD
~lukeshu/android-udev/51-android.rules
~lukeshu/android-udev/PKGBUILD
Diffstat (limited to 'extra/phonon')
| -rw-r--r-- | extra/phonon/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD index a257a5c38..3a7e1755d 100644 --- a/extra/phonon/PKGBUILD +++ b/extra/phonon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145248 2011-12-20 07:59:43Z andrea $ +# $Id: PKGBUILD 145472 2011-12-22 22:17:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon @@ -11,7 +11,7 @@ license=('LGPL') pkgdesc="The multimedia framework for KDE" depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') optdepends=('pulseaudio: PulseAudio support') -makedepends=('cmake' 'automoc4' 'pulseaudio') +makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173') @@ -22,7 +22,7 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_PREFIX=/usr -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \ -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer make |