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

11 files changed, 111 insertions, 140 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
+}
diff --git a/abs/core/qt/__changelog b/abs/core/qt/__changelog
index d92474d..2abf977 100644
--- a/abs/core/qt/__changelog
+++ b/abs/core/qt/__changelog
@@ -1,4 +1 @@
 remove cups support
-added QtWebKit_Flash.patch to fix crash with Flash 10.1 and webkit browsers like mythbrowser. http://trac.webkit.org/changeset/61307  This shouldn't be needed in qt versions 4.6.4 or later.
-
-upgrade to 4.7.0
diff --git a/abs/core/qt/assistant.desktop b/abs/core/qt/assistant.desktop
index 1b9f0a7..a9e98c4 100644
--- a/abs/core/qt/assistant.desktop
+++ b/abs/core/qt/assistant.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
-Exec=/usr/bin/assistant
 Name=Qt Assistant
-GenericName=Qt Document Browser
+Comment=Shows Qt documentation and examples
+Exec=/usr/bin/assistant
 Icon=assistant
 Terminal=false
+Encoding=UTF-8
 Type=Application
-Categories=Qt;Development;Documentation
+Categories=Qt;Development;Documentation;
diff --git a/abs/core/qt/designer.desktop b/abs/core/qt/designer.desktop
index 8f36273..9b7b6e9 100644
--- a/abs/core/qt/designer.desktop
+++ b/abs/core/qt/designer.desktop
@@ -1,9 +1,11 @@
 [Desktop Entry]
-Exec=/usr/bin/designer
 Name=Qt Designer
 GenericName=Interface Designer
-MimeType=application/x-designer
+Comment=Design GUIs for Qt applications
+Exec=/usr/bin/designer
 Icon=designer
+MimeType=application/x-designer;
 Terminal=false
+Encoding=UTF-8
 Type=Application
