[arch-commits] Commit in phonon/repos (14 files)

Andrea Scarpino andrea at nymeria.archlinux.org
Fri Mar 1 21:25:10 UTC 2013


    Date: Friday, March 1, 2013 @ 22:25:10
  Author: andrea
Revision: 179044

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  phonon/repos/extra-i686/PKGBUILD
    (from rev 179043, phonon/trunk/PKGBUILD)
  phonon/repos/extra-i686/fix-plugindir-for-qt-app.patch
    (from rev 179043, phonon/trunk/fix-plugindir-for-qt-app.patch)
  phonon/repos/extra-i686/fix-qmake.patch
    (from rev 179043, phonon/trunk/fix-qmake.patch)
  phonon/repos/extra-x86_64/PKGBUILD
    (from rev 179043, phonon/trunk/PKGBUILD)
  phonon/repos/extra-x86_64/fix-plugindir-for-qt-app.patch
    (from rev 179043, phonon/trunk/fix-plugindir-for-qt-app.patch)
  phonon/repos/extra-x86_64/fix-qmake.patch
    (from rev 179043, phonon/trunk/fix-qmake.patch)
Deleted:
  phonon/repos/extra-i686/PKGBUILD
  phonon/repos/extra-i686/fix-plugindir-for-qt-app.patch
  phonon/repos/extra-i686/fix-qmake.patch
  phonon/repos/extra-i686/headers-location.patch
  phonon/repos/extra-x86_64/PKGBUILD
  phonon/repos/extra-x86_64/fix-plugindir-for-qt-app.patch
  phonon/repos/extra-x86_64/fix-qmake.patch
  phonon/repos/extra-x86_64/headers-location.patch

---------------------------------------------+
 extra-i686/PKGBUILD                         |   93 ++++++++++++--------------
 extra-i686/fix-plugindir-for-qt-app.patch   |   22 +++---
 extra-i686/fix-qmake.patch                  |   54 +++++++--------
 extra-i686/headers-location.patch           |   30 --------
 extra-x86_64/PKGBUILD                       |   93 ++++++++++++--------------
 extra-x86_64/fix-plugindir-for-qt-app.patch |   22 +++---
 extra-x86_64/fix-qmake.patch                |   54 +++++++--------
 extra-x86_64/headers-location.patch         |   30 --------
 8 files changed, 162 insertions(+), 236 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-03-01 21:25:01 UTC (rev 179043)
