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

Andrea Scarpino andrea at nymeria.archlinux.org
Mon Feb 25 18:19:44 UTC 2013


    Date: Monday, February 25, 2013 @ 19:19:43
  Author: andrea
Revision: 178606

upgpkg: phonon 1:4.6.0-4

Install the phonon headers in /usr/include/qt4

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

------------------------+
 PKGBUILD               |   14 ++++++++++----
 headers-location.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-25 17:59:04 UTC (rev 178605)
+++ PKGBUILD	2013-02-25 18:19:43 UTC (rev 178606)
@@ -14,17 +14,23 @@
 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')
+        'fix-qmake.patch'
+        'headers-location.patch')
 md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
          'e37d67038c2501f25ac7ee7c2de54a9a'
-         'c17d8617e9482f02b3e098842946b679')
+         '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
@@ -33,8 +39,8 @@
     -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
+    -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+    -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
   make
 }
 

Added: headers-location.patch
===================================================================
--- headers-location.patch	                        (rev 0)
+++ headers-location.patch	2013-02-25 18:19:43 UTC (rev 178606)
@@ -0,0 +1,11 @@
+--- 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




More information about the arch-commits mailing list