Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

Conflicts:
	abs/core/tzdata/PKGBUILD

1 files changed, 57 insertions, 34 deletions

diff --git a/abs/core/qt/PKGBUILD b/abs/core/qt/PKGBUILD
index e1ee827..9c2d93f 100644
--- a/abs/core/qt/PKGBUILD
+++ b/abs/core/qt/PKGBUILD
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD 94734 2010-10-10 14:30:15Z andrea $
+# $Id$
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
-pkgname=qt
-pkgver=4.7.0
-pkgrel=4
-pkgdesc='A cross-platform application and UI framework'
+pkgbase=qt
+pkgname=('qt' 'qt-private-headers')
+pkgver=4.7.3
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')
-depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
-	'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-	'xdg-utils' 'hicolor-icon-theme')
-optdepends=('postgresql-libs: PostgreSQL driver'
-	'libmysqlclient: MySQL driver'
-	'unixodbc: ODBC driver'
-	'libxinerama: Xinerama support'
-	'libxcursor: Xcursor support'
-	'libxfixes: Xfixes support')
-makedepends=('mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'gtk2')
-install="${pkgname}.install"
+makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
+    'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+    'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
+    'mysql' 'unixodbc' 'gtk2')
 options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
-        'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
-        'fix-scroll-when-last-item-is-removed.patch'
-        'fix-multisampling-with-ati-card.patch')
+        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
+        'qtconfig.desktop'
+        'qtbug-16292.patch')
+md5sums=('49b96eefb1224cc529af6fe5608654fe'
+         'fc211414130ab2764132e7370f8e5caa'
+         '85179f5e0437514f8639957e1d8baf62'
+         'f11852b97583610f3dbb669ebc3e21bc'
+         '6b771c8a81dd90b45e8a79afa0e5bbfd'
+         'dc7ed8c2e8c68a175f7f05a34dccc937')
 
 build() {
 	unset QMAKESPEC
@@ -33,17 +32,19 @@ build() {
 	export PATH=${QT4DIR}/bin:${PATH}
 	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
-	cd $srcdir/$_pkgfqn
+    # FS#24601
+    export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
 
-	# Already fixed in 4.7.1
-	patch -Np1 -i ${srcdir}/fix-scroll-when-last-item-is-removed.patch
-	patch -Np1 -i ${srcdir}/fix-multisampling-with-ati-card.patch
+	cd $srcdir/$_pkgfqn
 
-	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
+    # Already fixed upstream
+    patch -p1 -i "${srcdir}"/qtbug-16292.patch
+	
+    sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
 
-	./configure -v -confirm-license -opensource \
+	./configure -confirm-license -opensource \
 		-prefix /usr \
 		-docdir /usr/share/doc/qt \
 		-plugindir /usr/lib/qt/plugins \
@@ -86,8 +87,20 @@ build() {
 	make
 }
 
-package() {
-	cd $srcdir/$_pkgfqn
+package_qt() {
+    pkgdesc='A cross-platform application and UI framework'
+    depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
+      'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+      'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
+    optdepends=('postgresql-libs: PostgreSQL driver'
+	  'libmysqlclient: MySQL driver'
+	  'unixodbc: ODBC driver'
+	  'libxinerama: Xinerama support'
+	  'libxcursor: Xcursor support'
+	  'libxfixes: Xfixes support')
+    install='qt.install'
+	
+    cd $srcdir/$_pkgfqn
 	make INSTALL_ROOT=$pkgdir install
 
 	# install missing icons and desktop files
@@ -111,10 +124,20 @@ package() {
 	find ${pkgdir}/usr/lib -type f -name '*.prl' \
 		-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
 }
-md5sums=('3a2f25b9b115037277f4fb759194a7a5'
-         'a445c6917086d80f1cfc1e40cb6b0132'
-         'd457f0a0ad68a3861c3cadefe3b42ded'
-         '668331d9798a0e2b94381efb7be4c513'
-         'c29f2993d6a0f73d756d2fa36e130e1c'
-         'ef20c34afc5be5ed62f2935be66d9402'
-         'b2e0f134bbb848ebef41134a45a36ee9')
+
+package_qt-private-headers(){
+    pkgdesc="Qt private headers for development"
+    depends=("qt=${pkgver}")
+
+    install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
+    install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script}
+    
+    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
+}