[arch-commits] Commit in phonon/repos (16 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Mon Feb 25 18:48:25 UTC 2013
Date: Monday, February 25, 2013 @ 19:48:24
Author: andrea
Revision: 178611
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
phonon/repos/staging-i686/PKGBUILD
(from rev 178610, phonon/trunk/PKGBUILD)
phonon/repos/staging-i686/fix-plugindir-for-qt-app.patch
(from rev 178610, phonon/trunk/fix-plugindir-for-qt-app.patch)
phonon/repos/staging-i686/fix-qmake.patch
(from rev 178610, phonon/trunk/fix-qmake.patch)
phonon/repos/staging-i686/headers-location.patch
(from rev 178610, phonon/trunk/headers-location.patch)
phonon/repos/staging-x86_64/PKGBUILD
(from rev 178610, phonon/trunk/PKGBUILD)
phonon/repos/staging-x86_64/fix-plugindir-for-qt-app.patch
(from rev 178610, phonon/trunk/fix-plugindir-for-qt-app.patch)
phonon/repos/staging-x86_64/fix-qmake.patch
(from rev 178610, phonon/trunk/fix-qmake.patch)
phonon/repos/staging-x86_64/headers-location.patch
(from rev 178610, phonon/trunk/headers-location.patch)
Deleted:
phonon/repos/staging-i686/PKGBUILD
phonon/repos/staging-i686/fix-plugindir-for-qt-app.patch
phonon/repos/staging-i686/fix-qmake.patch
phonon/repos/staging-i686/headers-location.patch
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
phonon/repos/staging-x86_64/headers-location.patch
-----------------------------------------------+
staging-i686/PKGBUILD | 100 ++++++++++++------------
staging-i686/fix-plugindir-for-qt-app.patch | 22 ++---
staging-i686/fix-qmake.patch | 54 ++++++------
staging-i686/headers-location.patch | 33 +++++--
staging-x86_64/PKGBUILD | 100 ++++++++++++------------
staging-x86_64/fix-plugindir-for-qt-app.patch | 22 ++---
staging-x86_64/fix-qmake.patch | 54 ++++++------
staging-x86_64/headers-location.patch | 33 +++++--
8 files changed, 220 insertions(+), 198 deletions(-)
Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD 2013-02-25 18:48:10 UTC (rev 178610)
+++ staging-i686/PKGBUILD 2013-02-25 18:48:24 UTC (rev 178611)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=phonon
-pkgver=4.6.0
-pkgrel=5
-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'
- 'headers-location.patch')
-md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
- 'e37d67038c2501f25ac7ee7c2de54a9a'
- 'c17d8617e9482f02b3e098842946b679'
- '71939e8fff3a26e5614982739ae397de')
-
-build() {
- . /etc/profile.d/qt4.sh
-
- cd ${pkgname}-${pkgver}
- # Upstream fixes
- patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
- patch -p1 -i "${srcdir}"/fix-qmake.patch
-
- # install the headers in the same location of the qt4 headers
- patch -p1 -i "${srcdir}"/headers-location.patch
- cd ../
-
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
- -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
- make
-}
-
-package(){
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: phonon/repos/staging-i686/PKGBUILD (from rev 178610, phonon/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-02-25 18:48:24 UTC (rev 178611)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=phonon
+pkgver=4.6.0
+pkgrel=6
+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'
+ 'headers-location.patch')
+md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
+ 'e37d67038c2501f25ac7ee7c2de54a9a'
+ 'c17d8617e9482f02b3e098842946b679'
+ 'a8a01314a199cd65ee63124ed4296d86')
+
+build() {
+ . /etc/profile.d/qt4.sh
+
+ cd ${pkgname}-${pkgver}
+ # Upstream fixes
+ patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
+ patch -p1 -i "${srcdir}"/fix-qmake.patch
+
+ # install the headers in the same location of the qt4 headers
+ patch -p1 -i "${srcdir}"/headers-location.patch
+ cd ../
+
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+ -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
+ make
+}
+
+package(){
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: staging-i686/fix-plugindir-for-qt-app.patch
===================================================================
--- staging-i686/fix-plugindir-for-qt-app.patch 2013-02-25 18:48:10 UTC (rev 178610)
+++ staging-i686/fix-plugindir-for-qt-app.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -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-i686/fix-plugindir-for-qt-app.patch (from rev 178610, phonon/trunk/fix-plugindir-for-qt-app.patch)
===================================================================
--- staging-i686/fix-plugindir-for-qt-app.patch (rev 0)
+++ staging-i686/fix-plugindir-for-qt-app.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -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: staging-i686/fix-qmake.patch
===================================================================
--- staging-i686/fix-qmake.patch 2013-02-25 18:48:10 UTC (rev 178610)
+++ staging-i686/fix-qmake.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -1,27 +0,0 @@
-From: Oswald Buddenhagen <ossi at 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-i686/fix-qmake.patch (from rev 178610, phonon/trunk/fix-qmake.patch)
===================================================================
--- staging-i686/fix-qmake.patch (rev 0)
+++ staging-i686/fix-qmake.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -0,0 +1,27 @@
+From: Oswald Buddenhagen <ossi at 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
+
+
Deleted: staging-i686/headers-location.patch
===================================================================
--- staging-i686/headers-location.patch 2013-02-25 18:48:10 UTC (rev 178610)
+++ staging-i686/headers-location.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -1,11 +0,0 @@
---- phonon-4.6.0/includes/CMakeLists.txt~ 2013-02-25 18:10:04.769629747 +0000
-+++ phonon-4.6.0/includes/CMakeLists.txt 2013-02-25 18:10:19.366188789 +0000
-@@ -51,7 +51,7 @@
- phonon/VolumeFaderEffect
- phonon/VolumeFaderInterface
- phonon/VolumeSlider
--DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
-+DESTINATION ${INCLUDE_INSTALL_DIR}/qt4/phonon COMPONENT Devel)
-
-
- install( FILES
Copied: phonon/repos/staging-i686/headers-location.patch (from rev 178610, phonon/trunk/headers-location.patch)
===================================================================
--- staging-i686/headers-location.patch (rev 0)
+++ staging-i686/headers-location.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -0,0 +1,22 @@
+--- phonon-4.6.0/includes/CMakeLists.txt~ 2013-02-25 18:42:31.962003363 +0000
++++ phonon-4.6.0/includes/CMakeLists.txt 2013-02-25 18:42:44.505244982 +0000
+@@ -51,7 +51,7 @@
+ phonon/VolumeFaderEffect
+ phonon/VolumeFaderInterface
+ phonon/VolumeSlider
+-DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
++DESTINATION ${INCLUDE_INSTALL_DIR}/qt4/phonon COMPONENT Devel)
+
+
+ install( FILES
+--- phonon-4.6.0/phonon/CMakeLists.txt~ 2013-02-25 18:42:52.168522284 +0000
++++ phonon-4.6.0/phonon/CMakeLists.txt 2013-02-25 18:43:12.821704615 +0000
+@@ -155,7 +155,7 @@
+ volumefaderinterface.h
+ volumeslider.h
+ ${CMAKE_CURRENT_BINARY_DIR}/phononnamespace.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
++ DESTINATION ${INCLUDE_INSTALL_DIR}/qt4/phonon COMPONENT Devel)
+
+ if (QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
+ install(FILES org.kde.Phonon.AudioOutput.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD 2013-02-25 18:48:10 UTC (rev 178610)
+++ staging-x86_64/PKGBUILD 2013-02-25 18:48:24 UTC (rev 178611)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=phonon
-pkgver=4.6.0
-pkgrel=5
-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'
- 'headers-location.patch')
-md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
- 'e37d67038c2501f25ac7ee7c2de54a9a'
- 'c17d8617e9482f02b3e098842946b679'
- '71939e8fff3a26e5614982739ae397de')
-
-build() {
- . /etc/profile.d/qt4.sh
-
- cd ${pkgname}-${pkgver}
- # Upstream fixes
- patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
- patch -p1 -i "${srcdir}"/fix-qmake.patch
-
- # install the headers in the same location of the qt4 headers
- patch -p1 -i "${srcdir}"/headers-location.patch
- cd ../
-
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
- -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
- make
-}
-
-package(){
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: phonon/repos/staging-x86_64/PKGBUILD (from rev 178610, phonon/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-02-25 18:48:24 UTC (rev 178611)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=phonon
+pkgver=4.6.0
+pkgrel=6
+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'
+ 'headers-location.patch')
+md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
+ 'e37d67038c2501f25ac7ee7c2de54a9a'
+ 'c17d8617e9482f02b3e098842946b679'
+ 'a8a01314a199cd65ee63124ed4296d86')
+
+build() {
+ . /etc/profile.d/qt4.sh
+
+ cd ${pkgname}-${pkgver}
+ # Upstream fixes
+ patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
+ patch -p1 -i "${srcdir}"/fix-qmake.patch
+
+ # install the headers in the same location of the qt4 headers
+ patch -p1 -i "${srcdir}"/headers-location.patch
+ cd ../
+
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+ -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
+ make
+}
+
+package(){
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: staging-x86_64/fix-plugindir-for-qt-app.patch
===================================================================
--- staging-x86_64/fix-plugindir-for-qt-app.patch 2013-02-25 18:48:10 UTC (rev 178610)
+++ staging-x86_64/fix-plugindir-for-qt-app.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -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 178610, phonon/trunk/fix-plugindir-for-qt-app.patch)
===================================================================
--- staging-x86_64/fix-plugindir-for-qt-app.patch (rev 0)
+++ staging-x86_64/fix-plugindir-for-qt-app.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -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: staging-x86_64/fix-qmake.patch
===================================================================
--- staging-x86_64/fix-qmake.patch 2013-02-25 18:48:10 UTC (rev 178610)
+++ staging-x86_64/fix-qmake.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -1,27 +0,0 @@
-From: Oswald Buddenhagen <ossi at 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 178610, phonon/trunk/fix-qmake.patch)
===================================================================
--- staging-x86_64/fix-qmake.patch (rev 0)
+++ staging-x86_64/fix-qmake.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -0,0 +1,27 @@
+From: Oswald Buddenhagen <ossi at 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
+
+
Deleted: staging-x86_64/headers-location.patch
===================================================================
--- staging-x86_64/headers-location.patch 2013-02-25 18:48:10 UTC (rev 178610)
+++ staging-x86_64/headers-location.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -1,11 +0,0 @@
---- phonon-4.6.0/includes/CMakeLists.txt~ 2013-02-25 18:10:04.769629747 +0000
-+++ phonon-4.6.0/includes/CMakeLists.txt 2013-02-25 18:10:19.366188789 +0000
-@@ -51,7 +51,7 @@
- phonon/VolumeFaderEffect
- phonon/VolumeFaderInterface
- phonon/VolumeSlider
--DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
-+DESTINATION ${INCLUDE_INSTALL_DIR}/qt4/phonon COMPONENT Devel)
-
-
- install( FILES
Copied: phonon/repos/staging-x86_64/headers-location.patch (from rev 178610, phonon/trunk/headers-location.patch)
===================================================================
--- staging-x86_64/headers-location.patch (rev 0)
+++ staging-x86_64/headers-location.patch 2013-02-25 18:48:24 UTC (rev 178611)
@@ -0,0 +1,22 @@
+--- phonon-4.6.0/includes/CMakeLists.txt~ 2013-02-25 18:42:31.962003363 +0000
++++ phonon-4.6.0/includes/CMakeLists.txt 2013-02-25 18:42:44.505244982 +0000
+@@ -51,7 +51,7 @@
+ phonon/VolumeFaderEffect
+ phonon/VolumeFaderInterface
+ phonon/VolumeSlider
+-DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
++DESTINATION ${INCLUDE_INSTALL_DIR}/qt4/phonon COMPONENT Devel)
+
+
+ install( FILES
+--- phonon-4.6.0/phonon/CMakeLists.txt~ 2013-02-25 18:42:52.168522284 +0000
++++ phonon-4.6.0/phonon/CMakeLists.txt 2013-02-25 18:43:12.821704615 +0000
+@@ -155,7 +155,7 @@
+ volumefaderinterface.h
+ volumeslider.h
+ ${CMAKE_CURRENT_BINARY_DIR}/phononnamespace.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
++ DESTINATION ${INCLUDE_INSTALL_DIR}/qt4/phonon COMPONENT Devel)
+
+ if (QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
+ install(FILES org.kde.Phonon.AudioOutput.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
More information about the arch-commits
mailing list