Sun Dec 9 01:45:28 PST 2012

11 files changed, 479 insertions, 21 deletions

diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 9db3fecf7..470d428cf 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 172099 2012-11-28 10:31:24Z jgc $
+# $Id: PKGBUILD 173026 2012-12-08 21:00:09Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=harfbuzz
-pkgver=0.9.7
+pkgver=0.9.9
 pkgrel=1
 pkgdesc="OpenType text shaping engine."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2')
 optdepends=('cairo: hb-view program')
 options=(!libtool)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('bd2999859f8828461fedae23e4af52d926ac32a73245f03ae2d2065205e9cf25')
+sha256sums=('3d8dd4ebbc38da011485ef181f8ff072b4b0d7e305bbda19b355f217d25169cf')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index ce02e317d..24744a6e5 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172811 2012-12-06 08:19:37Z andrea $
+# $Id: PKGBUILD 172989 2012-12-08 06:03:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,17 +13,22 @@ pkgname=('kdebase-dolphin'
          'kdebase-lib'
          'kdebase-plasma')
 pkgver=4.9.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
+        'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff')
+sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747'
+          '998f1db2309744dd2c054aec3462a717bc107c2e')
 
 build() {
-	cd ${srcdir}
+    cd kde-baseapps-${pkgver}
+    patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
+    cd ../
+
 	mkdir build
 	cd build
 	cmake ../kde-baseapps-${pkgver} \
diff --git a/extra/kdebase/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff b/extra/kdebase/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
new file mode 100644
index 000000000..9f328ec60
--- /dev/null
+++ b/extra/kdebase/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
@@ -0,0 +1,232 @@
+diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
+index f92cab5..af16954 100644
+--- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
++++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
+@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
+     m_additionalInfoTextColor(),
+     m_overlay(),
+     m_rating(),
+-    m_roleEditor(0)
++    m_roleEditor(0),
++    m_oldRoleEditor(0)
+ {
+ }
+ 
+@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget()
+     m_textInfo.clear();
+ 
+     delete m_roleEditor;
++    delete m_oldRoleEditor;
+ }
+ 
+ void KStandardItemListWidget::setLayout(Layout layout)
+@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
+                        this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
+             disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
+                        this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
+-            // Do not delete the role editor using deleteLater() because we might be
+-            // inside a nested event loop which has been started by one of its event
+-            // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
+-            m_roleEditor->deleteWhenIdle();
++            m_oldRoleEditor = m_roleEditor;
++            m_roleEditor->hide();
+             m_roleEditor = 0;
+         }
+         return;
++    } else if (m_oldRoleEditor) {
++        // Delete the old editor before constructing the new one to
++        // prevent a memory leak.
++        m_oldRoleEditor->deleteLater();
++        m_oldRoleEditor = 0;
+     }
+ 
+     Q_ASSERT(!m_roleEditor);
+@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
+ 
+ void KStandardItemListWidget::closeRoleEditor()
+ {
++    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
++               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
++    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
++               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
++
+     if (m_roleEditor->hasFocus()) {
+         // If the editing was not ended by a FocusOut event, we have
+         // to transfer the keyboard focus back to the KItemListContainer.
+         scene()->views()[0]->parentWidget()->setFocus();
+     }
+ 
+-    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
+-               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
+-    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
+-               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
+-
+-    // Do not delete the role editor using deleteLater() because we might be
+-    // inside a nested event loop which has been started by one of its event
+-    // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
+-    m_roleEditor->deleteWhenIdle();
++    m_oldRoleEditor = m_roleEditor;
++    m_roleEditor->hide();
+     m_roleEditor = 0;
+ }
+ 
+diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h
+index 787722d..386f60e 100644
+--- a/dolphin/src/kitemviews/kstandarditemlistwidget.h
++++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h
+@@ -241,6 +241,7 @@ private:
+     QPixmap m_rating;
+ 
+     KItemListRoleEditor* m_roleEditor;
++    KItemListRoleEditor* m_oldRoleEditor;
+ 
+     friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
+                                                    // share a common layout calculation
+diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
+index 78dbfe9..1e4b5fd 100644
+--- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
++++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
+@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
+     KTextEdit(parent),
+     m_index(0),
+     m_role(),
+-    m_blockFinishedSignal(false),
+-    m_eventHandlingLevel(0),
+-    m_deleteAfterEventHandling(false)
++    m_blockFinishedSignal(false)
+ {
+     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const
+     return m_role;
+ }
+ 
+-void KItemListRoleEditor::deleteWhenIdle()
+-{
+-    if (m_eventHandlingLevel > 0) {
+-        // We are handling an event at the moment. It could be that we
+-        // are in a nested event loop run by contextMenuEvent() or a
+-        // call of mousePressEvent() which results in drag&drop.
+-        // -> do not call deleteLater() to prevent a crash when we
+-        //    return from the nested event loop.
+-        m_deleteAfterEventHandling = true;
+-    } else {
+-        deleteLater();
+-    }
+-}
+-
+ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
+ {
+     if (watched == parentWidget() && event->type() == QEvent::Resize) {
+@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
+ 
+ bool KItemListRoleEditor::event(QEvent* event)
+ {
+-    ++m_eventHandlingLevel;
+-
+     if (event->type() == QEvent::FocusOut) {
+         QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
+         if (focusEvent->reason() != Qt::PopupFocusReason) {
+             emitRoleEditingFinished();
+         }
+     }
+-
+-    const int result = KTextEdit::event(event);
+-    --m_eventHandlingLevel;
+-
+-    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
+-        // Schedule this object for deletion and make sure that we do not try
+-        // to deleteLater() again when the DeferredDelete event is received.
+-        deleteLater();
+-        m_deleteAfterEventHandling = false;
+-    }
+-
+-    return result;
+-}
+-
+-bool KItemListRoleEditor::viewportEvent(QEvent* event)
+-{
+-    ++m_eventHandlingLevel;
+-    const bool result = KTextEdit::viewportEvent(event);
+-    --m_eventHandlingLevel;
+-
+-    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
+-        // Schedule this object for deletion and make sure that we do not try
+-        // to deleteLater() again when the DeferredDelete event is received.
+-        deleteLater();
+-        m_deleteAfterEventHandling = false;
+-    }
+-
+-    return result;
++    return KTextEdit::event(event);
+ }
+ 
+ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
+@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
+         return;
+     case Qt::Key_Enter:
+     case Qt::Key_Return:
+-        // TODO: find a better way to fix the bug 309760
+-        clearFocus(); // emitRoleEditingFinished(); results in a crash
++        emitRoleEditingFinished();
+         event->accept();
+         return;
+     default:
+diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
+index a2f7058..aa2c977 100644
+--- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h
++++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
+@@ -47,15 +47,6 @@ public:
+     void setRole(const QByteArray& role);
+     QByteArray role() const;
+ 
+-    /**
+-     * Calls deleteLater() if no event is being handled at the moment.
+-     * Otherwise, the deletion is deferred until the event handling is
+-     * finished. This prevents that the deletion happens inside a nested
+-     * event loop which might be run in contextMenuEvent() or
+-     * mouseMoveEvent() because this would probably cause a crash.
+-     */
+-    void deleteWhenIdle();
+-
+     virtual bool eventFilter(QObject* watched, QEvent* event);
+ 
+ signals:
+@@ -64,7 +55,6 @@ signals:
+ 
+ protected:
+     virtual bool event(QEvent* event);
+-    virtual bool viewportEvent(QEvent* event);
+     virtual void keyPressEvent(QKeyEvent* event);
+ 
+ private slots:
+@@ -85,8 +75,6 @@ private:
+     int m_index;
+     QByteArray m_role;
+     bool m_blockFinishedSignal;
+-    int m_eventHandlingLevel;
+-    bool m_deleteAfterEventHandling;
+ };
+ 
+ #endif
+diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
+index 70a7394..0e97c5a 100644
+--- a/dolphin/src/views/dolphinview.cpp
++++ b/dolphin/src/views/dolphinview.cpp
+@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState()
+ 
+         QSet<int> selectedItems = selectionManager->selectedItems();
+ 
+-        for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) {
++        QList<KUrl>::iterator it = m_selectedUrls.begin();
++        while (it != m_selectedUrls.end()) {
+             const int index = m_model->index(*it);
+             if (index >= 0) {
+                 selectedItems.insert(index);
+-                m_selectedUrls.erase(it);
++                it = m_selectedUrls.erase(it);
++            } else {
++                 ++it;
+             }
+         }
+ 
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 538974e47..a1479f087 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=0.9.0.5
+pkgver=0.9.0.6
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha256sums=('aa7a467f1f2a0e1ad22486381284bfb1350d644d5fcf61f8449c475dbec963eb')
+sha256sums=('13fd521abd065117b6bd8091b038d0a7f1270defc24ac501fce54f9c491a4a23')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkolab/PKGBUILD b/extra/libkolab/PKGBUILD
new file mode 100644
index 000000000..af08f281a
--- /dev/null
+++ b/extra/libkolab/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 173021 2012-12-08 17:41:09Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkolab
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="Advanced Kolab Object Handling Library"
+url='http://git.kolab.org/libkolab/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libkolabxml' 'kdepimlibs')
+makedepends=('cmake' 'automoc4' 'boost')
+source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg})
+md5sums=('3ba23bc11c3fb1c852e5b7b9788fed6d'
+         '56052090b7fb89813c3bae1cb5b104c5')
+
+build() {
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD
new file mode 100644
index 000000000..70ff5ff3c
--- /dev/null
+++ b/extra/libkolabxml/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 173016 2012-12-08 17:30:40Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkolabxml
+pkgver=0.8.1
+pkgrel=1
+pkgdesc="Kolab XML Format Schema Definitions Library"
+url='http://git.kolab.org/libkolabxml/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('xerces-c' 'boost-libs')
+makedepends=('cmake' 'boost' 'xsd')
+source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg})
+md5sums=('a02541b35153334c69ee1845dfe464c6'
+         'f5e9bc4a21a5bf06baec084435812cc4')
+
+build() {
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/ltrace/PKGBUILD b/extra/ltrace/PKGBUILD
index de2d548bb..2d5c39256 100644
--- a/extra/ltrace/PKGBUILD
+++ b/extra/ltrace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172160 2012-11-30 11:07:55Z foutrelis $
+# $Id: PKGBUILD 173009 2012-12-08 13:59:15Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ltrace
-pkgver=0.7.1
+pkgver=0.7.2
 pkgrel=1
 pkgdesc="Tracks runtime library calls in dynamically linked programs"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ license=('GPL')
 depends=('elfutils')
 makedepends=('dejagnu')
 backup=('etc/ltrace.conf')
-source=(https://alioth.debian.org/frs/download.php/3844/$pkgname-$pkgver.tar.bz2)
-sha256sums=('9010ab85444c44e2f1b340049b6ce877e41566996f0045af9519ad056ae9b83d')
+source=(https://alioth.debian.org/frs/download.php/3848/$pkgname-$pkgver.tar.bz2)
+sha256sums=('bd9e7bd94ba6728fd3ec57f4bcfef8240260bea8f4fcebbc9c454d07ccc11894')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD
index 157a25d45..ed0ae8855 100644
--- a/extra/openal/PKGBUILD
+++ b/extra/openal/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 155305 2012-04-01 14:23:52Z heftig $
+# $Id: PKGBUILD 173007 2012-12-08 13:24:36Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=openal
-pkgver=1.14
+pkgver=1.15
 pkgrel=1
 pkgdesc="A cross-platform 3D audio library"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ depends=(glibc)
 makedepends=(alsa-lib sdl pkgconfig cmake libpulse)
 options=('!libtool')
 source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2)
-md5sums=('3d8b86c21a2f87a2a5e60f78f3b3f03d')
+md5sums=('0eeb0551420b8fec300fe5db6d9a7902')
 
 build() {
   cd $pkgname-soft-$pkgver/build
@@ -25,5 +25,5 @@ build() {
 package() {
   cd $pkgname-soft-$pkgver
   make -C build DESTDIR="$pkgdir/" install
-  install -Dm644 alsoftrc.sample "$pkgdir/etc/openal/alsoft.conf.sample"
+  install -t "$pkgdir/usr/share/openal" env-vars.txt hrtf.txt
 }
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index 195d58995..3f1bee4c5 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 172098 2012-11-28 10:31:22Z jgc $ 
+# $Id: PKGBUILD 173027 2012-12-08 21:00:11Z heftig $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
-pkgver=1.32.3
+pkgver=1.32.4
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ options=('!libtool')
 install=pango.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
-sha256sums=('19a1a4fa021fcf96261de3cb809295ac06546f2a061c3c623141f2f4989b6a36')
+sha256sums=('9895b2e6572c3b3e0cc1c174b8bf55791a47de1995af21a1787f6c573b4b58db')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/xsd/PKGBUILD b/extra/xsd/PKGBUILD
new file mode 100644
index 000000000..397aa4664
--- /dev/null
+++ b/extra/xsd/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 173014 2012-12-08 17:16:19Z andrea $
+# Maintainer:
+# Contributor: kevku <kevku@gmx.com>
+
+pkgname=xsd
+pkgver=3.3.0
+_pkgver=3.3.0-2+dep
+pkgrel=6
+pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding compiler"
+arch=('i686' 'x86_64')
+url="http://www.codesynthesis.com/products/xsd"
+license=('GPL2')
+depends=('boost-libs' 'xerces-c')
+makedepends=('boost')
+source=("http://www.codesynthesis.com/download/${pkgname}/3.3/${pkgname}-${_pkgver}.tar.bz2"
+        "xsdcxx.patch")
+sha1sums=('1c9de9271f589b8ecf2be18f2e9ac87330fc8281'
+          '8f7ca8bf0440b30d8f5823e0f528db19810706f2')
+
+build() {
+  cd "${pkgname}-${_pkgver}"
+  patch -p0 -i "${srcdir}/xsdcxx.patch"
+
+  make CXXFLAGS="${CXXFLAGS}"
+}
+
+package() {
+  cd ${pkgname}-${_pkgver}
+  make install_prefix="$pkgdir/usr" install
+
+  # Fix conflicts with mono
+  mv "${pkgdir}"/usr/bin/xsd{,cxx}
+  mv "${pkgdir}"/usr/share/man/man1/xsd{,cxx}.1
+}
diff --git a/extra/xsd/xsdcxx.patch b/extra/xsd/xsdcxx.patch
new file mode 100644
index 000000000..51495fb5c
--- /dev/null
+++ b/extra/xsd/xsdcxx.patch
@@ -0,0 +1,128 @@
+diff -up xsd/documentation/xsd.1.rename xsd/documentation/xsd.1
+--- xsd/documentation/xsd.1.rename	2010-06-20 15:45:31.000000000 +0300
++++ xsd/documentation/xsd.1	2010-06-20 15:46:24.000000000 +0300
+@@ -1,16 +1,16 @@
+ .\" Process this file with
+-.\" groff -man -Tascii xsd.1
++.\" groff -man -Tascii xsdcxx.1
+ .\"
+ .TH XSD 1 "April 2010" "XSD 3.3.0"
+ .SH NAME
+-xsd \- W3C XML Schema to C++ Compiler
++xsdcxx \- W3C XML Schema to C++ Compiler
+ .\"
+ .\"
+ .\"
+ .\"--------------------------------------------------------------------
+ .SH SYNOPSIS
+ .\"--------------------------------------------------------------------
+-.B xsd
++.B xsdcxx
+ .I command
+ .B [
+ .I options
+@@ -20,19 +20,19 @@ xsd \- W3C XML Schema to C++ Compiler
+ .I file
+ .B ...]
+ .in
+-.B xsd help
++.B xsdcxx help
+ .B [
+ .I command
+ .B ]
+ .in
+-.B xsd version
++.B xsdcxx version
+ .\"
+ .\"
+ .\"
+ .\"--------------------------------------------------------------------
+ .SH DESCRIPTION
+ .\"--------------------------------------------------------------------
+-.B xsd
++.B xsdcxx
+ generates vocabulary-specific, statically-typed C++ mapping from W3C XML
+ Schema definitions. Particular mapping to produce is selected by a
+ .IR command .
+@@ -96,7 +96,7 @@ Print usage information and exit. Use
+ .PP
+ .RS
+ .RS 3
+-.B xsd help
++.B xsdcxx help
+ .I command
+ .RE
+ .PP
+@@ -203,7 +203,7 @@ For example, if you have file
+ with namespace
+ .B http://example.com/hello
+ and you run
+-.B xsd
++.B xsdcxx
+ on this file, then the string in question will be:
+ 
+ .B hello.xsd. http://example.com/hello
+@@ -1877,7 +1877,7 @@ option. With this approach you don't nee
+ .\"
+ .SH DIAGNOSTICS
+ If the input file is not a valid W3C XML Schema definition,
+-.B xsd
++.B xsdcxx
+ will issue diagnostic messages to
+ .B STDERR
+ and exit with non-zero exit code.
+diff -up xsd/documentation/xsd.xhtml.rename xsd/documentation/xsd.xhtml
+--- xsd/documentation/xsd.xhtml.rename	2010-06-20 15:47:29.000000000 +0300
++++ xsd/documentation/xsd.xhtml	2010-06-20 15:47:30.000000000 +0300
+@@ -50,19 +50,19 @@
+ 
+   <h1>NAME</h1>
+ 
+-  <p>xsd - W3C XML Schema to C++ Compiler</p>
++  <p>xsdcxx - W3C XML Schema to C++ Compiler</p>
+ 
+   <h1>SYNOPSIS</h1>
+ 
+   <dl id="synopsis">
+-    <dt><code><b>xsd</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
+-    <dt><code><b>xsd help</b> [<i>command</i>]</code></dt>
+-    <dt><code><b>xsd version</b></code></dt>
++    <dt><code><b>xsdcxx</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
++    <dt><code><b>xsdcxx help</b> [<i>command</i>]</code></dt>
++    <dt><code><b>xsdcxx version</b></code></dt>
+   </dl>
+ 
+   <h1>DESCRIPTION</h1>
+ 
+-  <p><code><b>xsd</b></code> generates vocabulary-specific, statically-typed
++  <p><code><b>xsdcxx</b></code> generates vocabulary-specific, statically-typed
+   C++ mapping from W3C XML Schema definitions. Particular mapping to
+   produce is selected by a <code><i>command</i></code>. Each mapping has
+   a number of mapping-specific <code><i>options</i></code> that should
+@@ -104,7 +104,7 @@
+ 
+     <dt><code><b>help</b></code></dt>
+     <dd>Print usage information and exit. Use
+-      <p><code><b>xsd help</b> <i>command</i></code></p>
++      <p><code><b>xsdcxx help</b> <i>command</i></code></p>
+       for command-specific help.
+     </dd>
+ 
+@@ -174,7 +174,7 @@
+ 
+       <p>For example, if you have file <code><b>hello.xsd</b></code>
+         with namespace <code><b>http://example.com/hello</b></code> and you run
+-        <code><b>xsd</b></code> on this file, then the string in question
++        <code><b>xsdcxx</b></code> on this file, then the string in question
+         will be:</p>
+ 
+       <p><code><b>hello.xsd. http://example.com/hello</b></code></p>
+@@ -1575,7 +1575,7 @@ namespace .*
+   <h1>DIAGNOSTICS</h1>
+ 
+   <p>If the input file is not a valid W3C XML Schema definition,
+-    <code><b>xsd</b></code> will issue diagnostic messages to STDERR
++    <code><b>xsdcxx</b></code> will issue diagnostic messages to STDERR
+     and exit with non-zero exit code.</p>
+ 
+   <h1>BUGS</h1>