[arch-commits] Commit in qt/trunk (PKGBUILD)

[Rémy Oudompheng]

    Date: Tuesday, March 22, 2011 @ 19:12:19
  Author: remy
Revision: 116367

Don't mix private headers with public ones.

Private headers are expected in a private/ subdirectory.

Modified:
  qt/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-22 23:10:57 UTC (rev 116366)
+++ PKGBUILD	2011-03-22 23:12:19 UTC (rev 116367)
@@ -4,7 +4,7 @@
 
 pkgname=qt
 pkgver=4.7.2
-pkgrel=3
+pkgrel=4
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/'
@@ -111,11 +111,8 @@
 		-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
 
     # Install QtDeclarative private headers needed by QtCreator (FS#23263)
-    install -d ${pkgdir}/usr/include/QtDeclarative
+    install -d ${pkgdir}/usr/include/QtDeclarative/private
     cd ${srcdir}/$_pkgfqn/src/declarative/
     find . -name *_p.h -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtDeclarative/ \; &> /dev/null
-    cd ${pkgdir}/usr/include/QtDeclarative/
-    sed -i 's|#include <private/|#include <|' *_p.h
-    sed -i 's|#include "private/|#include "|' *_p.h
+      ${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null
 }