[arch-commits] Commit in phonon/trunk (PKGBUILD headers-location.patch)

[Andrea Scarpino]

    Date: Friday, March 1, 2013 @ 22:25:01
  Author: andrea
Revision: 179043

upgpkg: phonon 1:4.6.0-7

Do not move headers (FS#34095)

Modified:
  phonon/trunk/PKGBUILD
Deleted:
  phonon/trunk/headers-location.patch

------------------------+
 PKGBUILD               |   15 ++++-----------
 headers-location.patch |   30 ------------------------------
 2 files changed, 4 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-01 20:43:49 UTC (rev 179042)
+++ PKGBUILD	2013-03-01 21:25:01 UTC (rev 179043)
@@ -3,34 +3,27 @@
 
 pkgname=phonon
 pkgver=4.6.0
-pkgrel=6
+pkgrel=7
 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')
+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'
-        'headers-location.patch')
+        'fix-qmake.patch')
 md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
          'e37d67038c2501f25ac7ee7c2de54a9a'
-         'c17d8617e9482f02b3e098842946b679'
-         'da8ce5bd7edc943e74200f697591c187')
+         'c17d8617e9482f02b3e098842946b679')
 
 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

Deleted: headers-location.patch
===================================================================
--- headers-location.patch	2013-03-01 20:43:49 UTC (rev 179042)
+++ headers-location.patch	2013-03-01 21:25:01 UTC (rev 179043)
@@ -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)