Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/dbus-core/PKGBUILD
	extra/dbus/PKGBUILD
	extra/qt/PKGBUILD
	extra/xorg-server/PKGBUILD
	multilib/lib32-dbus-core/PKGBUILD
	testing/cairo/PKGBUILD
	testing/cairo/git_fixes.patch
	testing/glib2/PKGBUILD
	testing/gtk3/PKGBUILD
	testing/networkmanager/PKGBUILD
	testing/python/PKGBUILD

15 files changed, 832 insertions, 28 deletions

diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index 8120d8b36..9e5382388 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 128602 2011-06-24 13:59:34Z ibiru $
+# $Id: PKGBUILD 156109 2012-04-14 07:40:13Z andyrtr $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dbus-python
-pkgver=0.84.0
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Python bindings for DBUS"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-depends=('dbus-glib' 'python2')
-makedepends=('pkg-config' 'docutils')
+depends=('dbus-core' 'python2')
+makedepends=('docutils' 'dbus-glib')
+optdepends=('dbus-glib: glib mainloop support')
 options=('!libtool')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('fe69a2613e824463e74f10913708c88a')
+md5sums=('775a8235736bf760cdd96e2d76546469')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/dbus/30-dbus b/extra/dbus/30-dbus
index 603e92d3e..69d2660da 100644
--- a/extra/dbus/30-dbus
+++ b/extra/dbus/30-dbus
@@ -6,4 +6,3 @@ dbuslaunch="`which dbus-launch 2>/dev/null`"
 if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
   eval `$dbuslaunch --sh-syntax --exit-with-session`
 fi
-
diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD
index 46e810395..17f83e1f2 100644
--- a/extra/dbus/PKGBUILD
+++ b/extra/dbus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140077 2011-10-06 07:35:45Z ibiru $
+# $Id: PKGBUILD 156107 2012-04-14 07:40:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.4.16
-pkgrel=1.1
+pkgver=1.4.20
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL' 'custom')
 depends=("dbus-core>=${pkgver}" 'libx11')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
         30-dbus)
-md5sums=('44a2a10678e7e50460879c3eb4453a65'
-         'd14e59575f04e55d21a04907b6fd9f3c')
+md5sums=('79eca2f2c1894ac347acce128314428b'
+         '9fafe8b28460aeaa6054309ef4c5ed92')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index b943786ca..e87adfe29 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154452 2012-03-28 18:46:15Z foutrelis $
+# $Id: PKGBUILD 156139 2012-04-14 11:33:09Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 pkgname=garcon
-pkgver=0.1.11
+pkgver=0.1.12
 pkgrel=1
 pkgdesc="Implementation of the freedesktop.org menu specification"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,12 +15,13 @@ makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
 replaces=('libxfce4menu')
 options=('!libtool' '!makeflags')
 source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2)