+++ extra-i686/PKGBUILD	2013-03-01 21:25:10 UTC (rev 179044)
@@ -1,50 +0,0 @@
-# $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'
-         'da8ce5bd7edc943e74200f697591c187')
-
-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/extra-i686/PKGBUILD (from rev 179043, phonon/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-03-01 21:25:10 UTC (rev 179044)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=phonon
+pkgver=4.6.0
+pkgrel=7
+epoch=1
+arch=('i686' 'x86_64')
+url='http://phonon.kde.org/'
+license=('LGPL')
+pkgdesc="The multimedia framework for KDE"
+depends=('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}
+  # Upstream fixes
+  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_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+    -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
+  make
+}
+
+package(){
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/fix-plugindir-for-qt-app.patch
===================================================================
--- extra-i686/fix-plugindir-for-qt-app.patch	2013-03-01 21:25:01 UTC (rev 179043)
+++ extra-i686/fix-plugindir-for-qt-app.patch	2013-03-01 21:25:10 UTC (rev 179044)
@@ -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/extra-i686/fix-plugindir-for-qt-app.patch (from rev 179043, phonon/trunk/fix-plugindir-for-qt-app.patch)
===================================================================
--- extra-i686/fix-plugindir-for-qt-app.patch	                        (rev 0)
+++ extra-i686/fix-plugindir-for-qt-app.patch	2013-03-01 21:25:10 UTC (rev 179044)
@@ -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: extra-i686/fix-qmake.patch
===================================================================
--- extra-i686/fix-qmake.patch	2013-03-01 21:25:01 UTC (rev 179043)
+++ extra-i686/fix-qmake.patch	2013-03-01 21:25:10 UTC (rev 179044)
@@ -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/extra-i686/fix-qmake.patch (from rev 179043, phonon/trunk/fix-qmake.patch)
===================================================================
--- extra-i686/fix-qmake.patch	                        (rev 0)
+++ extra-i686/fix-qmake.patch	2013-03-01 21:25:10 UTC (rev 179044)
@@ -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: extra-i686/headers-location.patch
===================================================================
--- extra-i686/headers-location.patch	2013-03-01 21:25:01 UTC (rev 179043)
+++ extra-i686/headers-location.patch	2013-03-01 21:25:10 UTC (rev 179044)
@@ -1,30 +0,0 @@
---- phonon-4.6.0/includes/CMakeLists.txt~	2013-02-25 18:50:09.158434991 +0000
-+++ phonon-4.6.0/includes/CMakeLists.txt	2013-02-25 18:50:23.251657541 +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:50:28.991612426 +0000
-+++ phonon-4.6.0/phonon/CMakeLists.txt	2013-02-25 18:52:56.570453620 +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})
---- phonon-4.6.0/phonon/experimental/CMakeLists.txt~	2013-02-25 18:51:08.734633479 +0000
-+++ phonon-4.6.0/phonon/experimental/CMakeLists.txt	2013-02-25 18:51:23.997846924 +0000
-@@ -55,4 +55,4 @@
-     videowidget.h
-     visualization.h
-     globalconfig.h
--    DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/experimental COMPONENT Devel)
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/qt4/phonon/experimental COMPONENT Devel)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-03-01 21:25:01 UTC (rev 179043)
+++ extra-x86_64/PKGBUILD	2013-03-01 21:25:10 UTC (rev 179044)
@@ -1,50 +0,0 @@
-# $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'
-         'da8ce5bd7edc943e74200f697591c187')
-
-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/extra-x86_64/PKGBUILD (from rev 179043, phonon/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-03-01 21:25:10 UTC (rev 179044)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=phonon
+pkgver=4.6.0
+pkgrel=7
+epoch=1
+arch=('i686' 'x86_64')
+url='http://phonon.kde.org/'
+license=('LGPL')
+pkgdesc="The multimedia framework for KDE"
+depends=('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}
+  # Upstream fixes
+  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_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+    -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
+  make
+}
+
+package(){
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/fix-plugindir-for-qt-app.patch
===================================================================
--- extra-x86_64/fix-plugindir-for-qt-app.patch	2013-03-01 21:25:01 UTC (rev 179043)
+++ extra-x86_64/fix-plugindir-for-qt-app.patch	2013-03-01 21:25:10 UTC (rev 179044)
@@ -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/extra-x86_64/fix-plugindir-for-qt-app.patch (from rev 179043, phonon/trunk/fix-plugindir-for-qt-app.patch)
===================================================================
--- extra-x86_64/fix-plugindir-for-qt-app.patch	                        (rev 0)
+++ extra-x86_64/fix-plugindir-for-qt-app.patch	2013-03-01 21:25:10 UTC (rev 179044)
@@ -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: extra-x86_64/fix-qmake.patch
===================================================================
--- extra-x86_64/fix-qmake.patch	2013-03-01 21:25:01 UTC (rev 179043)
+++ extra-x86_64/fix-qmake.patch	2013-03-01 21:25:10 UTC (rev 179044)
@@ -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/extra-x86_64/fix-qmake.patch (from rev 179043, phonon/trunk/fix-qmake.patch)
===================================================================
--- extra-x86_64/fix-qmake.patch	                        (rev 0)
+++ extra-x86_64/fix-qmake.patch	2013-03-01 21:25:10 UTC (rev 179044)
@@ -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: extra-x86_64/headers-location.patch
===================================================================
--- extra-x86_64/headers-location.patch	2013-03-01 21:25:01 UTC (rev 179043)
+++ extra-x86_64/headers-location.patch	2013-03-01 21:25:10 UTC (rev 179044)
@@ -1,30 +0,0 @@
---- phonon-4.6.0/includes/CMakeLists.txt~	2013-02-25 18:50:09.158434991 +0000
-+++ phonon-4.6.0/includes/CMakeLists.txt	2013-02-25 18:50:23.251657541 +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:50:28.991612426 +0000
-+++ phonon-4.6.0/phonon/CMakeLists.txt	2013-02-25 18:52:56.570453620 +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})
---- phonon-4.6.0/phonon/experimental/CMakeLists.txt~	2013-02-25 18:51:08.734633479 +0000
-+++ phonon-4.6.0/phonon/experimental/CMakeLists.txt	2013-02-25 18:51:23.997846924 +0000
-@@ -55,4 +55,4 @@
-     videowidget.h
-     visualization.h
-     globalconfig.h
--    DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/experimental COMPONENT Devel)
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/qt4/phonon/experimental COMPONENT Devel)




More information about the arch-commits mailing list