summaryrefslogtreecommitdiff
path: root/extra/qt
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-06-10 14:38:26 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-06-10 14:38:26 -0300
commitf5e137fdf748b757bacfc50577e5d48a693d31c4 (patch)
treec75bdfef17b69eff3b8bb20b285c880d7f9183c0 /extra/qt
parent300b3ee60aef9cfa0a32f5c69aa5e25ad637285f (diff)
parentdd5222c4ae447eb7a6bda08ec5a3c2339852dc16 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/chntpw/PKGBUILD community/hardinfo/PKGBUILD community/obconf/obconf.install community/xplc/PKGBUILD community/zziplib/PKGBUILD core/rp-pppoe/PKGBUILD extra/icedtea-web/PKGBUILD extra/icon-naming-utils/PKGBUILD extra/lxmenu-data/PKGBUILD extra/openbox/PKGBUILD extra/phonon-xine/PKGBUILD extra/qt/PKGBUILD extra/zope-interface/PKGBUILD libre/pacman/PKGBUILD libre/pacman/pacman.conf.mips64el libre/pacman/rePKGBUILD testing/coreutils/PKGBUILD testing/net-tools/PKGBUILD
Diffstat (limited to 'extra/qt')
-rw-r--r--extra/qt/PKGBUILD110
1 files changed, 15 insertions, 95 deletions
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 5667acde8..1c77f0076 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' 'mips64el')
url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
@@ -37,6 +37,9 @@ build() {
export CXXFLAGS="$CXXFLAGS -fpermissive"
fi
+ # FS#24601
+ export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+
cd $srcdir/$_pkgfqn
# Already fixed upstream
@@ -130,98 +133,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
}