-sha256sums=('272c1207a3449ce969a86ebdc61c6afcad05003f0a986e222bb90c01c1692dfc')
+sha256sums=('bb5145fff4f09fd20db114918d76212ce7b55bd8b0540e2bf26248e6af1902c8')
 
 build() {
   cd "$srcdir/garcon-$pkgver"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 4173fb9d6..1ce8ead12 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153265 2012-03-12 17:50:21Z andrea $
+# $Id: PKGBUILD 156129 2012-04-14 10:02:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk2
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ conflicts=('oxygen-gtk')
 replaces=('oxygen-gtk')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('88cc3da77fec3802564b6d16b4268300')
+md5sums=('e829b07082280bc0744623ae477b550e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index 5e8587085..09bf2af92 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153267 2012-03-12 17:51:08Z andrea $
+# $Id: PKGBUILD 156131 2012-04-14 10:03:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=oxygen-gtk3
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('gtk3' 'dbus-glib')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('3e884df6afe8a549063748ff12b5065c')
+md5sums=('a60a0548826916313197943e89a08455')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 26fc428d1..be87f4b35 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 154524 2012-03-29 20:18:01Z andrea $
+# $Id: PKGBUILD 156133 2012-04-14 10:06:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.8.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
+makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' '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' 'cups' 'gtk2')
@@ -19,6 +19,9 @@ source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'qtconfig.desktop'
         'gcc47.patch'
+        'improve-cups-support.patch'
+        'fix-buffer-overflow.patch'
+        'fix-cursortox-crash.patch'
 	'declarative-fix-sigbus.patch')
 md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
          'fc211414130ab2764132e7370f8e5caa'
@@ -26,6 +29,9 @@ md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
          'f11852b97583610f3dbb669ebc3e21bc'
          '6b771c8a81dd90b45e8a79afa0e5bbfd'
          'd8a0e81075b290ddc18ecd33b9b7ee22'
+         'c439c7731c25387352d8453ca7574971'
+         'c493dca3c11fffb9af6719c6735cb0d2'
+         '13171b6aec2f240be05feb968178f70e'
          'aac963d05a9d5733e2bfce9e26607f51')
 
 build() {
@@ -35,6 +41,15 @@ build() {
   patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
 
   patch -p1 -i "${srcdir}"/gcc47.patch
+  
+  # (FS#29158)
+  patch -p1 -i "${srcdir}"/fix-buffer-overflow.patch
+  
+  # (FS#29402) (QTBUG#24718)
+  patch -p1 -i "${srcdir}"/fix-cursortox-crash.patch
+
+  # (FS#28381) (KDEBUG#180051)
+  patch -p1 -i "${srcdir}"/improve-cups-support.patch
 
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
@@ -76,7 +91,7 @@ build() {
 
 package_qt() {
     pkgdesc='A cross-platform application and UI framework'
-    depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
+    depends=('libtiff' 'libpng' 'libmng' 'sqlite' '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'
diff --git a/extra/qt/fix-buffer-overflow.patch b/extra/qt/fix-buffer-overflow.patch
new file mode 100644
index 000000000..f0334f247
--- /dev/null
+++ b/extra/qt/fix-buffer-overflow.patch
@@ -0,0 +1,34 @@
+From 827e5c4c689d4ecb4f8c1ab48c9a7ab712fe2ca7 Mon Sep 17 00:00:00 2001
+From: John Tapsell <john.tapsell.ext@basyskom.com>
+Date: Mon, 12 Mar 2012 22:07:47 +0000
+Subject: [PATCH] Harfbuzz-thai - fix buffer overflow when setting item
+ attributes
+
+Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713
+Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
+---
+ src/3rdparty/harfbuzz/src/harfbuzz-thai.c          |    9 +++++-
+ .../qtextscriptengine/tst_qtextscriptengine.cpp    |   29 ++++++++++++++++++++
+ 2 files changed, 36 insertions(+), 2 deletions(-)
+
+diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
+index bf6c35b..3c0ffe8 100644
+--- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
++++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
+@@ -263,8 +263,13 @@ static HB_Bool HB_ThaiConvertStringToGlyphIndices (HB_ShaperItem *item)
+                 // The only glyphs that should be passed to this function that cannot be mapped to
+                 // tis620 are the ones of type Inherited class.  Pass these glyphs untouched.
+                 glyphString[slen++] = string[i];
+-                if (string[i] == 0x200D || string[i] == 0x200C)
+-                    item->attributes[slen-1].dontPrint = true; // Hide ZWJ and ZWNJ characters
++                if (string[i] == 0x200D || string[i] == 0x200C) {
++                    // Check that we do not run out of bounds when setting item->attributes.  If we do
++                    // run out of bounds then this function will return false, the necessary amount of
++                    // memory is reallocated, and this function will then be called again.
++                    if (slen <= item->num_glyphs)
++                        item->attributes[slen-1].dontPrint = true; // Hide ZWJ and ZWNJ characters
++                }
+             } else {
+                 glyphString[slen++] = (HB_UChar16) thai_get_glyph_index (font_type, rglyphs[lgi]);
+             }
+
diff --git a/extra/qt/fix-cursortox-crash.patch b/extra/qt/fix-cursortox-crash.patch
new file mode 100644
index 000000000..fbc9c1370
--- /dev/null
+++ b/extra/qt/fix-cursortox-crash.patch
@@ -0,0 +1,32 @@
+Index: fix-cursortox-crash.patch
+===================================================================
+--- fix-cursortox-crash.patch	(revision 0)
++++ fix-cursortox-crash.patch	(arbetskopia)
+#commit cac12f4592477d99ef6fffaad40345bf85ef53b5
+#Author: Jiang Jiang <jiang.jiang@nokia.com>
+#Date:   Mon Apr 2 12:32:05 2012 +0200
+#
+#    Fix a crash in cursorToX() when new block is added
+#    
+#    When an empty new block is being added, the layoutData->memory data
+#    will be 0, thus QTextEngine::attributes() will return 0. We should
+#    only access the attributes pointer when some text actually exist.
+#    
+#    Task-number: QTBUG-24718
+#    Change-Id: I9ce9f7b57bccf24099a02832ce30fb6cebfaad33
+#
+diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
+index ee658d9..16f7150 100644
+--- a/src/gui/text/qtextlayout.cpp
++++ b/src/gui/text/qtextlayout.cpp
+@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
+     int pos = *cursorPos;
+     int itm;
+     const HB_CharAttributes *attributes = eng->attributes();
++    if (!attributes) {
++        *cursorPos = 0;
++        return x.toReal();
++    }
+     while (pos < line.from + line.length && !attributes[pos].charStop)
+         pos++;
+     if (pos == line.from + (int)line.length) {
diff --git a/extra/qt/improve-cups-support.patch b/extra/qt/improve-cups-support.patch
new file mode 100644
index 000000000..e0305e11b
--- /dev/null
+++ b/extra/qt/improve-cups-support.patch
@@ -0,0 +1,84 @@
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
+@@ -569,6 +569,32 @@
+ void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
+ {
+     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
++
++    if (cups) {
++        const ppd_option_t* duplex = cups->ppdOption("Duplex");
++        if (duplex) {
++            // copy default ppd duplex to qt dialog
++            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++                options.duplexShort->setChecked(true);
++            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++                options.duplexLong->setChecked(true);
++            else
++                options.noDuplex->setChecked(true);
++        }
++
++        if (cups->currentPPD()) {
++            // set default color
++            if (cups->currentPPD()->color_device)
++                options.color->setChecked(true);
++            else
++                options.grayscale->setChecked(true);
++        }
++
++        // set collation
++        const ppd_option_t *collate = cups->ppdOption("Collate");
++        if (collate)
++            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
++    }
+ }
+ #endif
+ 
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
+@@ -627,6 +627,44 @@
+                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
+         setOutputFormat(QPrinter::PdfFormat);
+     }
++
++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
++    // fill in defaults from ppd file
++    QCUPSSupport cups;
++
++    int printernum = -1;
++    for (int i = 0; i < cups.availablePrintersCount(); i++) {
++        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
++            printernum = i;
++    }
++    if (printernum >= 0) {
++        cups.setCurrentPrinter(printernum);
++
++        const ppd_option_t* duplex = cups.ppdOption("Duplex");
++        if (duplex) {
++            // copy default ppd duplex to qt dialog
++            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++                setDuplex(DuplexShortSide);
++            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++                setDuplex(DuplexLongSide);
++            else
++                setDuplex(DuplexNone);
++        }
++
++        if (cups.currentPPD()) {
++            // set default color
++            if (cups.currentPPD()->color_device)
++                setColorMode(Color);
++            else
++                setColorMode(GrayScale);
++        }
++
++        // set collation
++        const ppd_option_t *collate = cups.ppdOption("Collate");
++        if (collate)
++            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
++    }
++#endif
+ }
+ 
+ /*!
diff --git a/extra/xbase/PKGBUILD b/extra/xbase/PKGBUILD
new file mode 100644
index 000000000..0fa63a7fa
--- /dev/null
+++ b/extra/xbase/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 156152 2012-04-14 16:31:07Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+pkgname=xbase
+pkgver=2.0.0
+pkgrel=2
+pkgdesc="An XBase compatible C++ class library"
+arch=('i686' 'x86_64')
+url='http://linux.techass.com/projects/xdb/'
+license=('LGPL')
+depends=('bash' 'gcc-libs')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/xdb/${pkgname}-${pkgver}.tar.gz"
+        'fix-build.patch'
+        'gcc43.patch'
+        'gcc47.patch')
+md5sums=('9b29362031716a12491beb9f8cc882f2'
+         'f66c1d19a51552b1748ab9158156b103'
+         '0d5a59a59eb2c79d172bd4339de35372'
+         '879bf5107605eee2cbec2dca116edac6')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i "${srcdir}/fix-build.patch"
+  patch -p1 -i "${srcdir}/gcc43.patch"
+  patch -p1 -i "${srcdir}/gcc47.patch"
+ 
+  # Workaround to build on x86_64
+  ./configure --host=i686-pc-linux-gnu --prefix=/usr
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -k check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/xbase/fix-build.patch b/extra/xbase/fix-build.patch
new file mode 100644
index 000000000..c5ff720da
--- /dev/null
+++ b/extra/xbase/fix-build.patch
@@ -0,0 +1,11 @@
+--- xbase-2.0.0/xbase/ntx.h.orig	2006-04-09 07:40:43.000000000 -0400
++++ xbase-2.0.0/xbase/ntx.h	2006-04-09 07:40:53.000000000 -0400
+@@ -218,7 +218,7 @@ class XBDLLEXPORT xbNtx : public xbIndex
+    xbShort  KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }
+    xbShort  KeyExists( xbDouble );
+ 
+-   xbShort xbNtx::AllocKeyBufs(void);
++   xbShort AllocKeyBufs(void);
+ 
+    virtual void GetExpression(char *buf, int len);
+ };
diff --git a/extra/xbase/gcc43.patch b/extra/xbase/gcc43.patch
new file mode 100644
index 000000000..933682a2c
--- /dev/null
+++ b/extra/xbase/gcc43.patch
@@ -0,0 +1,573 @@
+diff -up xbase-2.0.0/xbase/xbstring.h.gcc43 xbase-2.0.0/xbase/xbstring.h
+--- xbase-2.0.0/xbase/xbstring.h.gcc43	2001-01-27 06:00:32.000000000 +0100
++++ xbase-2.0.0/xbase/xbstring.h	2008-03-11 20:21:20.000000000 +0100
+@@ -56,7 +56,7 @@
+ #endif
+ 
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ /*! \file xbstring.h
+ */
+@@ -119,7 +119,7 @@ public:
+   bool operator <= ( const xbString& ) const;
+   bool operator >= ( const xbString& ) const;
+ 
+-  friend ostream& operator << ( ostream&, const xbString& );
++  friend std::ostream& operator << ( std::ostream&, const xbString& );
+ 
+   xbString &remove(size_t pos = 0, int n = npos);
+   xbString mid(size_t pos = 0, int n = npos) const;
+diff -up xbase-2.0.0/xbase/dbf.cpp.gcc43 xbase-2.0.0/xbase/dbf.cpp
+--- xbase-2.0.0/xbase/dbf.cpp.gcc43	2008-03-11 20:24:01.000000000 +0100
++++ xbase-2.0.0/xbase/dbf.cpp	2008-03-11 20:25:01.000000000 +0100
+@@ -79,6 +79,9 @@
+ 
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++using std::endl;
++
+ /*! \file dbf.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/xbstring.cpp.gcc43 xbase-2.0.0/xbase/xbstring.cpp
+--- xbase-2.0.0/xbase/xbstring.cpp.gcc43	2008-03-11 20:33:00.000000000 +0100
++++ xbase-2.0.0/xbase/xbstring.cpp	2008-03-11 20:33:00.000000000 +0100
+@@ -582,7 +582,7 @@ bool xbString::operator>=( const xbStrin
+ //! Short description.
+ /*!
+ */
+-XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) {
++XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) {
+   return os << xbs.data;
+ }
+ 
+diff -up xbase-2.0.0/xbase/exp.cpp.gcc43 xbase-2.0.0/xbase/exp.cpp
+--- xbase-2.0.0/xbase/exp.cpp.gcc43	2008-03-11 20:23:54.000000000 +0100
++++ xbase-2.0.0/xbase/exp.cpp	2008-03-11 20:24:30.000000000 +0100
+@@ -64,6 +64,8 @@
+ 
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++
+ /*! \file exp.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/html.cpp.gcc43 xbase-2.0.0/xbase/html.cpp
+--- xbase-2.0.0/xbase/html.cpp.gcc43	2008-03-11 20:27:18.000000000 +0100
++++ xbase-2.0.0/xbase/html.cpp	2008-03-11 20:28:56.000000000 +0100
+@@ -68,6 +68,9 @@
+ 
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++using std::endl;
++
+ /*! \file html.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/ntx.cpp.gcc43 xbase-2.0.0/xbase/ntx.cpp
+--- xbase-2.0.0/xbase/ntx.cpp.gcc43	2008-03-11 20:33:48.000000000 +0100
++++ xbase-2.0.0/xbase/ntx.cpp	2008-03-11 20:33:59.000000000 +0100
+@@ -75,6 +75,9 @@
+ 
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++using std::endl;
++
+ /*! \file ntx.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/xbase.cpp.gcc43 xbase-2.0.0/xbase/xbase.cpp
+--- xbase-2.0.0/xbase/xbase.cpp.gcc43	2008-03-11 20:32:08.000000000 +0100
++++ xbase-2.0.0/xbase/xbase.cpp	2008-03-11 20:32:08.000000000 +0100
+@@ -62,6 +62,9 @@
+ 
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++using std::endl;
++
+ /*! \file xbase.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/stack.cpp.gcc43 xbase-2.0.0/xbase/stack.cpp
+--- xbase-2.0.0/xbase/stack.cpp.gcc43	2000-11-10 20:04:17.000000000 +0100
++++ xbase-2.0.0/xbase/stack.cpp	2008-03-11 20:31:16.000000000 +0100
+@@ -59,10 +59,12 @@
+ 
+ #include <string.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include <xbase/xstack.h>
+ 
++using std::cout;
++
+ /*! \file stack.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/ndx.cpp.gcc43 xbase-2.0.0/xbase/ndx.cpp
+--- xbase-2.0.0/xbase/ndx.cpp.gcc43	2001-03-21 01:28:53.000000000 +0100
++++ xbase-2.0.0/xbase/ndx.cpp	2008-03-11 20:21:20.000000000 +0100
+@@ -66,7 +66,9 @@
+ #endif
+ 
+ #include <xbase/xbase.h>
+-#include <iostream.h>
++#include <iostream>
++
++using std::cout; 
+ 
+ #ifdef XB_INDEX_NDX
+ 
+diff -up xbase-2.0.0/xbase/expfunc.cpp.gcc43 xbase-2.0.0/xbase/expfunc.cpp
+--- xbase-2.0.0/xbase/expfunc.cpp.gcc43	2008-03-11 20:26:54.000000000 +0100
++++ xbase-2.0.0/xbase/expfunc.cpp	2008-03-11 20:26:54.000000000 +0100
+@@ -64,6 +64,7 @@
+ #include <xbase/exp.h>
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
+ 
+ /*! \file expfunc.cpp
+ */
+diff -up xbase-2.0.0/xbase/memo.cpp.gcc43 xbase-2.0.0/xbase/memo.cpp
+--- xbase-2.0.0/xbase/memo.cpp.gcc43	2008-03-11 20:30:29.000000000 +0100
++++ xbase-2.0.0/xbase/memo.cpp	2008-03-11 20:30:40.000000000 +0100
+@@ -59,6 +59,8 @@
+ #include <stdio.h>
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++
+ /*! \file memo.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/xbfilter.cpp.gcc43 xbase-2.0.0/xbase/xbfilter.cpp
+--- xbase-2.0.0/xbase/xbfilter.cpp.gcc43	2008-03-11 20:34:21.000000000 +0100
++++ xbase-2.0.0/xbase/xbfilter.cpp	2008-03-11 20:34:25.000000000 +0100
+@@ -60,6 +60,9 @@
+ #include <xbase/xbase.h>
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++using std::endl;
++
+ /*! \file xbfilter.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/html.h.gcc43 xbase-2.0.0/xbase/html.h
+--- xbase-2.0.0/xbase/html.h.gcc43	2008-03-11 20:25:52.000000000 +0100
++++ xbase-2.0.0/xbase/html.h	2008-03-11 20:26:22.000000000 +0100
+@@ -66,6 +66,8 @@
+ 
+ #include <xbase/xtypes.h>
+ 
++#include <iostream>
++
+ /*! \file html.h
+ */
+ 
+@@ -92,28 +94,28 @@ public:
+    //! Short description.
+    /*!
+    */
+-   void   BoldOff( void ) { cout << "</b>\n"; };
++   void   BoldOff( void ) { std::cout << "</b>\n"; };
+    //! Short description.
+    /*!
+    */
+-   void   BoldOn( void ) { cout << "<b>"; };
++   void   BoldOn( void ) { std::cout << "<b>"; };
+    //! Short description.
+    /*!
+    */
+-   void   Bullet( void ) { cout << "<li>"; };
++   void   Bullet( void ) { std::cout << "<li>"; };
+    void   DumpArray( void );
+    //! Short description.
+    /*!
+    */
+-   void   EmphasizeOff( void ) { cout << "</em>\n"; };
++   void   EmphasizeOff( void ) { std::cout << "</em>\n"; };
+    //! Short description.
+    /*!
+    */
+-   void   EmphasizeOn( void ) { cout << "<em>"; };
++   void   EmphasizeOn( void ) { std::cout << "<em>"; };
+    //! Short description.
+    /*!
+    */
+-   void   EndHtmlPage( void ) { cout << "</BODY>\n</HTML>\n"; }
++   void   EndHtmlPage( void ) { std::cout << "</BODY>\n</HTML>\n"; }
+    xbShort  GenFormFields(xbDbf *d, xbShort Option,const char * Title,xbFieldList *fl);
+    xbShort  GetArrayNo( const char * FieldName );
+    const  char * GetCookie( const char *CookieName );
+@@ -124,47 +126,47 @@ public:
+    //! Short description.
+    /*!
+    */
+-   void   HeaderOff( xbShort i ){ cout << "</h" << i << ">\n"; };
++   void   HeaderOff( xbShort i ){ std::cout << "</h" << i << ">\n"; };
+    //! Short description.
+    /*!
+    */
+-   void   HeaderOn( xbShort i ){ cout << "<h" << i << ">\n"; };
++   void   HeaderOn( xbShort i ){ std::cout << "<h" << i << ">\n"; };
+    //! Short description.
+    /*!
+    */
+-   void   ItalicOff( void ) { cout << "</i>\n"; };
++   void   ItalicOff( void ) { std::cout << "</i>\n"; };
+    //! Short description.
+    /*!
+    */
+-   void   ItalicOn( void ) { cout << "<i>"; };
++   void   ItalicOn( void ) { std::cout << "<i>"; };
+    //! Short description.
+    /*!
+    */
+-   void   NewLine( void ) { cout << "<br>"; }
++   void   NewLine( void ) { std::cout << "<br>"; }
+    xbShort  PostMethod( void );
+    void   PrintEncodedChar( char );
+    void   PrintEncodedString( const char *s );
+    //! Short description.
+    /*!
+    */
+-   void   PrintHtml( char * s ) { cout << s; };
++   void   PrintHtml( char * s ) { std::cout << s; };
+    //! Short description.
+    /*!
+    */
+-   void   PrintHtml( xbLong l ) { cout << l; };
++   void   PrintHtml( xbLong l ) { std::cout << l; };
+    //! Short description.
+    /*!
+    */
+-   void   PrintHtml( xbShort i ) { cout << i; };
++   void   PrintHtml( xbShort i ) { std::cout << i; };
+    //! Short description.
+    /*!
+    */
+-   void   PrintHtml( int i ) { cout << i; };
++   void   PrintHtml( int i ) { std::cout << i; };
+    void   StartHtmlPage( const char *Title );
+    //! Short description.
+    /*!
+    */
+-   void   StartTextPage( void ) { cout << "Content-type: text/plain\n\n"; }
++   void   StartTextPage( void ) { std::cout << "Content-type: text/plain\n\n"; }
+    void   TextOut( const char *String );
+    xbLong   Tally( const char *FileName );
+    xbShort  SetCookie(const char *Name, const char *Value, const char *ExpDate,
+diff -up xbase-2.0.0/xbase/dbf.h.gcc43 xbase-2.0.0/xbase/dbf.h
+--- xbase-2.0.0/xbase/dbf.h.gcc43	2001-01-13 21:20:53.000000000 +0100
++++ xbase-2.0.0/xbase/dbf.h	2008-03-11 20:21:20.000000000 +0100
+@@ -65,7 +65,6 @@
+ #include <xbase/xtypes.h>
+ #include <xbase/xdate.h>
+ 
+-#include <iostream.h>
+ #include <stdio.h>
+ 
+ /*! \file dbf.h
+diff -up xbase-2.0.0/examples/sample1.cpp.gcc43 xbase-2.0.0/examples/sample1.cpp
+--- xbase-2.0.0/examples/sample1.cpp.gcc43	2008-03-11 20:35:01.000000000 +0100
++++ xbase-2.0.0/examples/sample1.cpp	2008-03-11 20:36:40.000000000 +0100
+@@ -47,6 +47,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++
+ /* set the stack large for dos compiles */
+ #ifdef __XBDOS
+ #include <stdio.h>
+diff -up xbase-2.0.0/examples/sample2.cpp.gcc43 xbase-2.0.0/examples/sample2.cpp
+--- xbase-2.0.0/examples/sample2.cpp.gcc43	2008-03-11 20:36:03.000000000 +0100
++++ xbase-2.0.0/examples/sample2.cpp	2008-03-11 20:36:41.000000000 +0100
+@@ -53,6 +53,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++
+ /* set the stack large for dos compiles */
+ #ifdef __XBDOS
+ #include <stdio.h>
+diff -up xbase-2.0.0/examples/sample5.cpp.gcc43 xbase-2.0.0/examples/sample5.cpp
+--- xbase-2.0.0/examples/sample5.cpp.gcc43	2008-03-11 20:36:36.000000000 +0100
++++ xbase-2.0.0/examples/sample5.cpp	2008-03-11 20:36:40.000000000 +0100
+@@ -45,6 +45,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++
+ /* set the stack large for dos compiles */
+ #ifdef __XBDOS
+ #include <stdio.h>
+diff -up xbase-2.0.0/examples/sample4.cpp.gcc43 xbase-2.0.0/examples/sample4.cpp
+--- xbase-2.0.0/examples/sample4.cpp.gcc43	2008-03-11 20:36:25.000000000 +0100
++++ xbase-2.0.0/examples/sample4.cpp	2008-03-11 20:36:47.000000000 +0100
+@@ -51,6 +51,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++
+ #ifdef __XBDOS
+ #include <stdio.h>
+ extern unsigned _stklen = 100000;
+diff -up xbase-2.0.0/examples/exfilter.cpp.gcc43 xbase-2.0.0/examples/exfilter.cpp
+--- xbase-2.0.0/examples/exfilter.cpp.gcc43	2008-03-11 20:37:14.000000000 +0100
++++ xbase-2.0.0/examples/exfilter.cpp	2008-03-11 20:37:28.000000000 +0100
+@@ -50,6 +50,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
+ 
+ int main()
+ {
+diff -up xbase-2.0.0/examples/sample3.cpp.gcc43 xbase-2.0.0/examples/sample3.cpp
+--- xbase-2.0.0/examples/sample3.cpp.gcc43	2008-03-11 20:36:10.000000000 +0100
++++ xbase-2.0.0/examples/sample3.cpp	2008-03-11 20:36:46.000000000 +0100
+@@ -54,6 +54,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ /* set the stack large for dos compiles */
+ #ifdef __XBDOS
+ #include <stdio.h>
+diff -up xbase-2.0.0/bin/undelall.cpp.gcc43 xbase-2.0.0/bin/undelall.cpp
+--- xbase-2.0.0/bin/undelall.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/undelall.cpp	2008-03-11 20:40:33.000000000 +0100
+@@ -45,6 +45,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main(int ac,char** av)
+ {
+     if (ac <= 1) {
+diff -up xbase-2.0.0/bin/checkndx.cpp.gcc43 xbase-2.0.0/bin/checkndx.cpp
+--- xbase-2.0.0/bin/checkndx.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/checkndx.cpp	2008-03-11 20:40:29.000000000 +0100
+@@ -45,6 +45,8 @@
+ 
+ #include "xbase/xbase.h"
+ 
++using std::cout;
++
+ int main(int ac,char** av)
+ {
+ #ifdef XBASE_DEBUG
+diff -up xbase-2.0.0/bin/packdbf.cpp.gcc43 xbase-2.0.0/bin/packdbf.cpp
+--- xbase-2.0.0/bin/packdbf.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/packdbf.cpp	2008-03-11 20:40:32.000000000 +0100
+@@ -46,6 +46,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main(int ac,char** av)
+ {
+     if (ac <= 1) {
+diff -up xbase-2.0.0/bin/zap.cpp.gcc43 xbase-2.0.0/bin/zap.cpp
+--- xbase-2.0.0/bin/zap.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/zap.cpp	2008-03-11 20:40:33.000000000 +0100
+@@ -45,6 +45,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main(int ac,char** av)
+ {
+    if (ac <= 1) {
+diff -up xbase-2.0.0/bin/reindex.cpp.gcc43 xbase-2.0.0/bin/reindex.cpp
+--- xbase-2.0.0/bin/reindex.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/reindex.cpp	2008-03-11 20:40:32.000000000 +0100
+@@ -47,6 +47,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ static void
+ showStatus(xbLong itemNum, xbLong numItems)
+ {
+diff -up xbase-2.0.0/bin/copydbf.cpp.gcc43 xbase-2.0.0/bin/copydbf.cpp
+--- xbase-2.0.0/bin/copydbf.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/copydbf.cpp	2008-03-11 20:40:29.000000000 +0100
+@@ -44,6 +44,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++
+ int main(int ac,char** av)
+ {
+    if (3 != ac) {
+diff -up xbase-2.0.0/bin/deletall.cpp.gcc43 xbase-2.0.0/bin/deletall.cpp
+--- xbase-2.0.0/bin/deletall.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/deletall.cpp	2008-03-11 20:40:30.000000000 +0100
+@@ -45,6 +45,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main(int ac,char** av)
+ {
+     if (ac <= 1) {
+diff -up xbase-2.0.0/bin/dumphdr.cpp.gcc43 xbase-2.0.0/bin/dumphdr.cpp
+--- xbase-2.0.0/bin/dumphdr.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/dumphdr.cpp	2008-03-11 20:40:31.000000000 +0100
+@@ -47,6 +47,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main( int ac, char ** av )
+ {
+ #ifdef XBASE_DEBUG
+diff -up xbase-2.0.0/bin/dumprecs.cpp.gcc43 xbase-2.0.0/bin/dumprecs.cpp
+--- xbase-2.0.0/bin/dumprecs.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/dumprecs.cpp	2008-03-11 20:40:31.000000000 +0100
+@@ -52,6 +52,9 @@
+ #include <xbase/xbexcept.h>
+ #endif
+ 
++using std::cout;
++using std::endl;
++
+ int main(int ac,char** av)
+ {
+     if (ac <= 1) {
+diff -up xbase-2.0.0/bin/dumpdbt.cpp.gcc43 xbase-2.0.0/bin/dumpdbt.cpp
+--- xbase-2.0.0/bin/dumpdbt.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/dumpdbt.cpp	2008-03-11 20:40:31.000000000 +0100
+@@ -47,6 +47,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main( int ac, char **av )
+ {
+ #ifdef XB_MEMO_FIELDS
+diff -up xbase-2.0.0/bin/dbfxtrct.cpp.gcc43 xbase-2.0.0/bin/dbfxtrct.cpp
+--- xbase-2.0.0/bin/dbfxtrct.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/dbfxtrct.cpp	2008-03-11 20:40:30.000000000 +0100
+@@ -47,6 +47,9 @@
+ 
+ #include "xbase/xbase.h"
+ 
++using std::cout;
++using std::endl;
++
+ /*************************************************************************/
+ void Usage();
+ void Usage()
+diff -up xbase-2.0.0/bin/dbfutil1.cpp.gcc43 xbase-2.0.0/bin/dbfutil1.cpp
+--- xbase-2.0.0/bin/dbfutil1.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/dbfutil1.cpp	2008-03-11 20:41:22.000000000 +0100
+@@ -42,6 +42,10 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::cin;
++using std::endl;
++
+ xbXBase x;
+ xbDbf d( &x );
+ xbIndex *ix;
+diff -up xbase-2.0.0/libtest/indextst.cpp.gcc43 xbase-2.0.0/libtest/indextst.cpp
+--- xbase-2.0.0/libtest/indextst.cpp.gcc43	2008-03-11 20:41:46.000000000 +0100
++++ xbase-2.0.0/libtest/indextst.cpp	2008-03-11 20:42:30.000000000 +0100
+@@ -31,6 +31,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ /* set the stack large for dos compiles */
+ #ifdef __XBDOS
+ #include <stdio.h>
+diff -up xbase-2.0.0/libtest/exptest.cpp.gcc43 xbase-2.0.0/libtest/exptest.cpp
+--- xbase-2.0.0/libtest/exptest.cpp.gcc43	2008-03-11 20:41:46.000000000 +0100
++++ xbase-2.0.0/libtest/exptest.cpp	2008-03-11 20:42:30.000000000 +0100
+@@ -27,6 +27,9 @@
+ 
+ #include "xbase/xbase.h"
+ 
++using std::cout;
++using std::endl;
++
+ class ExpTestor{
+  public:
+   ExpTestor( xbDbf * );
+diff -up xbase-2.0.0/libtest/locktest.cpp.gcc43 xbase-2.0.0/libtest/locktest.cpp
+--- xbase-2.0.0/libtest/locktest.cpp.gcc43	2008-03-11 20:41:46.000000000 +0100
++++ xbase-2.0.0/libtest/locktest.cpp	2008-03-11 20:42:31.000000000 +0100
+@@ -7,6 +7,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main(int, char**)
+ {
+ #if 0 // FIXME - seriously
+diff -up xbase-2.0.0/libtest/testdate.cpp.gcc43 xbase-2.0.0/libtest/testdate.cpp
+--- xbase-2.0.0/libtest/testdate.cpp.gcc43	2008-03-11 20:41:46.000000000 +0100
++++ xbase-2.0.0/libtest/testdate.cpp	2008-03-11 20:42:32.000000000 +0100
+@@ -56,6 +56,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main()
+ {
+    xbString StringDate( "19601007" );      /* oct 7 1960 */
+diff -up xbase-2.0.0/libtest/testhtml.cpp.gcc43 xbase-2.0.0/libtest/testhtml.cpp
+--- xbase-2.0.0/libtest/testhtml.cpp.gcc43	2008-03-11 20:41:46.000000000 +0100
++++ xbase-2.0.0/libtest/testhtml.cpp	2008-03-11 20:42:33.000000000 +0100
+@@ -48,6 +48,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main()
+ {
+ #ifdef XB_HTML
diff --git a/extra/xbase/gcc47.patch b/extra/xbase/gcc47.patch
new file mode 100644
index 000000000..1b9b19307
--- /dev/null
+++ b/extra/xbase/gcc47.patch
@@ -0,0 +1,11 @@
+--- xbase-2.0.0/bin/dumprecs.cpp~	2012-04-14 15:39:16.524933225 +0000
++++ xbase-2.0.0/bin/dumprecs.cpp	2012-04-14 15:39:59.264599200 +0000
+@@ -77,7 +77,7 @@
+      }
+ 
+      cout << "\nLoop through forwards...\n";
+-     int i = 0;
++     i = 0;
+      while(i<MyFile.NoOfRecords()) {
+        MyFile.DumpRecord(i+1);
+        i++;
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index c4b39d7cb..ebad4ce88 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155978 2012-04-10 15:57:30Z andyrtr $
+# $Id: PKGBUILD 156103 2012-04-14 07:35:46Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.0.902
+pkgver=1.12.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -22,7 +22,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run.1
         10-quirks.conf
 	loongson.patch)
-sha1sums=('75c1ee8d10a2ce6f678deeff23c971e31a212dab'
+sha1sums=('922b963901f4711449b53fb32ce3e14f5b642766'
           '63836e5cfb4ae7353fb2e31239a544409c7ead32'
           '175de5630b43dbc97778adfba5563b7fdd77f11f'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'