-Categories=Qt;Development;GUIDesigner
+Categories=Qt;Development;
diff --git a/abs/core/qt/fix-multisampling-with-ati-card.patch b/abs/core/qt/fix-multisampling-with-ati-card.patch
deleted file mode 100644
index c215c2c..0000000
--- a/abs/core/qt/fix-multisampling-with-ati-card.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Wed, 25 Aug 2010 14:07:40 +1000
-Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers
-
----
- src/opengl/qgl_win.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp
-index 5ab944a..8eb6177 100644
---- a/src/opengl/qgl_win.cpp
-+++ b/src/opengl/qgl_win.cpp
-@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc)
-         iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB;
-         iAttributes[i++] = TRUE;
-         iAttributes[i++] = WGL_COLOR_BITS_ARB;
--        iAttributes[i++] = 32;
-+        iAttributes[i++] = 24;
-         iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB;
-         iAttributes[i++] = d->glFormat.doubleBuffer();
-         if (d->glFormat.stereo()) {
--- 
-1.7.2.1
-
diff --git a/abs/core/qt/fix-scroll-when-last-item-is-removed.patch b/abs/core/qt/fix-scroll-when-last-item-is-removed.patch
deleted file mode 100644
index 8656702..0000000
--- a/abs/core/qt/fix-scroll-when-last-item-is-removed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001
-From: Frank Reininghaus <frank78ac@googlemail.com>
-Date: Wed, 22 Sep 2010 10:19:59 +0200
-Subject: [PATCH] QTreeView: do not scroll to top if last item is removed
-
-When the last item is the current item and is removed,
-QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's
-viewItems member is cleared. This commit makes sure that viewItems is
-restored by calling QTreeView::doItemsLayout() in this case, preventing
-that the scroll bar range is set to zero temporarily and the view is
-scrolled to the top unexpectedly (this was a regression in 4.7.0:
-QTBUG-13567).
-
-Merge-request: 2481
-Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
----
- src/gui/itemviews/qtreeview.cpp        |    4 ++++
- tests/auto/qtreeview/tst_qtreeview.cpp |   22 ++++++++++++++++++++++
- 2 files changed, 26 insertions(+), 0 deletions(-)
-
-diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
-index b797776..40b51fe 100644
---- a/src/gui/itemviews/qtreeview.cpp
-+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars()
-     if (!viewportSize.isValid())
-         viewportSize = QSize(0, 0);
- 
-+    if (viewItems.isEmpty()) {
-+        q->doItemsLayout();
-+    }
-+
-     int itemsInViewport = 0;
-     if (uniformRowHeights) {
-         if (defaultItemHeight <= 0)
--- 
-1.6.1
-
diff --git a/abs/core/qt/linguist.desktop b/abs/core/qt/linguist.desktop
index 94e92c1..8cbe865 100644
--- a/abs/core/qt/linguist.desktop
+++ b/abs/core/qt/linguist.desktop
@@ -1,9 +1,10 @@
 [Desktop Entry]
-Exec=/usr/bin/linguist
 Name=Qt Linguist
-GenericName=Translation Tool
-MimeType=application/x-linguist
+Comment=Add translations to Qt applications
+Exec=/usr/bin/linguist
+Icon=linguist
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
 Terminal=false
+Encoding=UTF-8
 Type=Application
-Icon=linguist
-Categories=Qt;Development;Translation
+Categories=Qt;Development;
diff --git a/abs/core/qt/qt.install b/abs/core/qt/qt.install
index e70c054..81ce5c4 100644
--- a/abs/core/qt/qt.install
+++ b/abs/core/qt/qt.install
@@ -1,5 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/abs/core/qt/qtconfig.desktop b/abs/core/qt/qtconfig.desktop
index 7c221e5..46dcf9e 100644
--- a/abs/core/qt/qtconfig.desktop
+++ b/abs/core/qt/qtconfig.desktop
@@ -4,5 +4,7 @@ Comment=Configure Qt behavior, styles, fonts
 Exec=/usr/bin/qtconfig
 Icon=qtlogo
 Terminal=false
+Encoding=UTF-8
 Type=Application
 Categories=Qt;Settings;
+NoDisplay=true
diff --git a/abs/extra/community/enca/PKGBUILD b/abs/extra/community/enca/PKGBUILD
index 1bbd7db..e398023 100644
--- a/abs/extra/community/enca/PKGBUILD
+++ b/abs/extra/community/enca/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD,v 1.7 2009/02/27 12:40:33 sergej Exp $
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Filip Dvorak <fila@pruda.com>
 
 pkgname=enca
-pkgver=1.9
-pkgrel=4
+pkgver=1.13
+pkgrel=1
 pkgdesc="Charset analyser and converter"
-arch=(i686 x86_64)
-url="http://trific.ath.cx/software/enca"
+arch=('i686' 'x86_64')
+url="http://freshmeat.net/projects/enca/"
 options=('!libtool')
-license=("GPL")
-depends=()
-source=(http://archlinux-stuff.googlecode.com/files/enca-$pkgver.tar.bz2)
-md5sums=('b3581e28d68d452286fb0bfe58bed3b3')
+license=('GPL')
+depends=('recode' 'sh')
+source=(http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('762bead5d9a0a5e55024e1102baaa89d')
 
 build() {
-  cd $startdir/src/enca-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/enca
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --libexecdir=/usr/lib \
+              --mandir=/usr/share/man \
+              --with-librecode=/usr \
+              --enable-external
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }
-
diff --git a/abs/extra/sysstat/PKGBUILD b/abs/extra/sysstat/PKGBUILD
index 12f5afe..07c36c2 100644
--- a/abs/extra/sysstat/PKGBUILD
+++ b/abs/extra/sysstat/PKGBUILD
@@ -1,35 +1,38 @@
-# $Id: PKGBUILD,v 1.24 2009/05/25 09:04:21 sergej Exp $
+# $Id$
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
-pkgver=9.0.3
+pkgver=10.0.1
 pkgrel=1
-pkgdesc="A collection of performance monitoring tools"
+pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64')
 url="http://pagesperso-orange.fr/sebastien.godard/"
 license=('GPL')
-depends=(glibc)
+depends=('lm_sensors')
+optdepends=('tk: to use isag'
+	    'gnuplot: to use isag')
 options=(zipman)
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
         sysstat)
-md5sums=('0b464951596db934418259737cf50a31'
+md5sums=('a8b12230452dc0e0b6cae5fd5ec3c579'
          'ad46159609a2c13b4a46b506ff847bf6')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
   ./configure --prefix=/usr \
-        --mandir=/usr/share/man \
-        --enable-install-isag \
+	--mandir=/usr/share/man \
+	--enable-install-isag \
 	--disable-man-group
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-
-  install -D -m 644 sysstat.sysconfig $pkgdir/etc/sysstat/sysstat && \
-  install -D -m 744 sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat && \
-  install -D -m 744 sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat && \
-  install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat || return 1
+  make
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m 644 sysstat.sysconfig $pkgdir/etc/sysstat/sysstat
+  install -D -m 744 cron/sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat
+  install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat
+  install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat
   chown -R root:root $pkgdir
 }