Fri Jun 10 17:00:28 UTC 2011

1 files changed, 15 insertions, 95 deletions

diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 89e96034f..44a2cff98 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 125344 2011-05-26 00:12:04Z andrea $
+# $Id: PKGBUILD 126981 2011-06-09 07:23:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.7.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')
@@ -32,6 +32,9 @@ build() {
 	export PATH=${QT4DIR}/bin:${PATH}
 	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
+    # FS#24601
+    export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+
 	cd $srcdir/$_pkgfqn
 
     # Already fixed upstream
@@ -125,98 +128,15 @@ package_qt-private-headers(){
     pkgdesc="Qt private headers for development"
     depends=("qt=${pkgver}")
 
-    install -d ${pkgdir}/usr/include/phonon/private
-    cd ${srcdir}/$_pkgfqn/src/3rdparty/phonon/phonon/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/phonon/private/ \; &> /dev/null
-    
-    install -d ${pkgdir}/usr/include/Qt3Support/private
-    cd ${srcdir}/$_pkgfqn/src/qt3support/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/Qt3Support/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtCore/private
-    cd ${srcdir}/$_pkgfqn/src/corelib/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtCore/private/ \; &> /dev/null
+    install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
+    install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script}
     
-    install -d ${pkgdir}/usr/include/QtDBus/private
-    cd ${srcdir}/$_pkgfqn/src/dbus/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtDBus/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtDeclarative/private
-    cd ${srcdir}/$_pkgfqn/src/declarative/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtDesigner/private
-    cd ${srcdir}/$_pkgfqn/tools/designer/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtDesigner/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtGui/private
-    cd ${srcdir}/$_pkgfqn/src/gui/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtGui/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtHelp/private
-    cd ${srcdir}/$_pkgfqn/tools/assistant/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtHelp/private/ \; &> /dev/null
-    
-    install -d ${pkgdir}/usr/include/QtMultimedia/private
-    cd ${srcdir}/$_pkgfqn/src/multimedia/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtMultimedia/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtNetwork/private
-    cd ${srcdir}/$_pkgfqn/src/network/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtNetwork/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtOpenGL/private
-    cd ${srcdir}/$_pkgfqn/src/opengl/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtOpenGL/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtScript/private
-    cd ${srcdir}/$_pkgfqn/src/script/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtScript/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtScriptTools/private
-    cd ${srcdir}/$_pkgfqn/src/scripttools/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtScriptTools/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtSql/private
-    cd ${srcdir}/$_pkgfqn/src/sql/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtSql/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtSvg/private
-    cd ${srcdir}/$_pkgfqn/src/svg/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtSvg/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtTest/private
-    cd ${srcdir}/$_pkgfqn/src/testlib/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtTest/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtUiTools/private
-    cd ${srcdir}/$_pkgfqn/tools/designer/src/uitools
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtUiTools/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtWebKit/private
-    cd ${srcdir}/$_pkgfqn/src/3rdparty/webkit
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtWebKit/private/ \; &> /dev/null
-
-    install -d ${pkgdir}/usr/include/QtXmlPatterns/private
-    cd ${srcdir}/$_pkgfqn/src/xmlpatterns/
-    find . -name "*_p.h" -exec install -m644 {} \
-      ${pkgdir}/usr/include/QtXmlPatterns/private/ \; &> /dev/null
+    for i in QtCore QtDeclarative QtGui QtScript; do
+      cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \
+        ${pkgdir}/usr/include/${i}/
+    done
+
+    for i in corelib declarative gui script; do
+      cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/
+    done
 }