Fri May 4 20:00:31 UTC 2012

author: Parabola <dev@list.parabolagnulinux.org> 2012-05-04 20:00:41 +0000
committer: Parabola <dev@list.parabolagnulinux.org> 2012-05-04 20:00:41 +0000
commit: b2c353d874b85e06f355a9419852e2616613c7d0 (patch)
tree: f0773e0a930d308198ef5036d4f74e7f53015e6e /extra
parent: 0a24fb835cac4007388213ad0afb15257b035b14 (diff)
74 files changed, 0 insertions, 5431 deletions
diff --git a/extra/calligra/do-not-build-hancomword.patch b/extra/calligra/do-not-build-hancomword.patch
deleted file mode 100644
index 0c010b706..000000000
--- a/extra/calligra/do-not-build-hancomword.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/filters/words/CMakeLists.txt
-+++ b/filters/words/CMakeLists.txt
-@@ -75,7 +75,6 @@ IF( NOT TINY )
-         add_subdirectory( docbook )
- #	    add_subdirectory( html )
- 	    add_subdirectory( kword1.3 )
--	    add_subdirectory( hancomword )
- 	    add_subdirectory( oowriter )
-         add_subdirectory( palmdoc )
- 	    add_subdirectory( wml )
-
diff --git a/extra/calligra/fix-docx-support.patch b/extra/calligra/fix-docx-support.patch
deleted file mode 100644
index 304e200e3..000000000
--- a/extra/calligra/fix-docx-support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libs/odf/KoXmlWriter.h
-+++ b/libs/odf/KoXmlWriter.h
-@@ -252,6 +252,14 @@ private:
-         Tag(const char* t = 0, bool ind = true)
-                 : tagName(t), hasChildren(false), lastChildIsText(false),
-                 openingTagClosed(false), indentInside(ind) {}
-+        Tag(const Tag &original)
-+        {
-+            tagName = original.tagName;
-+            hasChildren = original.hasChildren;
-+            lastChildIsText = original.lastChildIsText;
-+            openingTagClosed = original.openingTagClosed;
-+            indentInside = original.indentInside;
-+        }
-         const char* tagName;
-         bool hasChildren : 1; ///< element or text children
-         bool lastChildIsText : 1; ///< last child is a text node
-
diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD
deleted file mode 100644
index e5573747c..000000000
--- a/extra/cmus/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 144025 2011-12-02 04:00:48Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=cmus
-pkgver=2.4.3
-pkgrel=1
-pkgdesc="A very feature-rich ncurses-based music player"
-arch=('i686' 'x86_64')
-url="http://cmus.sourceforge.net/"
-license=('GPL')
-depends=('ncurses')
-makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug'
-             'libvorbis' 'libpulse' 'wavpack' 'libmp4v2')
-optdepends=('alsa-lib: for ALSA output plugin support'
-            'libao: for AO output plugin support'
-            'libpulse: for PulseAudio output plugin support'
-            'ffmpeg: for ffmpeg input plugin support'
-            'libmodplug: for modplug input plugin support'
-            'faad2: for input AAC plugin support'
-            'libmad: for mp3 input plugin support'
-            'libmpcdec: for musepack input plugin support'
-            'wavpack: for wavpack input plugin support'
-            'libvorbis: for vorbis input plugin support'
-            'flac: for flac input plugin support'
-            'libmp4v2: for mp4 input plugin support')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
-sha1sums=('ba63a417b0df42fa9a4850dd8b922a95a426f7f5')
-
-build() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  ./configure prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus"
-}
diff --git a/extra/colord/fix-compilation.patch b/extra/colord/fix-compilation.patch
deleted file mode 100644
index b956cb9f6..000000000
--- a/extra/colord/fix-compilation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 638a98fef16fa15946522d4112660b4b20c0d630 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Thu, 23 Feb 2012 10:43:37 +0000
-Subject: [PATCH] trivial: Fix compile with older versions of GLib
-
-g_mapped_file_new_from_fd() was introduced in 2.31.0 not 2.30.0 as the
-docs suggested.
-
-Resoves https://bugs.freedesktop.org/show_bug.cgi?id=46481
----
- src/cd-profile.c |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/src/cd-profile.c b/src/cd-profile.c
-index a292616..323588b 100644
---- a/src/cd-profile.c
-+++ b/src/cd-profile.c
-@@ -1066,7 +1066,17 @@ cd_profile_set_fd (CdProfile *profile,
- 	}
- 
- 	/* create a mapped file */
-+#if GLIB_CHECK_VERSION(2,31,0)
- 	priv->mapped_file = g_mapped_file_new_from_fd (fd, FALSE, error);
-+	if (priv->mapped_file == NULL) {
-+		g_set_error (error,
-+			     CD_MAIN_ERROR,
-+			     CD_MAIN_ERROR_FAILED,
-+			     "failed to create mapped file from fd %i",
-+			     fd);
-+		goto out;
-+	}
-+#endif
- 
- 	/* parse the ICC file */
- 	lcms_profile = cmsOpenProfileFromStream (stream, "r");
--- 
-1.7.6
-
diff --git a/extra/dcron/PKGBUILD b/extra/dcron/PKGBUILD
deleted file mode 100644
index 5583d9267..000000000
--- a/extra/dcron/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Paul Mattal <paul.archlinux.org>
-
-pkgname=dcron
-pkgver=4.5
-pkgrel=2
-pkgdesc="dillon's lightweight cron daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.jimpryor.net/linux/dcron"
-backup=('var/spool/cron/root' 'etc/conf.d/crond')
-depends=('bash')
-provides=('cron')
-conflicts=('cron')
-source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('078833f3281f96944fc30392b1888326')
-optdepends=('smtp-server: sending cron job output via email')
-install=$pkgname.install
-
-build() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-
-	# by default, any member of group "users" can edit their own crontab
-	make \
-		PREFIX=/usr \
-		CRONTAB_GROUP=users \
-		CRONTABS=/var/spool/cron \
-		CRONSTAMPS=/var/spool/cronstamps
-}
-
-package() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-	make DESTDIR="$pkgdir" install
-
-	# install standard configuration and scripts
-	install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} 
-
-	install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron"
-	install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" 
-	install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond"
-	install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond"
-	install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim"
-	sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps
-	install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps"
-}
diff --git a/extra/dcron/dcron.install b/extra/dcron/dcron.install
deleted file mode 100644
index df23d0224..000000000
--- a/extra/dcron/dcron.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_upgrade() {
-	if [ $(vercmp $2 4.0) -lt 0 ]
-	then
-		echo "Restart crond, since you're upgrading to the dcron 4.x series."
-	fi
-}
diff --git a/extra/emelfm2/emelfm2-0.8.0-dsofix.patch b/extra/emelfm2/emelfm2-0.8.0-dsofix.patch
deleted file mode 100644
index e9eb12405..000000000
--- a/extra/emelfm2/emelfm2-0.8.0-dsofix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile	2011-06-06 11:10:28.000000000 +0200
-+++ b/Makefile	2012-02-27 18:20:11.000000000 +0100
-@@ -382,7 +382,7 @@
- 
- $(TARGET): $(OBJECTS)
- 	@echo "linking binary '$(TARGET)'"
--	@$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) -Wl,--as-needed $(lLIBS)
-+	@$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) -lm -ldl -Wl,--as-needed $(lLIBS)
- ifeq ($(STRIP), 1)
- ifneq ($(DEBUG), 1)
- 	@echo "stripping binary '$(TARGET)'"
diff --git a/extra/epiphany-extensions/rss-link-dbus-glib.patch b/extra/epiphany-extensions/rss-link-dbus-glib.patch
deleted file mode 100644
index 1737c49ea..000000000
--- a/extra/epiphany-extensions/rss-link-dbus-glib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2066084961b77810477b658cabbb7f6e90a17b94 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 19 Nov 2011 01:01:12 -0500
-Subject: [PATCH] rss: add DBUS_LIBS to librssextension_la_LIBADD
-
-Otherwise, epiphany-3.2 crashes.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664369
----
- extensions/rss/Makefile.am |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/extensions/rss/Makefile.am b/extensions/rss/Makefile.am
-index ed6962f..da669c8 100644
---- a/extensions/rss/Makefile.am
-+++ b/extensions/rss/Makefile.am
-@@ -25,6 +25,9 @@ librssextension_la_LDFLAGS = \
- 	-export-symbols $(top_srcdir)/ephy-extension.symbols \
- 	$(AM_LDFLAGS)
- 
-+librssextension_la_LIBADD = \
-+	$(DBUS_LIBS)
-+
- uidir = $(pkgdatadir)/ui
- ui_DATA = rss-ui.ui
- 
--- 
-1.7.8.rc3
-
diff --git a/extra/farsight2/PKGBUILD b/extra/farsight2/PKGBUILD
deleted file mode 100644
index 0a74c8618..000000000
--- a/extra/farsight2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 140265 2011-10-11 14:15:08Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: William Díaz <wdiaz@archlinux.us>
-
-pkgname=farsight2
-pkgver=0.0.31
-pkgrel=1
-pkgdesc="Audio/Video conference software for Instant Messengers"
-arch=('i686' 'x86_64')
-url="http://farsight.freedesktop.org"
-license=('LGPL')
-depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good' 'gstreamer0.10-bad' 'gstreamer0.10-python' 'pygobject')
-optdepends=('gstreamer0.10-ugly-plugins: h264 codec')
-options=('!libtool' '!emptydirs')
-source=(http://farsight.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3771d8268f025b28261cc1e977fab27f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-      --with-package-name='Arch Linux farsight2 package' \
-      --with-package-origin='http://archlinux.org' \
-      --disable-static \
-      --disable-valgrind \
-      --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD
deleted file mode 100644
index 7fec6263b..000000000
--- a/extra/foomatic/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 155771 2012-04-06 10:09:10Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
- 
-pkgbase="foomatic"
-pkgname=('foomatic-db' 'foomatic-filters' 'foomatic-db-engine' 'foomatic-db-nonfree')
-arch=('i686' 'x86_64') # needs to be changed  in the subpackages when makepkg will support it
-_snapdate=20120406
-_filtersver=4.0.15
-_enginever=4.0.8
-pkgver=${_filtersver}_${_snapdate}
-pkgrel=1
-epoch=1
-makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
-#_url=http://www.openprinting.org/download/foomatic/ # switch after build
-_url=ftp://ftp.archlinux.org/other/foomatic/
-source=(${_url}/$pkgbase-filters-${_filtersver}.tar.gz
-        ${_url}/$pkgbase-db-engine-${_enginever}.tar.gz
-        ${_url}/$pkgbase-db-4.0-${_snapdate}.tar.gz
-        ${_url}/$pkgbase-db-nonfree-${_snapdate}.tar.gz)
-url="http://www.linuxprinting.org/foomatic.html"
-options=('!emptydirs')
-md5sums=('1b7efcdc57340915647daa5b5c15b0ef'
-         '5283cd5125a96dc0b35d896326512b1a'
-         'ccb72c201e14bfc5eb23ea839ecc0623'
-         '1a2ee1e7b67192b7e3ebad2a4f59ea3e')
-
-package_foomatic-db() {
-
- pkgdesc="Foomatic - The collected knowledge about printers, drivers, and driver options in XML files, used by foomatic-db-engine to generate PPD files."
-# arch=('any')
- license=('GPL' 'custom')
- depends=('perl' 'libxml2')
- replaces=('foomatic-db-ppd' 'foomatic-db-hpijs')
- conflicts=('foomatic-db-ppd' 'foomatic-db-hpijs')
- provides=('foomatic-db-hpijs')
-
-   cd ${srcdir}/${pkgname}-${_snapdate}
-   ./configure --prefix=/usr
-   make DESTDIR=${pkgdir} install
-   install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
-
-package_foomatic-filters() {
-
- pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format."
-# arch=('i686' 'x86_64')
- license=('GPL')
- backup=(etc/foomatic/filter.conf)
- depends=('glibc' 'dbus-core')
- optdepends=('perl:      for the "beh" Backend End Handler used by cups'
-            'net-snmp:  certain (mostly HP) printers need it to work')
-
-   cd ${srcdir}/foomatic-filters-${_filtersver}
-   ./configure --prefix=/usr --sysconfdir=/etc
-   make
-   make DESTDIR=${pkgdir} install
-}
-
-package_foomatic-db-engine() {
-
- pkgdesc="Foomatic - Foomatic's database engine generates PPD files from the data in Foomatic's XML database. It also contains scripts to directly generate print queues and handle jobs."
-# arch=(i686 x86_64)
- license=('GPL')
- depends=('perl' 'libxml2' 'foomatic-filters' 'bash')
-
-   cd ${srcdir}/foomatic-db-engine-${_enginever}
-    ./configure --prefix=/usr
-   make
-   eval `perl -V:archname`
-   make DESTDIR=${pkgdir} \
-        INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \
-        INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \
-        INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install
-   /usr/bin/find ${pkgdir} -name '.packlist' -delete
-   # fix permissions
-   chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
-}
-
-package_foomatic-db-nonfree() {
-
- pkgdesc="Foomatic - database extension consisting of manufacturer-supplied PPD files released under non-free licenses"
-# arch=('any')
- license=('custom')
- depends=('perl' 'libxml2' "foomatic-db-engine" 'foomatic-db')
-
-   cd ${srcdir}/foomatic-db-nonfree-${_snapdate}
-   ./configure --prefix=/usr
-   make DESTDIR=${pkgdir} install
-   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/extra/fuse/fuse.install b/extra/fuse/fuse.install
deleted file mode 100644
index f186d64c7..000000000
--- a/extra/fuse/fuse.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  cat << 'EOM'
-==> You must load the fuse kernel module to use FUSE.
- -> Run 'modprobe fuse' to load the module now.
- -> Add fuse to $MODULES in /etc/rc.conf to load on every boot.
-==> You will need a /dev/fuse device node to use FUSE.
- -> If you use udev, nothing needs to be done
- -> For a static /dev, run: mknod /dev/fuse -m 0666 c 10 229
-EOM
-}
diff --git a/extra/fwbuilder/PKGBUILD b/extra/fwbuilder/PKGBUILD
deleted file mode 100644
index 725cc0c95..000000000
--- a/extra/fwbuilder/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 153570 2012-03-16 04:12:42Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=fwbuilder
-pkgver=5.0.1.3592
-pkgrel=1
-pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
-url="http://www.fwbuilder.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libxslt' 'net-snmp' 'qt')
-conflicts=('libfwbuilder')
-install=fwbuilder.install
-source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz")
-md5sums=('50b567a9752e9dd4f4cd0d988d74d879')
-
-build() {
-  cd "${srcdir}/fwbuilder-${pkgver}"
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/fwbuilder-${pkgver}"
-  make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/extra/fwbuilder/fwbuilder.install b/extra/fwbuilder/fwbuilder.install
deleted file mode 100644
index 45f0c2242..000000000
--- a/extra/fwbuilder/fwbuilder.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
-
diff --git a/extra/gnome-disk-utility/fix-freeze.patch b/extra/gnome-disk-utility/fix-freeze.patch
deleted file mode 100644
index 262748bfb..000000000
--- a/extra/gnome-disk-utility/fix-freeze.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001
-From: Pascal Terjan <pterjan@mandriva.com>
-Date: Mon, 3 May 2010 14:01:22 +0200
-Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198)
-
-GduPresentable created in gdu pool include intheir id some strings
-in local encoding like _("Peripheral Devices"). This patch
-enforces them to be UTF-8.
-
-This fixes a crash of gvfs-gdu-volume-monitor when USB devices are
-available on a non UTF-8 system.
----
- src/gdu/gdu-pool.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
-index bd5eccf..cf6be53 100644
---- a/src/gdu/gdu-pool.c
-+++ b/src/gdu/gdu-pool.c
-@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass)
-                               g_cclosure_marshal_VOID__OBJECT,
-                               G_TYPE_NONE, 1,
-                               GDU_TYPE_PRESENTABLE);
-+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+#endif
- }
- 
- static void
--- 
-1.7.1
-
diff --git a/extra/gnome-games/gnome-sudoku-fix.patch b/extra/gnome-games/gnome-sudoku-fix.patch
deleted file mode 100644
index ec29f34ab..000000000
--- a/extra/gnome-games/gnome-sudoku-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8ab5a3a28281e6b1b649d9ef93628b3433ddd887 Mon Sep 17 00:00:00 2001
-From: John (J5) Palmieri <johnp@redhat.com>
-Date: Mon, 02 Jan 2012 18:39:05 +0000
-Subject: fix type check so gnome-sudoku works with pygobject >= 3.0.3
-
-gnome-sudoku was using if type(grid) == str to check if it needed
-to convert the game board to a list.  Unicode fixes in the latest
-pygobject returns unicode strings for any string stored in a
-TreeStore. The fix was to correctly check for any string using
-isinstance(grid, basestring)
-
-Note this will not work in python3 so needs to be looked at when
-porting
----
-diff --git a/gnome-sudoku/src/lib/sudoku.py b/gnome-sudoku/src/lib/sudoku.py
-index a345593..7d28608 100644
---- a/gnome-sudoku/src/lib/sudoku.py
-+++ b/gnome-sudoku/src/lib/sudoku.py
-@@ -130,7 +130,7 @@ class SudokuGrid(object):
-         for n, col in enumerate([[(x, y) for y in range(self.group_size)] for x in range(self.group_size)]):
-             self.col_coords[n] = col
-         if grid:
--            if type(grid) == str:
-+            if isinstance(grid, basestring):
-                 g = re.split("\s+", grid)
-                 side = int(math.sqrt(len(g)))
-                 grid = []
---
-cgit v0.9.0.2
diff --git a/extra/gnome-keyring/silence_no_socket_to_connect.patch b/extra/gnome-keyring/silence_no_socket_to_connect.patch
deleted file mode 100644
index e6eba7855..000000000
--- a/extra/gnome-keyring/silence_no_socket_to_connect.patch
+++ /dev/null
@@ -1,717 +0,0 @@
-From 5ca7387952f99bf318d337df2d853f5bc3c0ddd2 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@collabora.co.uk>
-Date: Mon, 19 Dec 2011 12:08:51 +0000
-Subject: rpc-layer: Correctly handle case where gnome-keyring-daemon not running
-
- * In the gnome-keyring-pkcs11.so module return stand in info
-   when the gnome-keyring-daemon info is not running.
- * In addition no slots will be listed
-
-https://bugzilla.gnome.org/show_bug.cgi?id=665961
----
-diff --git a/pkcs11/rpc-layer/gkm-rpc-module.c b/pkcs11/rpc-layer/gkm-rpc-module.c
-index ea939a7..b95bee1 100644
---- a/pkcs11/rpc-layer/gkm-rpc-module.c
-+++ b/pkcs11/rpc-layer/gkm-rpc-module.c
-@@ -228,10 +228,8 @@ call_connect (CallState *cs)
- 	assert (cs->socket == -1);
- 	assert (cs->call_status == CALL_INVALID);
- 
--	if (!pkcs11_socket_path) {
--		warning (("no socket to connect to"));
-+	if (!pkcs11_socket_path)
- 		return CKR_DEVICE_REMOVED;
--	}
- 
- 	debug (("connecting to: %s", pkcs11_socket_path));
- 
-@@ -968,13 +966,14 @@ proto_read_sesssion_info (GkmRpcMessage *msg, CK_SESSION_INFO_PTR info)
-  * CALL MACROS
-  */
- 
--#define BEGIN_CALL(call_id) \
-+#define BEGIN_CALL_OR(call_id, if_no_daemon) \
- 	debug ((#call_id ": enter")); \
- 	return_val_if_fail (pkcs11_initialized, CKR_CRYPTOKI_NOT_INITIALIZED); \
- 	{  \
- 		CallState *_cs; \
- 		CK_RV _ret = CKR_OK; \
- 		_ret = call_lookup (&_cs); \
-+		if (_ret == CKR_DEVICE_REMOVED) return (if_no_daemon); \
- 		if (_ret != CKR_OK) return _ret; \
- 		_ret = call_prepare (_cs, GKM_RPC_CALL_##call_id); \
- 		if (_ret != CKR_OK) goto _cleanup;
-@@ -1198,16 +1197,18 @@ rpc_C_Initialize (CK_VOID_PTR init_args)
- 			}
- 		}
- 
--		/* Call through and initialize the daemon */
--		ret = call_lookup (&cs);
--		if (ret == CKR_OK) {
--			ret = call_prepare (cs, GKM_RPC_CALL_C_Initialize);
--			if (ret == CKR_OK)
--				if (!gkm_rpc_message_write_byte_array (cs->req, GKM_RPC_HANDSHAKE, GKM_RPC_HANDSHAKE_LEN))
--					ret = CKR_HOST_MEMORY;
--			if (ret == CKR_OK)
--				ret = call_run (cs);
--			call_done (cs, ret);
-+		/* Call through and initialize the daemon if available */
-+		if (pkcs11_socket_path != NULL) {
-+			ret = call_lookup (&cs);
-+			if (ret == CKR_OK) {
-+				ret = call_prepare (cs, GKM_RPC_CALL_C_Initialize);
-+				if (ret == CKR_OK)
-+					if (!gkm_rpc_message_write_byte_array (cs->req, GKM_RPC_HANDSHAKE, GKM_RPC_HANDSHAKE_LEN))
-+						ret = CKR_HOST_MEMORY;
-+				if (ret == CKR_OK)
-+					ret = call_run (cs);
-+				call_done (cs, ret);
-+			}
- 		}
- 
- done:
-@@ -1232,7 +1233,7 @@ static CK_RV
- rpc_C_Finalize (CK_VOID_PTR reserved)
- {
- 	CallState *cs;
--	CK_RV ret;
-+	CK_RV ret = CKR_OK;
- 
- 	debug (("C_Finalize: enter"));
- 	return_val_if_fail (pkcs11_initialized, CKR_CRYPTOKI_NOT_INITIALIZED);
-@@ -1240,17 +1241,18 @@ rpc_C_Finalize (CK_VOID_PTR reserved)
- 
- 	pthread_mutex_lock (&init_mutex);
- 
--		ret = call_lookup (&cs);
--		if (ret == CKR_OK) {
--			ret = call_prepare (cs, GKM_RPC_CALL_C_Finalize);
-+		if (pkcs11_socket_path != NULL) {
-+			ret = call_lookup (&cs);
- 			if (ret == CKR_OK) {
--				ret = call_run (cs);
-+				ret = call_prepare (cs, GKM_RPC_CALL_C_Finalize);
-+				if (ret == CKR_OK)
-+					ret = call_run (cs);
-+				call_done (cs, ret);
- 			}
--			call_done (cs, ret);
--		}
- 
--		if (ret != CKR_OK)
--			warning (("finalizing the daemon returned an error: %d", ret));
-+			if (ret != CKR_OK)
-+				warning (("finalizing the daemon returned an error: %d", ret));
-+		}
- 
- 		/* This should stop all other calls in */
- 		pkcs11_initialized = 0;
-@@ -1265,11 +1267,26 @@ rpc_C_Finalize (CK_VOID_PTR reserved)
- }
- 
- static CK_RV
-+fill_stand_in_info (CK_INFO_PTR info)
-+{
-+	static CK_INFO stand_in_info = {
-+		{ CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR },
-+		"GNOME Keyring                   ",
-+		0,
-+		"GNOME Keyring (without daemon)  ",
-+		{ 1, 1 },
-+	};
-+	memcpy (info, &stand_in_info, sizeof (CK_INFO));
-+	return CKR_OK;
-+
-+}
-+
-+static CK_RV
- rpc_C_GetInfo (CK_INFO_PTR info)
- {
- 	return_val_if_fail (info, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_GetInfo);
-+	BEGIN_CALL_OR (C_GetInfo, fill_stand_in_info (info));
- 	PROCESS_CALL;
- 		OUT_INFO (info);
- 	END_CALL;
-@@ -1287,7 +1304,7 @@ rpc_C_GetSlotList (CK_BBOOL token_present, CK_SLOT_ID_PTR slot_list, CK_ULONG_PT
- {
- 	return_val_if_fail (count, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_GetSlotList);
-+	BEGIN_CALL_OR (C_GetSlotList, (*count = 0, CKR_OK));
- 		IN_BYTE (token_present);
- 		IN_ULONG_BUFFER (slot_list, count);
- 	PROCESS_CALL;
-@@ -1300,7 +1317,7 @@ rpc_C_GetSlotInfo (CK_SLOT_ID id, CK_SLOT_INFO_PTR info)
- {
- 	return_val_if_fail (info, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_GetSlotInfo);
-+	BEGIN_CALL_OR (C_GetSlotInfo, CKR_SLOT_ID_INVALID);
- 		IN_ULONG (id);
- 	PROCESS_CALL;
- 		OUT_SLOT_INFO (info);
-@@ -1312,7 +1329,7 @@ rpc_C_GetTokenInfo (CK_SLOT_ID id, CK_TOKEN_INFO_PTR info)
- {
- 	return_val_if_fail (info, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_GetTokenInfo);
-+	BEGIN_CALL_OR (C_GetTokenInfo, CKR_SLOT_ID_INVALID);
- 		IN_ULONG (id);
- 	PROCESS_CALL;
- 		OUT_TOKEN_INFO (info);
-@@ -1325,7 +1342,7 @@ rpc_C_GetMechanismList (CK_SLOT_ID id, CK_MECHANISM_TYPE_PTR mechanism_list,
- {
- 	return_val_if_fail (count, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_GetMechanismList);
-+	BEGIN_CALL_OR (C_GetMechanismList, CKR_SLOT_ID_INVALID);
- 		IN_ULONG (id);
- 		IN_ULONG_BUFFER (mechanism_list, count);
- 	PROCESS_CALL;
-@@ -1340,7 +1357,7 @@ rpc_C_GetMechanismInfo (CK_SLOT_ID id, CK_MECHANISM_TYPE type,
- {
- 	return_val_if_fail (info, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_GetMechanismInfo);
-+	BEGIN_CALL_OR (C_GetMechanismInfo, CKR_SLOT_ID_INVALID);
- 		IN_ULONG (id);
- 		IN_MECHANISM_TYPE (type);
- 	PROCESS_CALL;
-@@ -1352,7 +1369,7 @@ static CK_RV
- rpc_C_InitToken (CK_SLOT_ID id, CK_UTF8CHAR_PTR pin, CK_ULONG pin_len,
-                  CK_UTF8CHAR_PTR label)
- {
--	BEGIN_CALL (C_InitToken);
-+	BEGIN_CALL_OR (C_InitToken, CKR_SLOT_ID_INVALID);
- 		IN_ULONG (id);
- 		IN_BYTE_ARRAY (pin, pin_len);
- 		IN_STRING (label);
-@@ -1365,7 +1382,7 @@ rpc_C_WaitForSlotEvent (CK_FLAGS flags, CK_SLOT_ID_PTR slot, CK_VOID_PTR reserve
- {
- 	return_val_if_fail (slot, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_WaitForSlotEvent);
-+	BEGIN_CALL_OR (C_WaitForSlotEvent, CKR_DEVICE_REMOVED);
- 		IN_ULONG (flags);
- 	PROCESS_CALL;
- 		OUT_ULONG (slot);
-@@ -1378,7 +1395,7 @@ rpc_C_OpenSession (CK_SLOT_ID id, CK_FLAGS flags, CK_VOID_PTR user_data,
- {
- 	return_val_if_fail (session, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_OpenSession);
-+	BEGIN_CALL_OR (C_OpenSession, CKR_SLOT_ID_INVALID);
- 		IN_ULONG (id);
- 		IN_ULONG (flags);
- 	PROCESS_CALL;
-@@ -1389,7 +1406,7 @@ rpc_C_OpenSession (CK_SLOT_ID id, CK_FLAGS flags, CK_VOID_PTR user_data,
- static CK_RV
- rpc_C_CloseSession (CK_SESSION_HANDLE session)
- {
--	BEGIN_CALL (C_CloseSession);
-+	BEGIN_CALL_OR (C_CloseSession, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 	PROCESS_CALL;
- 	END_CALL;
-@@ -1398,7 +1415,7 @@ rpc_C_CloseSession (CK_SESSION_HANDLE session)
- static CK_RV
- rpc_C_CloseAllSessions (CK_SLOT_ID id)
- {
--	BEGIN_CALL (C_CloseAllSessions);
-+	BEGIN_CALL_OR (C_CloseAllSessions, CKR_SLOT_ID_INVALID);
- 		IN_ULONG (id);
- 	PROCESS_CALL;
- 	END_CALL;
-@@ -1407,7 +1424,7 @@ rpc_C_CloseAllSessions (CK_SLOT_ID id)
- static CK_RV
- rpc_C_GetFunctionStatus (CK_SESSION_HANDLE session)
- {
--	BEGIN_CALL (C_GetFunctionStatus);
-+	BEGIN_CALL_OR (C_GetFunctionStatus, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 	PROCESS_CALL;
- 	END_CALL;
-@@ -1416,7 +1433,7 @@ rpc_C_GetFunctionStatus (CK_SESSION_HANDLE session)
- static CK_RV
- rpc_C_CancelFunction (CK_SESSION_HANDLE session)
- {
--	BEGIN_CALL (C_CancelFunction);
-+	BEGIN_CALL_OR (C_CancelFunction, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 	PROCESS_CALL;
- 	END_CALL;
-@@ -1427,7 +1444,7 @@ rpc_C_GetSessionInfo(CK_SESSION_HANDLE session, CK_SESSION_INFO_PTR info)
- {
- 	return_val_if_fail (info, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_GetSessionInfo);
-+	BEGIN_CALL_OR (C_GetSessionInfo, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 	PROCESS_CALL;
- 		OUT_SESSION_INFO (info);
-@@ -1438,7 +1455,7 @@ static CK_RV
- rpc_C_InitPIN (CK_SESSION_HANDLE session, CK_UTF8CHAR_PTR pin,
-                CK_ULONG pin_len)
- {
--	BEGIN_CALL (C_InitPIN);
-+	BEGIN_CALL_OR (C_InitPIN, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (pin, pin_len);
- 	PROCESS_CALL;
-@@ -1449,7 +1466,7 @@ static CK_RV
- rpc_C_SetPIN (CK_SESSION_HANDLE session, CK_UTF8CHAR_PTR old_pin,
-               CK_ULONG old_pin_len, CK_UTF8CHAR_PTR new_pin, CK_ULONG new_pin_len)
- {
--	BEGIN_CALL (C_SetPIN);
-+	BEGIN_CALL_OR (C_SetPIN, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (old_pin, old_pin_len);
- 		IN_BYTE_ARRAY (new_pin, old_pin_len);
-@@ -1463,7 +1480,7 @@ rpc_C_GetOperationState (CK_SESSION_HANDLE session, CK_BYTE_PTR operation_state,
- {
- 	return_val_if_fail (operation_state_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_GetOperationState);
-+	BEGIN_CALL_OR (C_GetOperationState, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_BUFFER (operation_state, operation_state_len);
- 	PROCESS_CALL;
-@@ -1476,7 +1493,7 @@ rpc_C_SetOperationState (CK_SESSION_HANDLE session, CK_BYTE_PTR operation_state,
-                          CK_ULONG operation_state_len, CK_OBJECT_HANDLE encryption_key,
-                          CK_OBJECT_HANDLE authentication_key)
- {
--	BEGIN_CALL (C_SetOperationState);
-+	BEGIN_CALL_OR (C_SetOperationState, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (operation_state, operation_state_len);
- 		IN_ULONG (encryption_key);
-@@ -1489,7 +1506,7 @@ static CK_RV
- rpc_C_Login (CK_SESSION_HANDLE session, CK_USER_TYPE user_type,
-              CK_UTF8CHAR_PTR pin, CK_ULONG pin_len)
- {
--	BEGIN_CALL (C_Login);
-+	BEGIN_CALL_OR (C_Login, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_ULONG (user_type);
- 		IN_BYTE_ARRAY (pin, pin_len);
-@@ -1500,7 +1517,7 @@ rpc_C_Login (CK_SESSION_HANDLE session, CK_USER_TYPE user_type,
- static CK_RV
- rpc_C_Logout (CK_SESSION_HANDLE session)
- {
--	BEGIN_CALL (C_Logout);
-+	BEGIN_CALL_OR (C_Logout, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 	PROCESS_CALL;
- 	END_CALL;
-@@ -1512,7 +1529,7 @@ rpc_C_CreateObject (CK_SESSION_HANDLE session, CK_ATTRIBUTE_PTR template,
- {
- 	return_val_if_fail (new_object, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_CreateObject);
-+	BEGIN_CALL_OR (C_CreateObject, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_ATTRIBUTE_ARRAY (template, count);
- 	PROCESS_CALL;
-@@ -1527,7 +1544,7 @@ rpc_C_CopyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object,
- {
- 	return_val_if_fail (new_object, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_CopyObject);
-+	BEGIN_CALL_OR (C_CopyObject, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_ULONG (object);
- 		IN_ATTRIBUTE_ARRAY (template, count);
-@@ -1540,7 +1557,7 @@ rpc_C_CopyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object,
- static CK_RV
- rpc_C_DestroyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object)
- {
--	BEGIN_CALL (C_DestroyObject);
-+	BEGIN_CALL_OR (C_DestroyObject, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_ULONG (object);
- 	PROCESS_CALL;
-@@ -1553,7 +1570,7 @@ rpc_C_GetObjectSize (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object,
- {
- 	return_val_if_fail (size, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_GetObjectSize);
-+	BEGIN_CALL_OR (C_GetObjectSize, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_ULONG (object);
- 	PROCESS_CALL;
-@@ -1565,7 +1582,7 @@ static CK_RV
- rpc_C_GetAttributeValue (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object,
-                          CK_ATTRIBUTE_PTR template, CK_ULONG count)
- {
--	BEGIN_CALL (C_GetAttributeValue);
-+	BEGIN_CALL_OR (C_GetAttributeValue, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_ULONG (object);
- 		IN_ATTRIBUTE_BUFFER (template, count);
-@@ -1578,7 +1595,7 @@ static CK_RV
- rpc_C_SetAttributeValue (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object,
-                          CK_ATTRIBUTE_PTR template, CK_ULONG count)
- {
--	BEGIN_CALL (C_SetAttributeValue);
-+	BEGIN_CALL_OR (C_SetAttributeValue, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_ULONG (object);
- 		IN_ATTRIBUTE_ARRAY (template, count);
-@@ -1590,7 +1607,7 @@ static CK_RV
- rpc_C_FindObjectsInit (CK_SESSION_HANDLE session, CK_ATTRIBUTE_PTR template,
-                        CK_ULONG count)
- {
--	BEGIN_CALL (C_FindObjectsInit);
-+	BEGIN_CALL_OR (C_FindObjectsInit, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_ATTRIBUTE_ARRAY (template, count);
- 	PROCESS_CALL;
-@@ -1606,7 +1623,7 @@ rpc_C_FindObjects (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE_PTR objects,
- 
- 	return_val_if_fail (count, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_FindObjects);
-+	BEGIN_CALL_OR (C_FindObjects, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_ULONG_BUFFER (objects, address_of_max_count);
- 	PROCESS_CALL;
-@@ -1618,7 +1635,7 @@ rpc_C_FindObjects (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE_PTR objects,
- static CK_RV
- rpc_C_FindObjectsFinal (CK_SESSION_HANDLE session)
- {
--	BEGIN_CALL (C_FindObjectsFinal);
-+	BEGIN_CALL_OR (C_FindObjectsFinal, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 	PROCESS_CALL;
- 	END_CALL;
-@@ -1628,7 +1645,7 @@ static CK_RV
- rpc_C_EncryptInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
-                    CK_OBJECT_HANDLE key)
- {
--	BEGIN_CALL (C_EncryptInit);
-+	BEGIN_CALL_OR (C_EncryptInit, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ULONG (key);
-@@ -1642,7 +1659,7 @@ rpc_C_Encrypt (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
- {
- 	return_val_if_fail (encrypted_data_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_Encrypt);
-+	BEGIN_CALL_OR (C_Encrypt, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (data, data_len);
- 		IN_BYTE_BUFFER (encrypted_data, encrypted_data_len);
-@@ -1658,7 +1675,7 @@ rpc_C_EncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part,
- {
- 	return_val_if_fail (encrypted_part_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_EncryptUpdate);
-+	BEGIN_CALL_OR (C_EncryptUpdate, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (part, part_len);
- 		IN_BYTE_BUFFER (encrypted_part, encrypted_part_len);
-@@ -1673,7 +1690,7 @@ rpc_C_EncryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part,
- {
- 	return_val_if_fail (last_part_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_EncryptFinal);
-+	BEGIN_CALL_OR (C_EncryptFinal, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_BUFFER (last_part, last_part_len);
- 	PROCESS_CALL;
-@@ -1685,7 +1702,7 @@ static CK_RV
- rpc_C_DecryptInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
-                    CK_OBJECT_HANDLE key)
- {
--	BEGIN_CALL (C_DecryptInit);
-+	BEGIN_CALL_OR (C_DecryptInit, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ULONG (key);
-@@ -1699,7 +1716,7 @@ rpc_C_Decrypt (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_data,
- {
- 	return_val_if_fail (data_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_Decrypt);
-+	BEGIN_CALL_OR (C_Decrypt, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (enc_data, enc_data_len);
- 		IN_BYTE_BUFFER (data, data_len);
-@@ -1714,7 +1731,7 @@ rpc_C_DecryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part,
- {
- 	return_val_if_fail (part_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_DecryptUpdate);
-+	BEGIN_CALL_OR (C_DecryptUpdate, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (enc_part, enc_part_len);
- 		IN_BYTE_BUFFER (part, part_len);
-@@ -1729,7 +1746,7 @@ rpc_C_DecryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part,
- {
- 	return_val_if_fail (last_part_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_DecryptFinal);
-+	BEGIN_CALL_OR (C_DecryptFinal, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_BUFFER (last_part, last_part_len);
- 	PROCESS_CALL;
-@@ -1740,7 +1757,7 @@ rpc_C_DecryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part,
- static CK_RV
- rpc_C_DigestInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism)
- {
--	BEGIN_CALL (C_DigestInit);
-+	BEGIN_CALL_OR (C_DigestInit, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 	PROCESS_CALL;
-@@ -1753,7 +1770,7 @@ rpc_C_Digest (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
- {
- 	return_val_if_fail (digest_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_Digest);
-+	BEGIN_CALL_OR (C_Digest, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (data, data_len);
- 		IN_BYTE_BUFFER (digest, digest_len);
-@@ -1765,7 +1782,7 @@ rpc_C_Digest (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
- static CK_RV
- rpc_C_DigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len)
- {
--	BEGIN_CALL (C_DigestUpdate);
-+	BEGIN_CALL_OR (C_DigestUpdate, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (part, part_len);
- 	PROCESS_CALL;
-@@ -1775,7 +1792,7 @@ rpc_C_DigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_l
- static CK_RV
- rpc_C_DigestKey (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key)
- {
--	BEGIN_CALL (C_DigestKey);
-+	BEGIN_CALL_OR (C_DigestKey, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_ULONG (key);
- 	PROCESS_CALL;
-@@ -1788,7 +1805,7 @@ rpc_C_DigestFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR digest,
- {
- 	return_val_if_fail (digest_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_DigestFinal);
-+	BEGIN_CALL_OR (C_DigestFinal, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_BUFFER (digest, digest_len);
- 	PROCESS_CALL;
-@@ -1800,7 +1817,7 @@ static CK_RV
- rpc_C_SignInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
-                 CK_OBJECT_HANDLE key)
- {
--	BEGIN_CALL (C_SignInit);
-+	BEGIN_CALL_OR (C_SignInit, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ULONG (key);
-@@ -1814,7 +1831,7 @@ rpc_C_Sign (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
- {
- 	return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_Sign);
-+	BEGIN_CALL_OR (C_Sign, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (data, data_len);
- 		IN_BYTE_BUFFER (signature, signature_len);
-@@ -1828,7 +1845,7 @@ rpc_C_SignUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len
- {
- 	return_val_if_fail (part_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_SignUpdate);
-+	BEGIN_CALL_OR (C_SignUpdate, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (part, part_len);
- 	PROCESS_CALL;
-@@ -1841,7 +1858,7 @@ rpc_C_SignFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR signature,
- {
- 	return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_SignFinal);
-+	BEGIN_CALL_OR (C_SignFinal, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_BUFFER (signature, signature_len);
- 	PROCESS_CALL;
-@@ -1853,7 +1870,7 @@ static CK_RV
- rpc_C_SignRecoverInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
-                        CK_OBJECT_HANDLE key)
- {
--	BEGIN_CALL (C_SignRecoverInit);
-+	BEGIN_CALL_OR (C_SignRecoverInit, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ULONG (key);
-@@ -1867,7 +1884,7 @@ rpc_C_SignRecover (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_le
- {
- 	return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_SignRecover);
-+	BEGIN_CALL_OR (C_SignRecover, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (data, data_len);
- 		IN_BYTE_BUFFER (signature, signature_len);
-@@ -1880,7 +1897,7 @@ static CK_RV
- rpc_C_VerifyInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
-                   CK_OBJECT_HANDLE key)
- {
--	BEGIN_CALL (C_VerifyInit);
-+	BEGIN_CALL_OR (C_VerifyInit, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ULONG (key);
-@@ -1892,7 +1909,7 @@ static CK_RV
- rpc_C_Verify (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
-               CK_BYTE_PTR signature, CK_ULONG signature_len)
- {
--	BEGIN_CALL (C_Verify);
-+	BEGIN_CALL_OR (C_Verify, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (data, data_len);
- 		IN_BYTE_ARRAY (signature, signature_len);
-@@ -1903,7 +1920,7 @@ rpc_C_Verify (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
- static CK_RV
- rpc_C_VerifyUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len)
- {
--	BEGIN_CALL (C_VerifyUpdate);
-+	BEGIN_CALL_OR (C_VerifyUpdate, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (part, part_len);
- 	PROCESS_CALL;
-@@ -1914,7 +1931,7 @@ static CK_RV
- rpc_C_VerifyFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR signature,
-                    CK_ULONG signature_len)
- {
--	BEGIN_CALL (C_VerifyFinal);
-+	BEGIN_CALL_OR (C_VerifyFinal, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (signature, signature_len);
- 	PROCESS_CALL;
-@@ -1925,7 +1942,7 @@ static CK_RV
- rpc_C_VerifyRecoverInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
-                          CK_OBJECT_HANDLE key)
- {
--	BEGIN_CALL (C_VerifyRecoverInit);
-+	BEGIN_CALL_OR (C_VerifyRecoverInit, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ULONG (key);
-@@ -1939,7 +1956,7 @@ rpc_C_VerifyRecover (CK_SESSION_HANDLE session, CK_BYTE_PTR signature,
- {
- 	return_val_if_fail (data_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_VerifyRecover);
-+	BEGIN_CALL_OR (C_VerifyRecover, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (signature, signature_len);
- 		IN_BYTE_BUFFER (data, data_len);
-@@ -1955,7 +1972,7 @@ rpc_C_DigestEncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part,
- {
- 	return_val_if_fail (enc_part_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_DigestEncryptUpdate);
-+	BEGIN_CALL_OR (C_DigestEncryptUpdate, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (part, part_len);
- 		IN_BYTE_BUFFER (enc_part, enc_part_len);
-@@ -1971,7 +1988,7 @@ rpc_C_DecryptDigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part,
- {
- 	return_val_if_fail (part_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_DecryptDigestUpdate);
-+	BEGIN_CALL_OR (C_DecryptDigestUpdate, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (enc_part, enc_part_len);
- 		IN_BYTE_BUFFER (part, part_len);
-@@ -1987,7 +2004,7 @@ rpc_C_SignEncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part,
- {
- 	return_val_if_fail (enc_part_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_SignEncryptUpdate);
-+	BEGIN_CALL_OR (C_SignEncryptUpdate, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (part, part_len);
- 		IN_BYTE_BUFFER (enc_part, enc_part_len);
-@@ -2003,7 +2020,7 @@ rpc_C_DecryptVerifyUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part,
- {
- 	return_val_if_fail (part_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_DecryptVerifyUpdate);
-+	BEGIN_CALL_OR (C_DecryptVerifyUpdate, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (enc_part, enc_part_len);
- 		IN_BYTE_BUFFER (part, part_len);
-@@ -2017,7 +2034,7 @@ rpc_C_GenerateKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
-                    CK_ATTRIBUTE_PTR template, CK_ULONG count,
-                    CK_OBJECT_HANDLE_PTR key)
- {
--	BEGIN_CALL (C_GenerateKey);
-+	BEGIN_CALL_OR (C_GenerateKey, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ATTRIBUTE_ARRAY (template, count);
-@@ -2032,7 +2049,7 @@ rpc_C_GenerateKeyPair (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
-                        CK_ATTRIBUTE_PTR priv_template, CK_ULONG priv_count,
-                        CK_OBJECT_HANDLE_PTR pub_key, CK_OBJECT_HANDLE_PTR priv_key)
- {
--	BEGIN_CALL (C_GenerateKeyPair);
-+	BEGIN_CALL_OR (C_GenerateKeyPair, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ATTRIBUTE_ARRAY (pub_template, pub_count);
-@@ -2050,7 +2067,7 @@ rpc_C_WrapKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
- {
- 	return_val_if_fail (wrapped_key_len, CKR_ARGUMENTS_BAD);
- 
--	BEGIN_CALL (C_WrapKey);
-+	BEGIN_CALL_OR (C_WrapKey, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ULONG (wrapping_key);
-@@ -2067,7 +2084,7 @@ rpc_C_UnwrapKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
-                  CK_ULONG wrapped_key_len, CK_ATTRIBUTE_PTR template,
-                  CK_ULONG count, CK_OBJECT_HANDLE_PTR key)
- {
--	BEGIN_CALL (C_UnwrapKey);
-+	BEGIN_CALL_OR (C_UnwrapKey, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ULONG (unwrapping_key);
-@@ -2083,7 +2100,7 @@ rpc_C_DeriveKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
-                  CK_OBJECT_HANDLE base_key, CK_ATTRIBUTE_PTR template,
-                  CK_ULONG count, CK_OBJECT_HANDLE_PTR key)
- {
--	BEGIN_CALL (C_DeriveKey);
-+	BEGIN_CALL_OR (C_DeriveKey, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_MECHANISM (mechanism);
- 		IN_ULONG (base_key);
-@@ -2096,7 +2113,7 @@ rpc_C_DeriveKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
- static CK_RV
- rpc_C_SeedRandom (CK_SESSION_HANDLE session, CK_BYTE_PTR seed, CK_ULONG seed_len)
- {
--	BEGIN_CALL (C_SeedRandom);
-+	BEGIN_CALL_OR (C_SeedRandom, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
- 		IN_BYTE_ARRAY (seed, seed_len);
- 	PROCESS_CALL;
-@@ -2107,9 +2124,9 @@ static CK_RV
- rpc_C_GenerateRandom (CK_SESSION_HANDLE session, CK_BYTE_PTR random_data,
-                       CK_ULONG random_len)
- {
--	BEGIN_CALL (C_GenerateRandom);
-+	CK_ULONG_PTR address = &random_len;
-+	BEGIN_CALL_OR (C_GenerateRandom, CKR_SESSION_HANDLE_INVALID);
- 		IN_ULONG (session);
--    CK_ULONG_PTR address = &random_len;
- 		IN_BYTE_BUFFER (random_data, address);
- 	PROCESS_CALL;
- 		OUT_BYTE_ARRAY (random_data, address);
---
-cgit v0.9.0.2
diff --git a/extra/gnome-utils/PKGBUILD b/extra/gnome-utils/PKGBUILD
deleted file mode 100644
index 5017a7712..000000000
--- a/extra/gnome-utils/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-#  $Id: PKGBUILD 140921 2011-10-20 05:43:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-utils
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf')
-makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-utils.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gnome-utils \
-        --localstatedir=/var --disable-static \
-        --disable-scrollkeeper \
-        --disable-schemas-compile \
-        --disable-schemas-install
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-utils-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  # remove it also from Xfce menu that ships its own thingy
-  sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-dictionary.desktop
-  sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-screenshot.desktop
-}
diff --git a/extra/gnome-utils/gnome-utils.install b/extra/gnome-utils/gnome-utils.install
deleted file mode 100644
index a04bda405..000000000
--- a/extra/gnome-utils/gnome-utils.install
+++ /dev/null
@@ -1,26 +0,0 @@
-pkgname=gnome-utils
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
diff --git a/extra/gtk3/empty_grid.patch b/extra/gtk3/empty_grid.patch
deleted file mode 100644
index 45aefde47..000000000
--- a/extra/gtk3/empty_grid.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 97c1df4bb05966a4ce53b07271eff2f53284e235 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 21 Oct 2011 20:23:03 +0000
-Subject: Fix natural/min widht calculations for empty grids
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660139
----
-diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
-index a122ad4..78ae2ff 100644
---- a/gtk/gtkgrid.c
-+++ b/gtk/gtkgrid.c
-@@ -927,8 +927,13 @@ gtk_grid_request_sum (GtkGridRequest *request,
-   linedata = &priv->linedata[orientation];
-   lines = &request->lines[orientation];
- 
--  min = (nonempty - 1) * linedata->spacing;
--  nat = (nonempty - 1) * linedata->spacing;
-+  min = 0;
-+  nat = 0;
-+  if (nonempty > 0)
-+    {
-+      min = (nonempty - 1) * linedata->spacing;
-+      nat = (nonempty - 1) * linedata->spacing;
-+    }
- 
-   for (i = 0; i < lines->max - lines->min; i++)
-     {
---
-cgit v0.9.0.2
diff --git a/extra/ivtv-utils/PKGBUILD b/extra/ivtv-utils/PKGBUILD
deleted file mode 100644
index 33e1cf1bc..000000000
--- a/extra/ivtv-utils/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 143788 2011-11-29 11:25:59Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=ivtv-utils
-pkgver=1.4.1
-pkgrel=4
-pkgdesc="Userspace utilities for Hauppauge PVR cards"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://ivtvdriver.org"
-source=("http://dl.ivtvdriver.org/ivtv/stable/${pkgname}-${pkgver}.tar.gz"
-        "http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz")
-depends=('gcc-libs')
-md5sums=('3a4219d698262ca2b28e41f0f547b0a2'
-         'b9a871f1c569025be9c48a77b3515faf')
- 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" PREFIX=/usr install
-
-  cd "${srcdir}"
-  for file in v4l-cx2341x-dec.fw  v4l-cx2341x-enc.fw v4l-pvrusb2-24xxx-01.fw  v4l-pvrusb2-29xxx-01.fw v4l-cx2341x-init.mpg; do
-    install -D -m644 $file "${pkgdir}/lib/firmware/$file"
-  done
-
-  # FS#15133 - files already provided by the kernel-headers package
-  rm -rf "${pkgdir}"/usr/include
-  # Resolve conflict with v4l-utils
-  rm -f "${pkgdir}"/usr/bin/v4l2-ctl
-}
diff --git a/extra/kdepim/fix-kalarm-issue-with-alarms.patch b/extra/kdepim/fix-kalarm-issue-with-alarms.patch
deleted file mode 100644
index a69778b06..000000000
--- a/extra/kdepim/fix-kalarm-issue-with-alarms.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: David Jarvie <djarvie@kde.org>
-Date: Wed, 07 Mar 2012 22:08:50 +0000
-Subject: Fix error saving changed alarms when closing Edit Alarm dialogue
-X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&amp;a=commitdiff&amp;h=ae66e32fb194e01e06521c78e9c72d772d291261
----
-Fix error saving changed alarms when closing Edit Alarm dialogue
----
-
-
---- a/kalarm/Changelog
-+++ b/kalarm/Changelog
-@@ -1,6 +1,10 @@
- KAlarm Change Log
- 
--=== Version 2.8.1 --- 19 February 2012 ===
-+=== Version 2.8.2 --- 7 March 2012 ===
-+- [Akonadi] Fix error saving changed alarms when closing Edit Alarm dialogue.
-+- [Akonadi] Show old-format calendars in read-only colour in calendar list.
-+
-+=== Version 2.8.1 (KDE 4.8.1) --- 19 February 2012 ===
- - [Akonadi] Don't give option to save new alarms in old format calendars.
- - [Akonadi] Prevent duplicate prompts to update format of new calendar resource.
- - [Akonadi] Automatically disable duplicated calendar resources.
-
---- a/kalarm/akonadimodel.cpp
-+++ b/kalarm/akonadimodel.cpp
-@@ -1284,7 +1284,7 @@ KAEvent AkonadiModel::event(const Item&
-     if (e.isValid())
-     {
- 
--        Collection c = data(index, ParentCollectionRole).value<Collection>();
-+        Collection c = data(ix, ParentCollectionRole).value<Collection>();
-         // Set collection ID using a const method, to avoid unnecessary copying of KAEvent
-         e.setCollectionId_const(c.id());
-         if (collection)
-
---- a/kalarm/kalarm.h
-+++ b/kalarm/kalarm.h
-@@ -28,7 +28,7 @@
- #else
- #define VERSION_SUFFIX "-res"
- #endif
--#define KALARM_VERSION "2.8.1" VERSION_SUFFIX
-+#define KALARM_VERSION "2.8.2" VERSION_SUFFIX
- 
- #define KALARM_NAME "KAlarm"
- #define KALARM_DBUS_SERVICE  "org.kde.kalarm"  // D-Bus service name of KAlarm application
-
diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
deleted file mode 100644
index 8f5b25f43..000000000
--- a/extra/koffice/PKGBUILD
+++ /dev/null
@@ -1,306 +0,0 @@
-# $Id: PKGBUILD 148804 2012-02-05 11:51:14Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-
-pkgbase=koffice
-pkgname=(
-	'koffice-filters'
-	'koffice-interfaces'
-	'koffice-libs'
-	'koffice-plugins'
-	'koffice-pics'
-	'koffice-servicetypes'
-	'koffice-templates'
-	'koffice-tools'
-	'koffice-karbon'
-	'koffice-karbon-doc'
-#	'koffice-kchart'
-#	'koffice-kchart-doc'
-	'koffice-kexi'
-	'koffice-kexi-doc'
-	'koffice-kformula'
-	'koffice-kformula-doc'
-	'koffice-kounavail'
-	'koffice-kplato'
-#	'koffice-kplato-doc'
-	'koffice-kpresenter'
-	'koffice-kpresenter-doc'
-	'koffice-krita'
-#	'koffice-krita-doc' # no krita-doc anymore upstream
-	'koffice-kspread'
-	'koffice-kspread-doc'
-	'koffice-kword'
-#	'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources)
-	'koffice-handbook'
-	'koffice-thesaurus-doc'
-#	'koffice-kdgantt' # still an empty package
-)
-pkgver=2.3.3
-pkgrel=12
-arch=('i686' 'x86_64')
-url='http://koffice.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
-             'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'libgsf')
-groups=('koffice')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch')
-sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
-            '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
-            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739'
-            'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa')
-build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-
-	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
-	patch -p1 -i "${srcdir}"/gcc46.patch
-    patch -p1 -i "${srcdir}"/qt48fix.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-##### 1st package common files, depends, optdepends of the koffice applications #####
-
-package_koffice-filters(){
-	pkgdesc="Filters for the KDE office suite"
-	depends=('shared-mime-info' 'libgsf')
-	optdepends=('libwpd: WordPerfect document importer'
-                   'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
-                   'libkdcraw: support for raw images' 'poppler: support for pdf' 
-		   'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters'
-		   'koffice-kplato: Kplato filters')
-	install=filters.install
-        cd "${srcdir}/build/filters"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-interfaces(){
-	pkgdesc="Interfaces for the KDE office suite"
-	depends=('koffice-libs')
-	cd "${srcdir}/build/interfaces"
-	make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-libs(){
-	pkgdesc="Libs for the KDE office suite"
-	depends=('kdepimlibs' 'lcms' 'koffice-servicetypes')
-        cd "${srcdir}/build/libs"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-plugins(){
-	pkgdesc="Plugins for the KDE office suite"
-	depends=('koffice-libs')
-	replaces=('koffice-kchart')
-	conflicts=('koffice-kchart')
-        cd "${srcdir}/build/plugins"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-pics(){
-	pkgdesc="Icons for the KDE office suite"
-	depends=('desktop-file-utils' 'xdg-utils')
-	install=koffice.install
-        cd "${srcdir}/build/pics"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-servicetypes(){
-	pkgdesc="Servicetypes for the KDE office suite"
-        cd "${srcdir}/build/servicetypes"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-templates(){
-	pkgdesc="Templates for the KDE office suite"
-        cd "${srcdir}/build/templates"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-tools(){
-	pkgdesc="Tools for the KDE office suite"
-	depends=('koffice-libs' 'oxygen-icons')
-        cd "${srcdir}/build/tools"
-        make DESTDIR="${pkgdir}" install
-}
-
-#### package common files done #####
-
-#### package apps and their docs #####
-
-package_koffice-karbon(){
-	pkgdesc="Vector drawing application for KDE"
-	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/karbon"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-karbon-doc(){
-	pkgdesc="Documentation for karbon"
-        cd "${srcdir}/build/doc/karbon"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kexi(){
-        pkgdesc="Integrated data management application for the KDE office suite"
-        depends=('koffice-kspread' 'oxygen-icons')
-	install=koffice.install
-        cd "${srcdir}/build/kexi"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kexi-doc(){
-        pkgdesc="Documentation for kexi"
-        cd "${srcdir}/build/doc/kexi"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kformula(){
-        pkgdesc="Formula editor for the KDE office suite"
-	depends=('koffice-libs')
-	install=koffice.install
-        cd "${srcdir}/build/kformula"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kformula-doc() {
-	pkgdesc="Documentation for koffice-kformula"
-	cd "${srcdir}/build/doc/kformula"
-        make DESTDIR="${pkgdir}" install
-}
-
-
-package_koffice-kounavail(){
-	pkgdesc="Kounavail for the KDE office suite"
-	depends=('koffice-libs')
-        cd "${srcdir}/build/kounavail"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kplato(){
-	pkgdesc="Project management application for KDE"
-	depends=('koffice-kword' 'oxygen-icons')
-	install=koffice.install
-        cd "${srcdir}/build/kplato"
-        make DESTDIR="${pkgdir}" install
-}
-
-#package_koffice-kplato-doc(){
-#	pkgdesc="Documentation for kplato"
-#        cd ${srcdir}/build/doc/kplato
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-kpresenter(){
-	pkgdesc="Presentation tool for KDE"
-	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kpresenter"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kpresenter-doc(){
-	pkgdesc="Documentation for kpresenter"
-        cd "${srcdir}/build/doc/kpresenter"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-krita(){
-	pkgdesc="Graphics editor for KDE"
-	depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \
-		 'koffice-plugins' 'poppler-qt' 'opengtl')
-        optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images')
-	install=krita.install
-        cd "${srcdir}/build/krita"
-        make DESTDIR="${pkgdir}" install
-}
-
-#package_koffice-krita-doc(){
-#	pkgdesc="Documentation for krita"
-#        cd ${srcdir}/build/doc/krita
-#        make DESTDIR="${pkgdir}" install
-#}
-
-
-package_koffice-kspread(){
-	pkgdesc="Spreadsheet application for KDE"
-	depends=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons')
-	optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kspread"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kspread-doc(){
-	pkgdesc="Documentation for kspread"
-	cd "${srcdir}/build/doc/kspread"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kword(){
-	pkgdesc="Wordprocessor for KDE"
-	depends=('koffice-templates' 'koffice-pics' 'oxygen-icons' \
-		'koffice-kounavail' 'koffice-plugins')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kword"
-        make DESTDIR="${pkgdir}" install
-
-        # some sed lines to have python2 in extension scripts
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py"
-}
-
-#package_koffice-kword-doc(){
-#	pkgdesc="Documentation for kword"
-#        cd ${srcdir}/build/doc/kword
-#        make DESTDIR="${pkgdir}" install
-#}
-
-##### package apps done #####
-
-#package_koffice-kchart(){
-#	pkgdesc="Charting tool for KDE"
-#	depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates')
-#        optdepends=('koffice-filters: import/export filters')
-#	install=koffice.install
-#        cd "${srcdir}/build/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kchart-doc(){
-#	pkgdesc="Documentation for kchart"
-#        cd "${srcdir}/build/doc/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kdgantt(){
-#	pkgdesc="Gantt for KDE"
-#        cd "${srcdir}/build/kdgantt"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-handbook() {
-	pkgdesc="Documentation for koffice"
-	cd "${srcdir}/build/doc/koffice"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-thesaurus-doc(){
-	pkgdesc="Documentation for koffice-thesaurus"
-	cd "${srcdir}/build/doc/thesaurus"
-        make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/koffice/filters.install b/extra/koffice/filters.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/extra/koffice/filters.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/koffice/gcc46.patch b/extra/koffice/gcc46.patch
deleted file mode 100644
index dcf8a4f85..000000000
--- a/extra/koffice/gcc46.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc
---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46	2011-02-17 06:13:40.000000000 -0600
-+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc	2011-02-19 21:15:56.597142885 -0600
-@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp
-         return IT_FLOAT16;
-     case Imf::FLOAT:
-         return IT_FLOAT32;
-+    default:
-+    // shouldn't reach here
-+        return IT_UNSUPPORTED;
-     }
- }
- 
-@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace(
-     case IT_UNKNOWN:
-     case IT_UNSUPPORTED:
-         return 0;
-+    default:
-+    // shouldn't reach here
-+        return 0;
-     }
- }
- 
diff --git a/extra/koffice/kde4-koffice-libwpg02.patch b/extra/koffice/kde4-koffice-libwpg02.patch
deleted file mode 100644
index e2a55a216..000000000
--- a/extra/koffice/kde4-koffice-libwpg02.patch
+++ /dev/null
@@ -1,1323 +0,0 @@
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt
---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt	2011-01-18 07:40:25.000000000 +0100
-@@ -1,16 +1,11 @@
- 
--
- include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/)
- 
--set(wpgimport_PART_SRCS 
--WPGImport.cpp 
--OdgExporter.cxx
--FileOutputHandler.cxx
--GraphicsElement.cxx)
-+set(wpgimport_PART_SRCS WPGImport.cpp)
- 
- kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
- 
--target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
-+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
- 
- install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,95 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "FileOutputHandler.hxx"
--
--FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) :
--	mbIsTagOpened(false),
--	mContentStream(contentStream)
--{
--}
--
--void FileOutputHandler::startDocument()
--{
--}
--
--void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << "<" << psName;
--
--	for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++)
--	{
--		mContentStream << " " <<  (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\"";
--	}
--	mbIsTagOpened = true;
--	msOpenedTagName = psName;
--}
--
--void FileOutputHandler::endElement(const char *psName)
--{
--	if (mbIsTagOpened)
--	{
--		if( msOpenedTagName == psName )
--		{
--			mContentStream << "/>";
--			mbIsTagOpened = false;
--		}
--		else // should not happen, but handle it
--		{
--			mContentStream << ">";
--			mContentStream << "</" << psName << ">";
--			mbIsTagOpened = false;
--		}
--	}
--	else
--	{
--		mContentStream << "</" << psName << ">";
--		mbIsTagOpened = false;
--	}
--}
--
--void FileOutputHandler::characters(const std::string &sCharacters)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << sCharacters.c_str();
--}
--
--void FileOutputHandler::endDocument()
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,49 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef FILEOUTPUTHANDLER_H
--#define FILEOUTPUTHANDLER_H
--
--#include <iostream>
--#include <sstream>
--#include <string>
--#include "GraphicsHandler.hxx"
--
--class FileOutputHandler : public GraphicsHandler
--{
--  public:
--        explicit FileOutputHandler(std::ostringstream &contentStream);
--        virtual void startDocument();
--        virtual void endDocument();
--        virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList);
--        virtual void endElement(const char *psName);
--        virtual void characters(const std::string &sCharacters);
--
--  private:
--	bool mbIsTagOpened;
--	std::string msOpenedTagName;
--	std::ostringstream &mContentStream;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,66 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <string.h>
--
--#define ASCII_SPACE 0x0020
--
--void TagGraphicsElement::print() const
--{
--}
--
--void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->startElement(getTagName().c_str(), maAttrList);
--}
--
--void OpenTagGraphicsElement::print() const
--{ 
--	TagGraphicsElement::print(); 	
--}
--
--void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue)
--{
--	std::pair<std::string, std::string> tmpAttribute;
--	tmpAttribute.first = szAttributeName;
--	tmpAttribute.second = sAttributeValue;
--        maAttrList.push_back(tmpAttribute);
--}
--
--void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--
--	pHandler->endElement(getTagName().c_str());
--}
--
--void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->characters(msData);
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,84 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpd.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef _GRAPHICSELEMENT_H
--#define _GRAPHICSELEMENT_H
--#include <string>
--#include <map>
--#include <vector>
--
--#include "GraphicsHandler.hxx"
--
--class GraphicsElement
--{
--public:	
--	virtual ~GraphicsElement() {}
--	virtual void write(GraphicsHandler *pHandler) const = 0;
--	virtual void print() const {}
--};
--
--class TagGraphicsElement : public GraphicsElement
--{
--public:
--	explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {}
--	const std::string &getTagName() const { return msTagName; }
--	virtual void print() const;
--private:
--	const std::string msTagName;
--};
--
--class OpenTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	~OpenTagGraphicsElement() {}
--	void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue);
--	virtual void write(GraphicsHandler *pHandler) const;
--	virtual void print () const;
--private:
--	std::vector<std::pair<std::string, std::string> > maAttrList;
--};
--
--class CloseTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--};
--
--class CharDataGraphicsElement : public GraphicsElement
--{
--public:
--	CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--private:
--	std::string msData;
--};
--
--
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,43 +0,0 @@
--/*
-- * Copyright (C) 2004 William Lachance (wlach@interlog.com)
-- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- *  Contributor(s): Martin Gallwey (gallwey@sun.com)
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--#ifndef _GRAPHICSHANDLER_H
--#define _GRAPHICSHANDLER_H
--#include <string>
--#include <map>
--#include <vector>
--
--class GraphicsHandler
--{
--public:
--	virtual ~GraphicsHandler() {}
--        virtual void startDocument() = 0;
--        virtual void endDocument() = 0;
--        virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0;
--        virtual void endElement(const char *psName) = 0;
--        virtual void characters(const std::string &sCharacters) = 0;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,662 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "OdgExporter.hxx"
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <locale.h>
--
--static std::string doubleToString(const double value)
--{
--  std::ostringstream tempStream;
--  tempStream << value;
--  std::string decimalPoint(localeconv()->decimal_point);
--  if ((decimalPoint.size() == 0) || (decimalPoint == "."))
--    return tempStream.str();
--  std::string stringValue(tempStream.str());
--  if (!stringValue.empty())
--  {
--    std::string::size_type pos;
--    while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
--          stringValue.replace(pos,decimalPoint.size(),".");
--  }
--  return stringValue;
--}
--
--
--OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML):
--        mpHandler(pHandler),
--        m_fillRule(AlternatingFill),
--        m_gradientIndex(1),
--        m_dashIndex(1),
--        m_styleIndex(1),
--        m_width(0.0f),
--        m_height(0.0f),
--        m_isFlatXML(isFlatXML)
--{
--}
--
--OdgExporter::~OdgExporter()
--{
--        for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                delete (*iterStroke);
--
--        for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                delete (*iterGradient);
--
--        for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                delete (*iterAutomaticStyles);
--
--        for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--                delete (*bodyIter);
--}
--
--void OdgExporter::startGraphics(double width, double height)
--{
--        m_gradientIndex = 1;
--        m_dashIndex = 1;
--        m_styleIndex = 1;
--        m_width = width;
--        m_height = height;
--
--
--        mpHandler->startDocument();
--        OpenTagGraphicsElement tmpOfficeDocumentContent("office:document");
--        tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
--        tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
--        tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
--        if (m_isFlatXML)
--                        tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing");
--        tmpOfficeDocumentContent.write(mpHandler);
--
--        OpenTagGraphicsElement("office:settings").write(mpHandler);
--
--        OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set");
--        configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings");
--        configItemSetOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement configItemOpenElement1("config:config-item");
--        configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop");
--        configItemOpenElement1.addAttribute("config:type", "int");
--        configItemOpenElement1.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement2("config:config-item");
--        configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft");
--        configItemOpenElement2.addAttribute("config:type", "int");
--        configItemOpenElement2.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement3("config:config-item");
--        configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth");
--        configItemOpenElement3.addAttribute("config:type", "int");
--        configItemOpenElement3.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * width);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement4("config:config-item");
--        configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight");
--        configItemOpenElement4.addAttribute("config:type", "int");
--        configItemOpenElement4.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * height);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        mpHandler->endElement("config:config-item-set");
--
--        mpHandler->endElement("office:settings");
--
--}
--
--void OdgExporter::endGraphics()
--{
--        OpenTagGraphicsElement("office:styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                (*iterStroke)->write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                (*iterGradient)->write(mpHandler);
--
--        mpHandler->endElement("office:styles");
--
--        OpenTagGraphicsElement("office:automatic-styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                (*iterAutomaticStyles)->write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout");
--        tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
--        tmpStylePageLayoutOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in");
--        m_value.str("");
--        m_value <<  doubleToString(m_width) << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(m_height)  << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str());
--        m_value.str("");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
--        tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:page-layout-properties");
--
--        mpHandler->endElement("style:page-layout");
--
--        OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style");
--        tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
--        tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
--        tmpStyleStyleOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
--        // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
--        tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
--        tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:drawing-page-properties");
--
--        mpHandler->endElement("style:style");
--
--        mpHandler->endElement("office:automatic-styles");
--
--        OpenTagGraphicsElement("office:master-styles").write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page");
--        tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
--        tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
--        tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpStyleMasterPageOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:master-page");
--
--        mpHandler->endElement("office:master-styles");
--
--        OpenTagGraphicsElement("office:body").write(mpHandler);
--
--        OpenTagGraphicsElement("office:drawing").write(mpHandler);
--
--        OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page");
--        tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
--        tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
--        tmpDrawPageOpenElement.write(mpHandler);
--
--        for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--        {
--                (*bodyIter)->write(mpHandler);
--        }
--
--        mpHandler->endElement("draw:page");
--        mpHandler->endElement("office:drawing");
--        mpHandler->endElement("office:body");
--        mpHandler->endElement("office:document");
--
--        mpHandler->endDocument();
--}
--
--void OdgExporter::setPen(const libwpg::WPGPen& pen)
--{
--        m_pen = pen;
--}
--
--void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
--{
--        m_brush = brush;
--}
--
--void OdgExporter::setFillRule(FillRule rule)
--{
--        m_fillRule = rule;
--}
--
--void OdgExporter::startLayer(unsigned int)
--{
--}
--
--void OdgExporter::endLayer(unsigned int)
--{
--}
--
--void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double )
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawRectElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x2-rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y2-rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rx) << "in";
--        // FIXME: what to do when rx != ry ?
--        pDrawRectElement->addAttribute("draw:corner-radius", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect")));
--}
--
--void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawEllipseElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.x - rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.y - ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse")));
--}
--
--void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
--{
--        if(vertices.count() < 2)
--                return;
--
--        if(vertices.count() == 2)
--        {
--                const libwpg::WPGPoint& p1 = vertices[0];
--                const libwpg::WPGPoint& p2 = vertices[1];
--
--                writeStyle();
--                OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line");
--                m_value.str("");
--                m_value << "gr" << m_styleIndex-1;
--                pDrawLineElement->addAttribute("draw:style-name", m_value.str());
--                m_value.str("");
--                pDrawLineElement->addAttribute("draw:text-style-name", "P1");
--                pDrawLineElement->addAttribute("draw:layer", "layout");
--                m_value << doubleToString(p1.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x1", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p1.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y1", m_value.str());
--                m_value.str("");
--                m_value  << doubleToString(p2.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x2", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p2.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y2", m_value.str());
--                m_value.str("");
--                mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement));
--                mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line")));
--        }
--        else
--        {
--                // draw as path
--                libwpg::WPGPath path;
--                path.moveTo(vertices[0]);
--                for(unsigned long ii = 1; ii < vertices.count(); ii++)
--                        path.lineTo(vertices[ii]);
--                path.closed = true;
--                drawPath(path);
--        }
--}
--
--void OdgExporter::drawPath(const libwpg::WPGPath& path)
--{
--        if(path.count() == 0)
--                return;
--
--        // try to find the bounding box
--        // this is simple convex hull technique, the bounding box might not be
--        // accurate but that should be enough for this purpose
--        libwpg::WPGPoint p = path.element(0).point;
--        libwpg::WPGPoint q = path.element(0).point;
--        for(unsigned k = 0; k < path.count(); k++)
--        {
--                libwpg::WPGPathElement element = path.element(k);
--                p.x = (p.x > element.point.x) ? element.point.x : p.x;
--                p.y = (p.y > element.point.y) ? element.point.y : p.y;
--                q.x = (q.x < element.point.x) ? element.point.x : q.x;
--                q.y = (q.y < element.point.y) ? element.point.y : q.y;
--                if(element.type == libwpg::WPGPathElement::CurveToElement)
--                {
--                        p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
--                        p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
--                        q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
--                        q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
--                        p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
--                        p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
--                        q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
--                        q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
--                }
--        }
--        double vw = q.x - p.x;
--        double vh = q.y - p.y;
--
--        writeStyle();
--
--        OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawPathElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        pDrawPathElement->addAttribute("draw:text-style-name", "P1");
--        pDrawPathElement->addAttribute("draw:layer", "layout");
--        m_value << doubleToString(p.x)  << "in";
--        pDrawPathElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(p.y)  << "in";
--        pDrawPathElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vw) << "in";
--        pDrawPathElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vh) << "in";
--        pDrawPathElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540);
--        pDrawPathElement->addAttribute("svg:viewBox", m_value.str());
--        m_value.str("");
--
--        for(unsigned i = 0; i < path.count(); i++)
--        {
--                libwpg::WPGPathElement element = path.element(i);
--                libwpg::WPGPoint point = element.point;
--                switch(element.type)
--                {
--                        // 2540 is 2.54*1000, 2.54 in = 1 in
--                        case libwpg::WPGPathElement::MoveToElement:
--                                m_value << "M" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::LineToElement:
--                                m_value << "L" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::CurveToElement:
--                                m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra1.y-p.y)*2540) << " ";
--                                m_value << (int)((element.extra2.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra2.y-p.y)*2540) << " ";
--                                m_value << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        default:
--                                break;
--                }
--        }
--        if(path.closed)
--                m_value << " Z";
--        pDrawPathElement->addAttribute("svg:d", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path")));
--}
--
--
--void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
--{
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary;
--        bitmap.generateBase64DIB(base64Binary);
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
--{
--        if (binaryData.mimeType.length() <= 0)
--                return;
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary = binaryData.getBase64Data();
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--
--static std::string colorToHex(const libwpg::WPGColor& color)
--{
--        char hexdigits[] = "0123456789abcdef";
--        char buffer[] = "123456";
--        buffer[0] = hexdigits[(color.red >> 4) & 15];
--        buffer[1] = hexdigits[color.red & 15];
--        buffer[2] = hexdigits[(color.green >> 4) & 15];
--        buffer[3] = hexdigits[color.green & 15];
--        buffer[4] = hexdigits[(color.blue >> 4) & 15];
--        buffer[5] = hexdigits[color.blue & 15];
--        return std::string(buffer);
--}
--
--void OdgExporter::writeStyle()
--{
--        m_value.str("");
--        m_name.str("");
--
--        if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
--        {
--                // ODG only supports dashes with the same length of spaces inbetween
--                // here we take the first space and assume everything else the same
--                // note that dash length is written in percentage
--                double distance = m_pen.dashArray.at(1);
--                OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash");
--                tmpDrawStrokeDashElement->addAttribute("draw:style", "rect");
--                m_value << "Dash_" << m_dashIndex++;
--                tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(distance*100) << "%";
--                tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str());
--                m_value.str("");
--                for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
--                {
--                        m_name << "draw:dots" << i+1;
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1");
--                        m_name.str("");
--                        m_name << "draw:dots" << i+1 << "-length";
--                        m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%";
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str());
--                        m_name.str("");
--                        m_value.str("");
--                }
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement));
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash")));
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient");
--                tmpDrawGradientElement->addAttribute("draw:style", "linear");
--                m_value << "Gradient_" << m_gradientIndex++;
--                tmpDrawGradientElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--
--                // ODG angle unit is 0.1 degree
--                double angle = -m_brush.gradient.angle();
--                while(angle < 0)
--                        angle += 360;
--                while(angle > 360)
--                        angle -= 360;
--
--                m_value << (unsigned)(angle*10);
--                tmpDrawGradientElement->addAttribute("draw:angle", m_value.str());
--                m_value.str("");
--
--                libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
--                libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
--                m_value << "#" << colorToHex(startColor);
--                tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(stopColor);
--                tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str());
--                m_value.str("");
--                tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:border", "0%");
--                mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement));
--                mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient")));
--        }
--
--        OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style");
--        m_value << "gr" << m_styleIndex;
--        tmpStyleStyleElement->addAttribute("style:name", m_value.str());
--        m_value.str("");
--        tmpStyleStyleElement->addAttribute("style:family", "graphic");
--        tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard");
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement));
--
--        OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties");
--
--        if(m_pen.width > 0.0)
--        {
--                m_value << doubleToString(m_pen.width) << "in";
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(m_pen.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str());
--                m_value.str("");
--
--                if(!m_pen.solid)
--                {
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash");
--                        m_value << "Dash_" << m_dashIndex-1;
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str());
--                        m_value.str("");
--                }
--        }
--        else
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::NoBrush)
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::Solid)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid");
--                m_value << "#" << colorToHex(m_brush.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str());
--                m_value.str("");
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient");
--                m_value << "Gradient_" << m_gradientIndex-1;
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str());
--                m_value.str("");
--        }
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement));
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties")));
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style")));
--        m_styleIndex++;
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,116 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef __ODGEXPORTER_H__
--#define __ODGEXPORTER_H__
--
--#include <iostream>
--#include <sstream>
--#include <string>
--
--#include <libwpg/libwpg.h>
--#include "GraphicsElement.hxx"
--
--class OdgExporter : public libwpg::WPGPaintInterface {
--public:
--	explicit OdgExporter(GraphicsHandler *pHandler,
--			     const bool isFlatXML = false);
--	~OdgExporter();
--
--#if LIBWPG_VERSION_MINOR<2
--	void startGraphics(double imageWidth, double imageHeight);
--	void endGraphics();
--	void startLayer(unsigned int id);
--	void endLayer(unsigned int id);
--
--	void setPen(const libwpg::WPGPen& pen);
--	void setBrush(const libwpg::WPGBrush& brush);
--	void setFillRule(FillRule rule);
--
--	void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
--	void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
--	void drawPolygon(const libwpg::WPGPointArray& vertices);
--	void drawPath(const libwpg::WPGPath& path);
--	void drawBitmap(const libwpg::WPGBitmap& bitmap);
--	void drawImageObject(const libwpg::WPGBinaryData& binaryData);
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	libwpg::WPGPen m_pen;
--	libwpg::WPGBrush m_brush;
--	FillRule m_fillRule;
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#else
--	virtual void startGraphics(const ::WPXPropertyList &propList);
--	virtual void endGraphics();
--	virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
--	virtual void startLayer(const ::WPXPropertyList &propList);
--	virtual void endLayer();
--	virtual void drawRectangle(const ::WPXPropertyList& propList);
--	virtual void drawEllipse(const ::WPXPropertyList& propList);
--	virtual void drawPolygon(const ::WPXPropertyListVector &vertices);
--	virtual void drawPath(const ::WPXPropertyListVector &path);
--	virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
--	virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList);
--	virtual void endEmbeddedGraphics();
--	virtual void drawPolyline(const ::WPXPropertyListVector &vertices);
--	virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
--	virtual void endTextObject();
--	virtual void startTextLine(const ::WPXPropertyList &propList);
--	virtual void endTextLine();
--	virtual void startTextSpan(const ::WPXPropertyList &propList);
--	virtual void endTextSpan();
--	virtual void insertText(const ::WPXString &str);
--
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#endif
--};
--
--#endif // __ODGEXPORTER_H__
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp
---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp	2011-01-02 17:46:15.000000000 +0100
-@@ -20,28 +20,26 @@
- #include <WPGImport.h>
- #include <WPGImport.moc>
- 
--#include <QBuffer>
--#include <QByteArray>
--#include <QString>
--
--#include <kdebug.h>
- #include <KoFilterChain.h>
- #include <KoGlobal.h>
- #include <KoUnit.h>
-+#include <KoXmlWriter.h>
-+
- #include <kpluginfactory.h>
-+#include <KDebug>
- 
--#include <KoXmlWriter.h>
-+
-+#include <QtCore/QString>
-+#include <QtCore/QFile>
- 
- #include <libwpg/libwpg.h>
- #if LIBWPG_VERSION_MINOR<2
- #include <libwpg/WPGStreamImplementation.h>
- #else
- #include <libwpd-stream/libwpd-stream.h>
-+#include <libwpd/libwpd.h>
- #endif
- 
--#include "FileOutputHandler.hxx"
--#include "OdgExporter.hxx"
--
- #include <iostream>
- 
- K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -56,35 +54,13 @@
- {
- }
- 
--static QByteArray createManifest()
--{
--    KoXmlWriter* manifestWriter;
--    QByteArray manifestData;
--    QBuffer manifestBuffer(&manifestData);
--
--    manifestBuffer.open(QIODevice::WriteOnly);
--    manifestWriter = new KoXmlWriter(&manifestBuffer);
--
--    manifestWriter->startDocument("manifest:manifest");
--    manifestWriter->startElement("manifest:manifest");
--    manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
--    manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
--    //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
--    manifestWriter->addManifestEntry("content.xml", "text/xml");
--    manifestWriter->endElement();
--    manifestWriter->endDocument();
--    delete manifestWriter;
--
--    return manifestData;
--}
--
- 
- KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
- {
-     if (from != "application/x-wpg")
-         return KoFilter::NotImplemented;
- 
--    if (to != "application/vnd.oasis.opendocument.graphics")
-+    if (to != "image/svg+xml")
-         return KoFilter::NotImplemented;
- 
- #if LIBWPG_VERSION_MINOR<2
-@@ -96,6 +72,7 @@
-             input = olestream;
-         }
-     }
-+    libwpg::WPGString output;
- #else
-     WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
-     if (input->isOLEStream()) {
-@@ -105,59 +82,31 @@
-             input = olestream;
-         }
-      }
-+     ::WPXString output;
- #endif
- 
-     if (!libwpg::WPGraphics::isSupported(input)) {
--        std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl;
-+        kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
-         delete input;
-         return KoFilter::NotImplemented;
-     }
- 
--    // do the conversion
--    std::ostringstream tmpStringStream;
--    FileOutputHandler tmpHandler(tmpStringStream);
--    OdgExporter exporter(&tmpHandler);
--    libwpg::WPGraphics::parse(input, &exporter);
--    delete input;
--
--
--    // create output store
--    KoStore* storeout;
--    storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
--                                    "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
--
--    if (!storeout) {
--        kWarning() << "Couldn't open the requested file.";
--        return KoFilter::FileNotFound;
--    }
--
--#if 0
--    if (!storeout->open("styles.xml")) {
--        kWarning() << "Couldn't open the file 'styles.xml'.";
--        return KoFilter::CreationError;
-+    if (!libwpg::WPGraphics::generateSVG(input, output)) {
-+        kWarning() << "ERROR: SVG Generation failed!";
-+        delete input;
-+        return KoFilter::ParsingError;
-     }
--    //storeout->write( createStyles() );
--    storeout->close();
--#endif
- 
--    if (!storeout->open("content.xml")) {
--        kWarning() << "Couldn't open the file 'content.xml'.";
--        return KoFilter::CreationError;
--    }
--    storeout->write(tmpStringStream.str().c_str());
--    storeout->close();
-+    delete input;
- 
--    // store document manifest
--    storeout->enterDirectory("META-INF");
--    if (!storeout->open("manifest.xml")) {
--        kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
--        return KoFilter::CreationError;
-+    QFile outputFile(m_chain->outputFile());
-+    if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-+        kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
-+        return KoFilter::InternalError;
-     }
--    storeout->write(createManifest());
--    storeout->close();
- 
--    // we are done!
--    delete storeout;
-+    outputFile.write(output.cstr());
-+    outputFile.close();
- 
-     return KoFilter::OK;
- }
-
diff --git a/extra/koffice/koffice.install b/extra/koffice/koffice.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/extra/koffice/koffice.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/koffice/krita.install b/extra/koffice/krita.install
deleted file mode 100644
index 5d458de55..000000000
--- a/extra/koffice/krita.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/koffice/qt48fix.patch b/extra/koffice/qt48fix.patch
deleted file mode 100644
index de72926d5..000000000
--- a/extra/koffice/qt48fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-02-17 13:10:38.000000000 +0100
-+++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-09-08 15:03:31.932039128 +0200
-@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh
- 	<< "visible="<<ba.isVisible()
- 	<< "brush="<<ba.brush()
- 	<< "pixmapmode="<<ba.pixmapMode()
--	<< "pixmap="<<ba.pixmap()
- 	<< ")";
-     return dbg;
- }
diff --git a/extra/ldns/Makefile.patch b/extra/ldns/Makefile.patch
deleted file mode 100644
index d98291ac9..000000000
--- a/extra/ldns/Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- old/Makefile.in	2012-01-12 00:11:36.000000000 +1100
-+++ new/Makefile.in	2012-01-27 11:36:16.110154453 +1100
-@@ -130,7 +130,7 @@
- 		exit -1 ; \
- 	fi
- drill/drill: $(DRILL_LOBJS) $(LIB)
--	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill
-+	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill
- 
- install-drill: drill/drill
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
-@@ -157,7 +157,7 @@
- 		exit -1 ; \
- 	fi
- $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB)
--	$(LINK_EXE) $@.lo $(LIBS) -lldns -o $@
-+	$(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@
- 
- $(TESTNS): $(TESTNS_LOBJS) $(LIB)
- 	$(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS)
diff --git a/extra/ldns/PKGBUILD b/extra/ldns/PKGBUILD
deleted file mode 100644
index e228c5355..000000000
--- a/extra/ldns/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 156644 2012-04-22 07:34:09Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: mathieui <mathieui@mathieui.net>
-# Contributor: jiribb <jiribb@gmail.com>
-
-pkgname=ldns
-pkgver=1.6.12
-pkgrel=1
-pkgdesc='Fast DNS library supporting recent RFCs, including Drill and other tools'
-url='http://www.nlnetlabs.nl/projects/ldns/'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-options=('!libtool')
-depends=('openssl')
-makedepends=('libpcap')
-optdepends=('libpcap: ldns-dpa tool')
-source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'Makefile.patch')
-sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa'
-          '01bce260e9639d9cd26109a689dddf2498e5026a')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../Makefile.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-static=no \
-		--disable-rpath \
-		--with-drill \
-		--with-examples \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch b/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch
deleted file mode 100644
index e1c099aae..000000000
--- a/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 64c68ad42a9089c92dfa4e74f55b6c1b65b8f11c Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cfergeau@redhat.com>
-Date: Sun, 4 Mar 2012 14:32:49 +0100
-Subject: [PATCH] Make sure gcc 4.7 can find usleep declaration
-
-Without this, compilation fails with:
-
-libmusicbrainz-4.0.0/src/Query.cc: In member function 'void MusicBrainz4::CQuery::WaitRequest() const':
-libmusicbrainz-4.0.0/src/Query.cc:295:19: error: 'usleep' was not declared in this scope
----
- src/Query.cc |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/Query.cc b/src/Query.cc
-index 5f5934f..9332346 100644
---- a/src/Query.cc
-+++ b/src/Query.cc
-@@ -33,6 +33,7 @@
- 
- #include <string.h>
- #include <sys/time.h>
-+#include <unistd.h>
- 
- #include <ne_uri.h>
- 
--- 
-1.7.7.6
-
diff --git a/extra/libreoffice/buildfix_boost.diff b/extra/libreoffice/buildfix_boost.diff
deleted file mode 100644
index d8608d0d4..000000000
--- a/extra/libreoffice/buildfix_boost.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 05 Apr 2011 14:07:02 +0000
-Subject: silence some more of that annoying gcc#47679
-
----
-diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
-index 1c804aa..9b33a5f 100644
---- a/boost/boost.gcc47679.patch
-+++ b/boost/boost.gcc47679.patch
-@@ -36,3 +36,26 @@
-          template <int MaxDigits>
-          inline bool allow_more_digits(std::size_t i)
-          {
-+--- misc/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-++++ misc/build/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-+@@ -31,6 +31,8 @@
-+ 
-+ #include "boost/optional/optional_fwd.hpp"
-+ 
-++#include <string.h>
-++
-+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
-+ // VC6.0 has the following bug:
-+ //   When a templated assignment operator exist, an implicit conversion
-+@@ -114,6 +116,11 @@
-+ 
-+   public:
-+ 
-++    aligned_storage()
-++    {
-++      memset(&dummy_, 0, sizeof(dummy_));
-++    }
-++
-+     void const* address() const { return &dummy_.data[0]; }
-+     void      * address()       { return &dummy_.data[0]; }
-+ } ;
---
-cgit v0.8.3-6-g21f6
-
diff --git a/extra/libreoffice/buildfix_ct2n.diff b/extra/libreoffice/buildfix_ct2n.diff
deleted file mode 100644
index 979587f79..000000000
--- a/extra/libreoffice/buildfix_ct2n.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 12 Apr 2011 19:35:51 +0000
-Subject: duplicate NULLs
-
----
-diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
-index 91f44b7..714d926 100644
---- a/ct2n/prj/build.lst
-+++ b/ct2n/prj/build.lst
-@@ -1,3 +1,3 @@
--ct2n	ct2n	:	solenv NULL NULL
-+ct2n	ct2n	:	solenv NULL
- ct2n	ct2n		usr1	-	all	ct2n_mkout NULL
- ct2n	ct2n      nmake	-	all	ct2n_ct2n NULL
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/libreoffice/gcc462_buildfix.diff b/extra/libreoffice/gcc462_buildfix.diff
deleted file mode 100644
index c19e520dc..000000000
--- a/extra/libreoffice/gcc462_buildfix.diff
+++ /dev/null
@@ -1,138 +0,0 @@
---- ./framework/source/accelerators/acceleratorcache.cxx.orig	2011-12-15 15:08:41.329168423 -0200
-+++ ./framework/source/accelerators/acceleratorcache.cxx	2011-12-15 15:17:59.473190664 -0200
-@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache()
- AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
-     : ThreadHelpBase(&Application::GetSolarMutex())
- {
--    m_lCommand2Keys = rCopy.m_lCommand2Keys;
-+    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
-     m_lKey2Commands = rCopy.m_lKey2Commands;
- }
- 
-@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac
-     // SAFE -> ----------------------------------
-     WriteGuard aWriteLock(m_aLock);
-     
--    m_lCommand2Keys = rCopy.m_lCommand2Keys;
-+    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
-     m_lKey2Commands = rCopy.m_lKey2Commands;
-     
-     aWriteLock.unlock();
---- ./framework/source/loadenv/loadenv.cxx.orig	2011-12-15 15:08:15.771487938 -0200
-+++ ./framework/source/loadenv/loadenv.cxx	2011-12-15 15:19:06.038358483 -0200
-@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const ::
-     // take over all new parameters.
-     m_xTargetFrame.clear();
-     m_xBaseFrame                    = xBaseFrame        ;
--    m_lMediaDescriptor              = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-+    ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-+    m_lMediaDescriptor              =  tmp;
-     m_sTarget                       = sTarget           ;
-     m_nSearchFlags                  = nSearchFlags      ;
-     m_eFeature                      = eFeature          ;
---- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig	2011-12-15 15:08:49.033072112 -0200
-+++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx	2011-12-15 15:11:07.209344668 -0200
-@@ -175,6 +175,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+                UIElementType& operator=(const UIElementType& rRight) {
-+                        bModified = rRight.bModified;
-+                        bLoaded = rRight.bLoaded;
-+                        bDefaultLayer = rRight.bDefaultLayer;
-+                        nElementType = rRight.nElementType;
-+                        aElementsHashMap = rRight.aElementsHashMap;
-+                        xStorage = rRight.xStorage;
-+                        return *this;
-+                };
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
---- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig	2011-12-19 11:10:56.000000000 +0000
-+++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx	2011-12-19 11:12:06.000000000 +0000
-@@ -185,6 +185,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+		UIElementType& operator=(const UIElementType& rRight) {
-+			bModified = rRight.bModified;
-+			bLoaded = rRight.bLoaded;
-+			bDefaultLayer = rRight.bDefaultLayer;
-+			nElementType = rRight.nElementType;
-+			aElementsHashMap = rRight.aElementsHashMap;
-+			xStorage = rRight.xStorage;
-+			return *this;
-+		};
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
---- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig	2011-12-19 11:14:17.000000000 +0000
-+++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx	2011-12-19 11:15:16.000000000 +0000
-@@ -171,6 +171,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+                UIElementType& operator=(const UIElementType& rRight) {
-+                        bModified = rRight.bModified;
-+                        bLoaded = rRight.bLoaded;
-+                        bDefaultLayer = rRight.bDefaultLayer;
-+                        nElementType = rRight.nElementType;
-+                        aElementsHashMap = rRight.aElementsHashMap;
-+                        xStorage = rRight.xStorage;
-+                        return *this;
-+                };
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
-
---- ./padmin/source/prtsetup.cxx.orig	2011-12-15 15:09:05.133870823 -0200
-+++ ./padmin/source/prtsetup.cxx	2011-12-15 15:13:55.626239170 -0200
-@@ -813,7 +813,7 @@ extern "C" {
- 
-         if( aDialog.Execute() )
-         {
--            rJobData = aDialog.getSetup();
-+            rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() );
-             nRet = 1;
-         }
- 
---- ./sfx2/source/doc/guisaveas.cxx.orig	2011-12-15 15:08:58.332955848 -0200
-+++ ./sfx2/source/doc/guisaveas.cxx	2011-12-15 15:12:39.953185212 -0200
-@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co
-         if ( aFilterName.getLength() )
-             m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps;
- 
--        aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps );
-+        aFiltPropsHM <<  aFilterProps;
-         nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 );
-     }
- 
---- ./framework/inc/classes/filtercachedata.hxx.orig	2011-12-17 13:14:22.102898902 +0000
-+++ ./framework/inc/classes/filtercachedata.hxx	2011-12-17 13:17:51.524424012 +0000
-@@ -230,7 +230,7 @@
-         {
-             bPreferred			= rCopy.bPreferred		;
-             sName				= rCopy.sName			;
--            lUINames			= rCopy.lUINames		;
-+            lUINames			= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             sMediaType			= rCopy.sMediaType		;
-             sClipboardFormat	= rCopy.sClipboardFormat;
-             nDocumentIconID		= rCopy.nDocumentIconID	;
-@@ -298,7 +298,7 @@
-             nOrder              = rCopy.nOrder              ;
-             sName				= rCopy.sName				;
-             sType				= rCopy.sType				;
--            lUINames			= rCopy.lUINames			;
-+            lUINames			= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             sDocumentService	= rCopy.sDocumentService	;
-             sFilterService		= rCopy.sFilterService		;
-             sUIComponent        = rCopy.sUIComponent        ;
-@@ -405,7 +405,7 @@
-         inline Loader& impl_copy( const Loader& rCopy )
-         {
-             sName       = rCopy.sName       ;
--            lUINames	= rCopy.lUINames	;
-+            lUINames	= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             lTypes		= rCopy.lTypes		;
-             return (*this);
-         }
diff --git a/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff b/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff
deleted file mode 100644
index fd61cb4ca..000000000
--- a/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- scp2/inc/macros.inc.old	2011-05-18 17:51:47.000000000 +0200
-+++ scp2/inc/macros.inc	2011-07-18 19:58:27.000000000 +0200
-@@ -92,10 +92,10 @@
- #endif
- 
- #define BIN_FILE_BODY \
--        UnixRights   = 555
-+        UnixRights   = 755
- 
- #define TXT_FILE_BODY \
--        UnixRights   = 444
-+        UnixRights   = 644
- 
- #define USER_FILE_BODY \
-         UnixRights   = 644
diff --git a/extra/libreoffice/vbahelper.visibility.patch b/extra/libreoffice/vbahelper.visibility.patch
deleted file mode 100644
index 5739100d0..000000000
--- a/extra/libreoffice/vbahelper.visibility.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:27:51.507604173 +0000
-+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:28:26.230045727 +0000
-@@ -238,7 +238,7 @@
- 
- // including a HelperInterface implementation
- template< typename Ifc1 >
--class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
-+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
- {
- typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
- protected:
---- sc/Library_vbaobj.mk
-+++ sc/Library_vbaobj.mk
-@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbaquerytable \
-         sc/source/ui/vba/vbarange \
-         sc/source/ui/vba/vbasheetobject \
--        sc/source/ui/vba/vbasheetobjects \
-         sc/source/ui/vba/vbastyle \
-         sc/source/ui/vba/vbastyles \
-         sc/source/ui/vba/vbatextboxshape \
-@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbawsfunction \
- ))
- 
-+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
-+        sc/source/ui/vba/vbasheetobjects \
-+        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-+))
-+
- ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
- $(eval $(call gb_Library_set_ldflags,vbaobj,\
- 	$$(LDFLAGS) \
diff --git a/extra/libwebkit/libwebkit.install b/extra/libwebkit/libwebkit.install
deleted file mode 100644
index 24072f316..000000000
--- a/extra/libwebkit/libwebkit.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/libxfce4menu/PKGBUILD b/extra/libxfce4menu/PKGBUILD
deleted file mode 100644
index 0d3b42eb2..000000000
--- a/extra/libxfce4menu/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149268 2012-02-06 17:05:53Z foutrelis $
-# Maintainer: tobias <tobias funnychar archlinux.org>
-
-pkgname=libxfce4menu
-pkgver=4.6.2
-pkgrel=2
-pkgdesc="A freedesktop.org compliant menu implementation for Xfce"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.xfce.org/"
-depends=("libxfce4util>=4.6.2")
-makedepends=('pkgconfig' 'intltool' 'gtk2')
-options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ff10cacb76803ee37159e3a43345f0d1')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/openjpeg/openjpeg-1.4-autoconf.patch b/extra/openjpeg/openjpeg-1.4-autoconf.patch
deleted file mode 100644
index 988b72b7d..000000000
--- a/extra/openjpeg/openjpeg-1.4-autoconf.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -up openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/doc/Makefile.am
---- openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR	2011-01-02 12:14:47.000000000 -0600
-+++ openjpeg_v1_4_sources_r697/doc/Makefile.am	2011-01-12 12:12:20.959518549 -0600
-@@ -20,30 +20,30 @@ all-local:
- 	@cp man/man3/* .
- 
- install-data-hook:
--	$(INSTALL) -d $(doc_dir)
--	$(INSTALL) -d ${mandir}/man1 ${mandir}/man3
-+	$(INSTALL) -d $(DESTDIR)$(doc_dir)
-+	$(INSTALL) -d $(DESTDIR)${mandir}/man1 $(DESTDIR)${mandir}/man3
- if with_libjpwl
--	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
--	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
-+	@(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
-+	@(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
- endif
--	@(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
--	@(cd ${mandir}/man3 && $(RM) libopenjpeg* )
-+	@(cd $(DESTDIR)${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
-+	@(cd $(DESTDIR)${mandir}/man3 && $(RM) libopenjpeg* )
- 	@gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3
--	@cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1
--	@cp libopenjpeg.3.gz ${mandir}/man3
-+	@cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(DESTDIR)${mandir}/man1
-+	@cp libopenjpeg.3.gz $(DESTDIR)${mandir}/man3
- 	@$(RM) *\.gz
- if with_libjpwl
--	@(cd ${mandir}/man1 && \
-+	@(cd $(DESTDIR)${mandir}/man1 && \
- 	$(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \
- 	$(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz)
- 	@(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz)
- endif
--	@$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir)
-+	@$(INSTALL) -m 644 ../LICENSE ../CHANGES $(DESTDIR)$(doc_dir)
- 
- uninstall-hook:
--	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
-+	@(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
- 	$(RM) image_to_j2k* j2k_to_image* j2k_dump* )
--	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
-+	@(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
- 	$(RM) libopenjpeg* )
--	@(cd $(doc_dir) && $(RM) * )
--	@rmdir $(doc_dir)
-+	@(cd $(DESTDIR)$(doc_dir) && $(RM) * )
-+	@rmdir $(DESTDIR)$(doc_dir)
-diff -up openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/Makefile.am
---- openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR	2011-01-02 12:14:55.000000000 -0600
-+++ openjpeg_v1_4_sources_r697/Makefile.am	2011-01-12 12:15:37.006321242 -0600
-@@ -9,7 +9,7 @@ clean-local:
- 
- distclean-local: clean-local
- 
--pkgconf_dir = /usr/lib/pkgconfig
-+pkgconf_dir = $(libdir)/pkgconfig
- 
- install-data-hook:
- 	@echo ""
-@@ -17,12 +17,12 @@ install-data-hook:
- 	cat $$f/.report.txt ; \
- 	done
- 	@echo ""
--	@echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"
-+	@echo "Installing: libopenjpeg1.pc $(DESTDIR)$(pkgconf_dir)"
- 	@echo ""
--	@$(INSTALL) -d $(pkgconf_dir)
--	@cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc
--	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \
-+	@$(INSTALL) -d $(DESTDIR)$(pkgconf_dir)
-+	@cp libopenjpeg.pc $(DESTDIR)$(pkgconf_dir)/libopenjpeg1.pc
-+	@(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc && \
- 	$(LN_S) libopenjpeg1.pc libopenjpeg.pc)
- 
- uninstall-hook:
--	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
-+	@(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
diff --git a/extra/php/pcre_info.patch b/extra/php/pcre_info.patch
deleted file mode 100644
index e6d10df06..000000000
--- a/extra/php/pcre_info.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- php-5.3.10/ext/pcre/php_pcre.c	2012-01-01 14:15:04.000000000 +0100
-+++ php-5.3.10/ext/pcre/php_pcre.c	2012-02-06 13:31:36.198935107 +0100
-@@ -241,6 +241,7 @@
- 	char				*pattern;
- 	int					 do_study = 0;
- 	int					 poptions = 0;
-+	int				count = 0;
- 	unsigned const char *tables = NULL;
- #if HAVE_SETLOCALE
- 	char				*locale = setlocale(LC_CTYPE, NULL);
-@@ -252,10 +252,10 @@
- 	   back the compiled pattern, otherwise go on and compile it. */
- 	if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
- 		/*
--		 * We use a quick pcre_info() check to see whether cache is corrupted, and if it
-+		 * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
- 		 * is, we flush it and compile the pattern from scratch.
- 		 */
--		if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
-+		if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
- 			zend_hash_clean(&PCRE_G(pcre_cache));
- 		} else {
- #if HAVE_SETLOCALE
---- php-5.3.10/ext/pcre/php_pcre.def	2009-01-11 14:59:00.000000000 +0100
-+++ php-5.3.10/ext/pcre/php_pcre.def	2012-02-06 13:31:47.775299315 +0100
-@@ -4,7 +4,6 @@
- php_pcre_exec
- php_pcre_get_substring
- php_pcre_get_substring_list
--php_pcre_info
- php_pcre_maketables
- php_pcre_study
- php_pcre_version
---- php-5.3.10/main/php_compat.h	2012-01-01 14:15:04.000000000 +0100
-+++ php-5.3.10/main/php_compat.h	2012-02-06 13:26:59.272834580 +0100
-@@ -34,7 +34,6 @@
- #define pcre_exec			php_pcre_exec
- #define pcre_get_substring		php_pcre_get_substring
- #define pcre_get_substring_list		php_pcre_get_substring_list
--#define pcre_info			php_pcre_info
- #define pcre_maketables			php_pcre_maketables
- #define pcre_study			php_pcre_study
- #define pcre_version			php_pcre_version
diff --git a/extra/pidgin/port-to-farstream-v2.patch b/extra/pidgin/port-to-farstream-v2.patch
deleted file mode 100644
index 49ae60906..000000000
--- a/extra/pidgin/port-to-farstream-v2.patch
+++ /dev/null
@@ -1,447 +0,0 @@
-diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac
---- pidgin-2.10.1.orig/configure.ac	2011-12-06 10:44:32.000000000 +0200
-+++ pidgin-2.10.1/configure.ac	2012-03-10 18:21:12.000000000 +0200
-@@ -780,18 +780,18 @@ else
- fi
- 
- dnl #######################################################################
--dnl # Check for Farsight
-+dnl # Check for Farstream
- dnl #######################################################################
--AC_ARG_ENABLE(farsight,
--	[AC_HELP_STRING([--disable-farsight], [compile without farsight support])],
--	enable_farsight="$enableval", enable_farsight="yes")
--if test "x$enable_farsight" != "xno"; then
--	PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [
--		AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
--		AC_SUBST(FARSIGHT_CFLAGS)
--		AC_SUBST(FARSIGHT_LIBS)
-+AC_ARG_ENABLE(farstream,
-+	[AC_HELP_STRING([--disable-farstream], [compile without farstream support])],
-+	enable_farstream="$enableval", enable_farstream="yes")
-+if test "x$enable_farstream" != "xno"; then
-+	PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
-+		AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video])
-+		AC_SUBST(FARSTREAM_CFLAGS)
-+		AC_SUBST(FARSTREAM_LIBS)
- 	], [
--		enable_farsight="no"
-+		enable_farstream="no"
- 	])
- fi
- 
-@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv,
- 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
- 	enable_vv="$enableval", enable_vv="yes")
- if test "x$enable_vv" != "xno"; then
--	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then
-+	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
- 		AC_DEFINE(USE_VV, 1, [Use voice and video])
- 	else
- 		enable_vv="no"
- 		if test "x$force_deps" = "xyes"; then
- 			AC_MSG_ERROR([
- Dependencies for voice/video were not met.
--Install the necessary gstreamer and farsight packages first.
-+Install the necessary gstreamer and farstream packages first.
- Or use --disable-vv if you do not need voice/video support.
- 			])
- 		fi
- 	fi
- fi
--AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")
-+AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
- 
- dnl #######################################################################
- dnl # Check for Internationalized Domain Name support
-diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am
---- pidgin-2.10.1.orig/libpurple/Makefile.am	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/Makefile.am	2012-03-10 18:21:19.000000000 +0200
-@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \
- 	$(LIBXML_LIBS) \
- 	$(NETWORKMANAGER_LIBS) \
- 	$(INTLLIBS) \
--	$(FARSIGHT_LIBS) \
-+	$(FARSTREAM_LIBS) \
- 	$(GSTREAMER_LIBS) \
- 	$(GSTINTERFACES_LIBS) \
- 	$(IDN_LIBS) \
-@@ -322,7 +322,7 @@ AM_CPPFLAGS = \
- 	$(DEBUG_CFLAGS) \
- 	$(DBUS_CFLAGS) \
- 	$(LIBXML_CFLAGS) \
--	$(FARSIGHT_CFLAGS) \
-+	$(FARSTREAM_CFLAGS) \
- 	$(GSTREAMER_CFLAGS) \
- 	$(GSTINTERFACES_CFLAGS) \
- 	$(IDN_CFLAGS) \
-diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c
---- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/media/backend-fs2.c	2012-03-10 18:21:19.000000000 +0200
-@@ -1,5 +1,5 @@
- /**
-- * @file backend-fs2.c Farsight 2 backend for media API
-+ * @file backend-fs2.c Farstream backend for media API
-  * @ingroup core
-  */
- 
-@@ -34,8 +34,9 @@
- #include "network.h"
- #include "media-gst.h"
- 
--#include <gst/farsight/fs-conference-iface.h>
--#include <gst/farsight/fs-element-added-notifier.h>
-+#include <farstream/fs-conference.h>
-+#include <farstream/fs-element-added-notifier.h>
-+#include <farstream/fs-utils.h>
- 
- /** @copydoc _PurpleMediaBackendFs2Class */
- typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
-@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream
- 	gchar *participant;
- 	FsStream *stream;
- 
-+        gboolean supports_add;
-+
- 	GstElement *src;
- 	GstElement *tee;
- 	GstElement *volume;
-@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private
- 	FsConference *conference;
- 	gchar *conference_type;
- 
-+        FsElementAddedNotifier *notifier;
-+
- 	GHashTable *sessions;
- 	GHashTable *participants;
- 
-@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject
- 
- 	purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n");
- 
-+	if (priv->notifier) {
-+		g_object_unref(priv->notifier);
-+		priv->notifier = NULL;
-+	}
-+
- 	if (priv->confbin) {
- 		GstElement *pipeline;
- 
-@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus,
- 			priv->conference != FS_CONFERENCE(src))
- 		return;
- 
--	if (gst_structure_has_name(msg->structure, "farsight-error")) {
-+	if (gst_structure_has_name(msg->structure, "farstream-error")) {
- 		FsError error_no;
- 		gst_structure_get_enum(msg->structure, "error-no",
- 				FS_TYPE_ERROR, (gint*)&error_no);
-@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus,
- 						" strict."));
- 				purple_media_end(priv->media, NULL, NULL);
- 				break;
--			case FS_ERROR_UNKNOWN_CNAME:
--			/*
--			 * Unknown CName is only a problem for the
--			 * multicast transmitter which isn't used.
--			 * It is also deprecated.
--			 */
--				break;
- 			default:
- 				purple_debug_error("backend-fs2",
--						"farsight-error: %i: %s\n",
-+						"farstream-error: %i: %s\n",
- 						error_no,
- 					  	gst_structure_get_string(
- 						msg->structure, "error-msg"));
-@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus,
- 
- 		if (FS_ERROR_IS_FATAL(error_no)) {
- 			purple_media_error(priv->media, _("A non-recoverable "
--					"Farsight2 error has occurred."));
-+					"Farstream error has occurred."));
- 			purple_media_end(priv->media, NULL, NULL);
- 		}
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-new-local-candidate")) {
-+			"farstream-new-local-candidate")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsCandidate *local_candidate;
-@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus,
- 				session->id, name, candidate);
- 		g_object_unref(candidate);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-local-candidates-prepared")) {
-+			"farstream-local-candidates-prepared")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsParticipant *participant;
-@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus,
- 		g_signal_emit_by_name(self, "candidates-prepared",
- 				session->id, name);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-new-active-candidate-pair")) {
-+			"farstream-new-active-candidate-pair")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsCandidate *local_candidate;
-@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus,
- 		g_object_unref(lcandidate);
- 		g_object_unref(rcandidate);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-recv-codecs-changed")) {
-+			"farstream-recv-codecs-changed")) {
- 		const GValue *value;
- 		GList *codecs;
- 		FsCodec *codec;
-@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus,
- 		codec = codecs->data;
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-recv-codecs-changed: %s\n",
-+				"farstream-recv-codecs-changed: %s\n",
- 				codec->encoding_name);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-component-state-changed")) {
-+			"farstream-component-state-changed")) {
- 		const GValue *value;
- 		FsStreamState fsstate;
- 		guint component;
-@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus,
- 		}
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-component-state-changed: "
-+				"farstream-component-state-changed: "
- 				"component: %u state: %s\n",
- 				component, state);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-send-codec-changed")) {
-+			"farstream-send-codec-changed")) {
- 		const GValue *value;
- 		FsCodec *codec;
- 		gchar *codec_str;
-@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus,
- 		codec_str = fs_codec_to_string(codec);
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-send-codec-changed: codec: %s\n",
-+				"farstream-send-codec-changed: codec: %s\n",
- 				codec_str);
- 
- 		g_free(codec_str);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-codecs-changed")) {
-+			"farstream-codecs-changed")) {
- 		const GValue *value;
- 		FsSession *fssession;
- 		GList *sessions;
-@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl
- 				purple_media_is_initiator(media, sid, name))
- 			return;
- 
--		fs_stream_set_remote_candidates(stream->stream,
--				stream->remote_candidates, &err);
-+		if (stream->supports_add)
-+		  fs_stream_add_remote_candidates(stream->stream,
-+			  	stream->remote_candidates, &err);
-+		else
-+		  fs_stream_force_remote_candidates(stream->stream,
-+			  	stream->remote_candidates, &err);
- 
- 		if (err == NULL)
- 			return;
-@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s
- 	GstElement *pipeline;
- 	GstBus *bus;
- 	gchar *name;
-+	GKeyFile *default_props;
- 
- 	priv->conference = FS_CONFERENCE(
- 			gst_element_factory_make(priv->conference_type, NULL));
-@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s
- 		return FALSE;
- 	}
- 
-+	default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference));
-+	if (default_props != NULL) {
-+		priv->notifier = fs_element_added_notifier_new();
-+		fs_element_added_notifier_add(priv->notifier,
-+					      GST_BIN(priv->confbin));
-+		fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props);
-+	}
-+
- 	g_signal_connect(G_OBJECT(bus), "message",
- 			G_CALLBACK(gst_bus_cb), self);
- 	gst_object_unref(bus);
-@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se
- 	 * receiving the src-pad-added signal.
- 	 * Only works for non-multicast FsRtpSessions.
- 	 */
--	if (is_nice || !strcmp(transmitter, "rawudp"))
-+	if (!!strcmp(transmitter, "multicast"))
- 		g_object_set(G_OBJECT(session->session),
- 				"no-rtcp-timeout", 0, NULL);
- 
-@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2
- 	GError *err = NULL;
- 
- 	participant = fs_conference_new_participant(
--			priv->conference, name, &err);
-+			priv->conference, &err);
- 
- 	if (err) {
- 		purple_debug_error("backend-fs2",
-@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2
- 		return FALSE;
- 	}
- 
-+	if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant),
-+					 "cname")) {
-+	  g_object_set(participant, "cname", &name, NULL);
-+	}
-+
-+
- 	if (!priv->participants) {
- 		purple_debug_info("backend-fs2",
- 				"Creating hash table for participants\n");
-@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel
- 		}
- 	}
- 
-+
-+	session = get_session(self, sess_id);
-+
-+	if (session == NULL) {
-+		purple_debug_error("backend-fs2",
-+				"Couldn't find session to create stream.\n");
-+		return FALSE;
-+	}
-+
-+	participant = get_participant(self, who);
-+
-+	if (participant == NULL) {
-+		purple_debug_error("backend-fs2", "Couldn't find "
-+				"participant to create stream.\n");
-+		return FALSE;
-+	}
-+
-+	fsstream = fs_session_new_stream(session->session, participant,
-+			initiator == TRUE ? type_direction :
-+			(type_direction & FS_DIRECTION_RECV), &err);
-+
-+	if (fsstream == NULL) {
-+		if (err) {
-+			purple_debug_error("backend-fs2",
-+					"Error creating stream: %s\n",
-+					err && err->message ?
-+					err->message : "NULL");
-+			g_error_free(err);
-+		} else
-+			purple_debug_error("backend-fs2",
-+					"Error creating stream\n");
-+		return FALSE;
-+	}
-+
- 	memcpy(_params, params, sizeof(GParameter) * num_params);
- 
- 	/* set the controlling mode parameter */
-@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel
- 		_num_params++;
- 	}
- 
--	session = get_session(self, sess_id);
- 
--	if (session == NULL) {
--		purple_debug_error("backend-fs2",
--				"Couldn't find session to create stream.\n");
--		return FALSE;
--	}
--
--	participant = get_participant(self, who);
--
--	if (participant == NULL) {
--		purple_debug_error("backend-fs2", "Couldn't find "
--				"participant to create stream.\n");
--		return FALSE;
-+	if(!fs_stream_set_transmitter(fsstream, transmitter,
-+				      _params, _num_params, &err)) {
-+	     purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message);
-+	     g_clear_error(&err);
-+	     g_free(_params);
-+	     return FALSE;
- 	}
--
--	fsstream = fs_session_new_stream(session->session, participant,
--			initiator == TRUE ? type_direction :
--			(type_direction & FS_DIRECTION_RECV), transmitter,
--			_num_params, _params, &err);
- 	g_free(_params);
- 
--	if (fsstream == NULL) {
--		if (err) {
--			purple_debug_error("backend-fs2",
--					"Error creating stream: %s\n",
--					err && err->message ?
--					err->message : "NULL");
--			g_error_free(err);
--		} else
--			purple_debug_error("backend-fs2",
--					"Error creating stream\n");
--		return FALSE;
--	}
- 
- 	stream = g_new0(PurpleMediaBackendFs2Stream, 1);
- 	stream->participant = g_strdup(who);
- 	stream->session = session;
- 	stream->stream = fsstream;
-+	stream->supports_add = !strcmp(transmitter, "nice");
- 
- 	priv->streams =	g_list_append(priv->streams, stream);
- 
-@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand
- 	if (purple_media_is_initiator(priv->media, sess_id, participant) ||
- 			purple_media_accepted(
- 			priv->media, sess_id, participant)) {
--		fs_stream_set_remote_candidates(stream->stream,
-+  	        if (stream->supports_add)
-+		     fs_stream_add_remote_candidates(stream->stream,
-+				stream->remote_candidates, &err);
-+		else
-+		     fs_stream_force_remote_candidates(stream->stream,
- 				stream->remote_candidates, &err);
- 
- 		if (err) {
-diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c
---- pidgin-2.10.1.orig/libpurple/media.c	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/media.c	2012-03-10 18:21:19.000000000 +0200
-@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med
- {
- #ifdef USE_VV
- 	PurpleMediaSession *session;
--	PurpleMediaStream *stream = NULL;
- 
- 	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
- 
-@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med
- 	}
- 
- 	if (purple_media_get_stream(media, sess_id, who) == NULL) {
--		stream = purple_media_insert_stream(session, who, initiator);
-+		purple_media_insert_stream(session, who, initiator);
- 
- 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
- 				0, PURPLE_MEDIA_STATE_NEW,
-diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c
---- pidgin-2.10.1.orig/libpurple/mediamanager.c	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/mediamanager.c	2012-03-10 18:27:05.000000000 +0200
-@@ -39,7 +39,7 @@
- #ifdef USE_VV
- #include <media/backend-fs2.h>
- 
--#include <gst/farsight/fs-element-added-notifier.h>
-+#include <farstream/fs-element-added-notifier.h>
- #include <gst/interfaces/xoverlay.h>
- 
- /** @copydoc _PurpleMediaManagerPrivate */
diff --git a/extra/python/gdbm-magic-values.patch b/extra/python/gdbm-magic-values.patch
deleted file mode 100644
index e8ce828cf..000000000
--- a/extra/python/gdbm-magic-values.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic Python-3.2.2/Lib/dbm/__init__.py
---- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic	2011-09-03 12:16:40.000000000 -0400
-+++ Python-3.2.2/Lib/dbm/__init__.py	2011-09-30 15:47:27.488863694 -0400
-@@ -166,7 +166,7 @@ def whichdb(filename):
-         return ""
- 
-     # Check for GNU dbm
--    if magic == 0x13579ace:
-+    if magic in (0x13579ace, 0x13579acd, 0x13579acf):
-         return "dbm.gnu"
- 
-     # Later versions of Berkeley db hash file have a 12-byte pad in
-diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS
diff --git a/extra/qtscriptgenerator/gcc44.patch b/extra/qtscriptgenerator/gcc44.patch
deleted file mode 100644
index dbb423e5d..000000000
--- a/extra/qtscriptgenerator/gcc44.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Patch from upstream bug tracker:
-# http://code.google.com/p/qtscriptgenerator/issues/detail?id=37
-# So far (2009-06-12) this has not been applied at upstream git repo
-
-diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
---- generator.orig/parser/rpp/pp.h	2008-12-05 11:01:44.000000000 +0100
-+++ generator/parser/rpp/pp.h	2008-12-13 10:42:22.000000000 +0100
-@@ -30,6 +30,7 @@
- #include <cctype>
-
- #include <fcntl.h>
-+#include <cstdio>
-
- #ifdef HAVE_MMAP
- #  include <sys/mman.h>
diff --git a/extra/qtscriptgenerator/qt48.patch b/extra/qtscriptgenerator/qt48.patch
deleted file mode 100644
index f397b5ab1..000000000
--- a/extra/qtscriptgenerator/qt48.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml
---- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent	2011-12-22 11:34:52.615149619 -0600
-+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml	2011-12-22 11:35:31.808659632 -0600
-@@ -2233,7 +2233,6 @@
-     
-                
-   </object-type>
--  <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
-   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
-         <modify-function signature="reason()const">
-             <remove/>
-diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml
---- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent	2009-02-20 05:42:24.000000000 -0600
-+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml	2011-12-22 11:33:43.058019203 -0600
-@@ -2555,7 +2555,6 @@
-     
-                
-   </object-type>
--  <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
-   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
-         <modify-function signature="reason()const">
-             <remove/>
diff --git a/extra/sox/sox-14.3.2-ffmpeg.patch b/extra/sox/sox-14.3.2-ffmpeg.patch
deleted file mode 100644
index 5289b9b47..000000000
--- a/extra/sox/sox-14.3.2-ffmpeg.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: sox-14.3.2/src/ffmpeg.c
-===================================================================
---- sox-14.3.2.orig/src/ffmpeg.c
-+++ sox-14.3.2/src/ffmpeg.c
-@@ -91,7 +91,7 @@ static int stream_component_open(priv_t
- 
-   if (!codec || avcodec_open(enc, codec) < 0)
-     return -1;
--  if (enc->codec_type != CODEC_TYPE_AUDIO) {
-+  if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
-     lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
-     return -1;
-   }
-@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
-   /* Find audio stream (FIXME: allow different stream to be selected) */
-   for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
-     AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
--    if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
-+    if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
-       ffmpeg->audio_index = i;
-       break;
-     }
-@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo
- 
-   c = st->codec;
-   c->codec_id = codec_id;
--  c->codec_type = CODEC_TYPE_AUDIO;
-+  c->codec_type = AVMEDIA_TYPE_AUDIO;
- 
-   /* put sample parameters */
-   c->bit_rate = 256000;  /* FIXME: allow specification */
-@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t
-       av_init_packet(&pkt);
-       pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
-       pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       pkt.stream_index = ffmpeg->audio_st->index;
-       pkt.data = ffmpeg->audio_buf_aligned;
- 
diff --git a/extra/systemd/cpp-compat.patch b/extra/systemd/cpp-compat.patch
deleted file mode 100644
index 346c353bc..000000000
--- a/extra/systemd/cpp-compat.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82
-Author: Lennart Poettering <lennart@poettering.net>
-Date:   2012-03-05 15:16:10 +0100
-
-    sd-login: c++ compatibility
-
-diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
-index 2f3c90c..6e99cfc 100644
---- a/src/systemd/sd-login.h
-+++ b/src/systemd/sd-login.h
-@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char **service);
- int sd_session_get_type(const char *session, char **type);
- 
- /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */
--int sd_session_get_class(const char *session, char **class);
-+int sd_session_get_class(const char *session, char **clazz);
- 
- /* Determine the X11 display of this session. */
- int sd_session_get_display(const char *session, char **display);
diff --git a/extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch b/extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch
deleted file mode 100644
index 6580dcc7f..000000000
--- a/extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 501b46c364c5608d1b3b84dd48fe57abcabd4aea Mon Sep 17 00:00:00 2001
-From: Ionut Biru <ibiru@archlinux.org>
-Date: Mon, 6 Dec 2010 04:22:45 -0800
-Subject: [PATCH] bugfix: remove bad import from im module
-
-Signed-off-by: Ionut Biru <ibiru@archlinux.org>
----
- butterfly/channel/im.py |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/butterfly/channel/im.py b/butterfly/channel/im.py
-index 1781234..ac8dd44 100644
---- a/butterfly/channel/im.py
-+++ b/butterfly/channel/im.py
-@@ -30,8 +30,6 @@ import papyon.event
- 
- from butterfly.channel.text import ButterflyTextChannel
- 
--from butterfly.Channel_Interface_Conference import CHANNEL_INTERFACE_CONFERENCE
--
- __all__ = ['ButterflyImChannel']
- 
- logger = logging.getLogger('Butterfly.ImChannel')
--- 
-1.7.3.2
-
diff --git a/extra/telepathy-butterfly/PKGBUILD b/extra/telepathy-butterfly/PKGBUILD
deleted file mode 100644
index 1400376d8..000000000
--- a/extra/telepathy-butterfly/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 150850 2012-02-23 12:45:25Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Daniel Balieiro <daniel@balieiro.com>
-pkgname=telepathy-butterfly
-pkgver=0.5.15
-pkgrel=2
-pkgdesc="A MSN connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('GPL')
-depends=('papyon>=0.5.4' 'python-telepathy>=0.15.19')
-source=(http://telepathy.freedesktop.org/releases/telepathy-butterfly/telepathy-butterfly-${pkgver}.tar.gz
-        0001-bugfix-remove-bad-import-from-im-module.patch)
-install=telepathy-butterfly.install
-md5sums=('4baa6337822f01d817c4b9d8fd406e82'
-         '08417a06a0e4a1875f1baf4b910cdcf4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/0001-bugfix-remove-bad-import-from-im-module.patch"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
-  make
-  make DESTDIR="${pkgdir}" install
-
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-      "${pkgdir}/usr/lib/telepathy/telepathy-butterfly"
-}
diff --git a/extra/telepathy-butterfly/telepathy-butterfly.install b/extra/telepathy-butterfly/telepathy-butterfly.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/extra/telepathy-butterfly/telepathy-butterfly.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/telepathy-farsight/PKGBUILD b/extra/telepathy-farsight/PKGBUILD
deleted file mode 100644
index a49577d12..000000000
--- a/extra/telepathy-farsight/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 128060 2011-06-21 14:52:50Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Ju Liu <liuju86 at gmail dot com>
-# Contributor: Denis Zawada <deno@rootnode.net>
-pkgname=telepathy-farsight
-pkgver=0.0.19
-pkgrel=1
-pkgdesc="A telepathy-backend to use stream engine."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('GPL')
-depends=('telepathy-glib' 'farsight2')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6bacc22aaec00823f3bbce8517600ec3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-      --libexecdir=/usr/lib/telepathy \
-      --enable-static=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/telepathy-kde-presence-dataengine/PKGBUILD b/extra/telepathy-kde-presence-dataengine/PKGBUILD
deleted file mode 100644
index 88a0981b1..000000000
--- a/extra/telepathy-kde-presence-dataengine/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 143571 2011-11-26 14:00:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=telepathy-kde-presence-dataengine
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="Plasma dataengine for managing Telepathy account presence"
-arch=('i686' 'x86_64')
-url="http://www.kde.org"
-license=('GPL')
-depends=('kdebase-workspace' 'telepathy-qt4')
-makedepends=('cmake' 'automoc4')
-groups=('telepathy-kde')
-source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('87f8c65baf35410e65ca9b7cb016210f2b13f72d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD
deleted file mode 100644
index 1df655645..000000000
--- a/extra/telepathy-qt4/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 142995 2011-11-20 09:11:34Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=telepathy-qt4
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="A library for Qt-based Telepathy clients"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org/wiki/"
-license=('LGPL')
-options=('!libtool')
-depends=('qt' 'telepathy-farsight')
-makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
-source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('b93f03f063d784855d83e1b3c79a1cc5')
-
-build() {
-    cd "$srcdir"
-    mkdir build
-    cd build
-    cmake ../$pkgname-$pkgver \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr
-    make
-}
-
-package() {
-    cd "$srcdir"/build
-    make DESTDIR="$pkgdir" install
-}
diff --git a/extra/thunar/fix-crash-8168.patch b/extra/thunar/fix-crash-8168.patch
deleted file mode 100644
index 4300c81c6..000000000
--- a/extra/thunar/fix-crash-8168.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 71f6f207cfd0194a3f3db83cb5fab694a5036e22 Mon Sep 17 00:00:00 2001
-From: Jannis Pohlmann <jannis@xfce.org>
-Date: Sun, 26 Feb 2012 17:38:50 +0000
-Subject: Fix crash when removing an ancestor of the current folder (bug #8168).
-
-Whenever we release the GFileMonitor of a ThunarFolder, we also need to
-disconnect from its signals. Otherwise one of the signal handlers might
-still be called, potentially with corrupted user data (which was the
-case here).
----
-diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c
-index 62015fe..4076b8d 100644
---- a/thunar/thunar-folder.c
-+++ b/thunar/thunar-folder.c
-@@ -236,6 +236,7 @@ thunar_folder_finalize (GObject *object)
-   /* disconnect from the file alteration monitor */
-   if (G_LIKELY (folder->monitor != NULL))
-     {
-+      g_signal_handlers_disconnect_matched (folder->monitor, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, folder);
-       g_file_monitor_cancel (folder->monitor);
-       g_object_unref (folder->monitor);
-     }
-@@ -705,6 +706,7 @@ thunar_folder_reload (ThunarFolder *folder)
-   /* disconnect from the file alteration monitor */
-   if (G_UNLIKELY (folder->monitor != NULL))
-     {
-+      g_signal_handlers_disconnect_matched (folder->monitor, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, folder);
-       g_file_monitor_cancel (folder->monitor);
-       g_object_unref (folder->monitor);
-       folder->monitor = NULL;
---
-cgit v0.9.0.2
diff --git a/extra/thunar/fix-launching-multiple-files-7456.patch b/extra/thunar/fix-launching-multiple-files-7456.patch
deleted file mode 100644
index 40d581553..000000000
--- a/extra/thunar/fix-launching-multiple-files-7456.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 379b8b9f350cb362735eb0e2a0e9471a898f2664 Mon Sep 17 00:00:00 2001
-From: John Lindgren <john.lindgren@aol.com>
-Date: Sun, 26 Feb 2012 18:52:24 +0000
-Subject: Fix handling %U when launching multiple files with an app (bug #7456).
-
-GIO returns a newly allocated GAppInfo every time
-g_app_info_get_default_for_type() is called. This means that if we use a
-GHashTable and g_direct_hash() to associate GAppInfos with files to be
-launched with each of them, we will actually end up with multiple
-GAppInfos that are the same, and each of them will only have a single
-file associated.
-
-To fix this, we now use a fake hash function that causes GHashTable to
-always search the GAppInfo in the collision list.
----
-diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
-index f479cf9..9f96b87 100644
---- a/thunar/thunar-launcher.c
-+++ b/thunar/thunar-launcher.c
-@@ -546,17 +546,28 @@ thunar_launcher_execute_files (ThunarLauncher *launcher,
- 
- 
- 
-+static guint
-+thunar_launcher_g_app_info_hash (gconstpointer app_info)
-+{
-+  return 0;
-+}
-+
-+
-+
- static void
- thunar_launcher_open_files (ThunarLauncher *launcher,
-                             GList          *files)
- {
--  GAppInfo   *app_info;
-   GHashTable *applications;
-+  GAppInfo   *app_info;
-   GList      *file_list;
-   GList      *lp;
- 
--  /* allocate a hash table to associate applications to URIs */
--  applications = g_hash_table_new_full (g_direct_hash,
-+  /* allocate a hash table to associate applications to URIs. since GIO allocates
-+   * new GAppInfo objects every time, g_direct_hash does not work. we therefor use
-+   * a fake hash function to always hit the collision list of the hash table and
-+   * avoid storing multiple equal GAppInfos by means of g_app_info_equal(). */
-+  applications = g_hash_table_new_full (thunar_launcher_g_app_info_hash,
-                                         (GEqualFunc) g_app_info_equal,
-                                         (GDestroyNotify) g_object_unref,
-                                         (GDestroyNotify) thunar_g_file_list_free);
---
-cgit v0.9.0.2
diff --git a/extra/thunar/fix-segfault-on-rename.patch b/extra/thunar/fix-segfault-on-rename.patch
deleted file mode 100644
index b64a91e08..000000000
--- a/extra/thunar/fix-segfault-on-rename.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fb7e7a602473fe2f11c78baacacaad1aea8c9dc6 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Wed, 30 Nov 2011 17:45:57 +0000
-Subject: Fix segfault when plugin returns a NULL suffix.
-
-(cherry picked from commit 6f813ba48553e5b95a83bfa8463b20b8ee4607c4)
----
-diff --git a/thunar/thunar-renamer-model.c b/thunar/thunar-renamer-model.c
-index 1aa7b77..91a47e1 100644
---- a/thunar/thunar-renamer-model.c
-+++ b/thunar/thunar-renamer-model.c
-@@ -823,10 +823,9 @@ thunar_renamer_model_process_item (ThunarRenamerModel     *renamer_model,
-           /* determine the new suffix */
-           suffix = thunarx_renamer_process (renamer_model->renamer, THUNARX_FILE_INFO (item->file), dot + 1, idx);
- 
--          /* generate the new file name */
--          name = g_new (gchar, (dot - display_name) + 1 + strlen (suffix) + 1);
--          memcpy (name, display_name, (dot - display_name) + 1);
--          memcpy (name + (dot - display_name) + 1, suffix, strlen (suffix) + 1);
-+          prefix = g_strndup (display_name, (dot - display_name) + 1);
-+          name = g_strconcat (prefix, suffix, NULL);
-+          g_free (prefix);
- 
-           /* release the suffix */
-           g_free (suffix);
---
-cgit v0.9.0.2
diff --git a/extra/thunar/fix-sorting-of-large-numbers-5356.patch b/extra/thunar/fix-sorting-of-large-numbers-5356.patch
deleted file mode 100644
index 1105eea83..000000000
--- a/extra/thunar/fix-sorting-of-large-numbers-5356.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 493db02bdbc6ec667cd04e75a77dff8366ec1bc0 Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel@gmail.com>
-Date: Sun, 06 Nov 2011 13:58:33 +0000
-Subject: Fix sorting of filenames with large numbers (bug #5356).
-
-Change compare_by_name_using_number() to use guint64.
-
-Signed-off-by: Jannis Pohlmann <jannis@xfce.org>
----
-diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
-index 909da25..44cdb31 100644
---- a/thunar/thunar-file.c
-+++ b/thunar/thunar-file.c
-@@ -3168,12 +3168,12 @@ static gint
- compare_by_name_using_number (const gchar *ap,
-                               const gchar *bp)
- {
--  guint anum;
--  guint bnum;
-+  guint64 anum;
-+  guint64 bnum;
- 
-   /* determine the numbers in ap and bp */
--  anum = strtoul (ap, NULL, 10);
--  bnum = strtoul (bp, NULL, 10);
-+  anum = strtouq (ap, NULL, 10);
-+  bnum = strtouq (bp, NULL, 10);
- 
-   /* compare the numbers */
-   if (anum < bnum)
---
-cgit v0.9.0.2
diff --git a/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch b/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch
deleted file mode 100644
index 3b0a38400..000000000
--- a/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4028320ba2e8c181292e02171d83ebf6ce3aee5a Mon Sep 17 00:00:00 2001
-From: Felipe Contreras <felipe.contreras@gmail.com>
-Date: Thu, 29 Dec 2011 03:28:27 +0200
-Subject: [PATCH] gtk: conf: set correct download dir default
-
-Otherwise people might get:
-ERROR:open-dialog.c:285:gtr_torrent_options_dialog_new: code should not be reached
-
-It was fixed at some point in ticket #1873, but somebody broket it
-again.
-
-Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
----
- gtk/conf.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/gtk/conf.c b/gtk/conf.c
-index 623b839..6ad6ca2 100644
---- a/gtk/conf.c
-+++ b/gtk/conf.c
-@@ -108,7 +108,6 @@ tr_prefs_init_defaults( tr_benc * d )
-     tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_X, 50 );
-     tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_Y, 50 );
- 
--    str = g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD );
-     tr_bencDictAddStr( d, TR_PREFS_KEY_DOWNLOAD_DIR, str );
- 
-     tr_bencDictAddStr( d, PREF_KEY_SORT_MODE, "sort-by-name" );
--- 
-1.7.8.1
-
diff --git a/extra/xf86-video-s3virge/copyright.patch b/extra/xf86-video-s3virge/copyright.patch
deleted file mode 100644
index ba988c6d6..000000000
--- a/extra/xf86-video-s3virge/copyright.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From c26da404906258951341c4c4ace793f2dfdc47f8 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Sun, 13 Jun 2010 14:26:32 +0000
-Subject: COPYING: update file with Copyright notices from source code.
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/COPYING b/COPYING
-index 7f33cbf..727ca51 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,60 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+this software and associated documentation files (the "Software"), to deal in
-+the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+of the Software, and to permit persons to whom the Software is furnished to do
-+so, subject to the following conditions:
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name of the XFree86 Project shall not
-+be used in advertising or otherwise to promote the sale, use or other dealings
-+in this Software without prior written authorization from the XFree86 Project.
-+
-+Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc., Londonderry,
-+NH - All Rights Reserved
-+
-+This code may be freely incorporated in any program without royalty, as long
-+as the copyright notice stays intact.
-+
-+Additions by Kevin E. Martin (martin@cs.unc.edu)
-+
-+KEVIN E. MARTIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+EVENT SHALL KEVIN E. MARTIN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
-+
-+Copyright 2007 George Sapountzis
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-s3virge/s3virge-1.10.4-vga.patch b/extra/xf86-video-s3virge/s3virge-1.10.4-vga.patch
deleted file mode 100644
index 3fb1fd6cf..000000000
--- a/extra/xf86-video-s3virge/s3virge-1.10.4-vga.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 92b4671ca75022a56ad9e85b347f81c12157c98f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 16 Nov 2011 19:58:29 +0000
-Subject: Adapt to missing PIOOffset in videoabi 12
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/s3v_driver.c b/src/s3v_driver.c
-index 2ced9ac..0f754dd 100644
---- a/src/s3v_driver.c
-+++ b/src/s3v_driver.c
-@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
-   S3VPtr ps3v;
-   IOADDRESS vgaCRIndex, vgaCRReg;
-   unsigned char val;
--  
-+  unsigned int PIOOffset = 0;
-+
-   PVERB5("	S3VEnableMmio\n");
-   
-   hwp = VGAHWPTR(pScrn);
-   ps3v = S3VPTR(pScrn);
-+
-+#if ABI_VIDEODRV_VERSION < 12
-+  PIOOffset = hwp->PIOOffset;
-+#endif
-+  
-   /*
-    * enable chipset (seen on uninitialized secondary cards)
-    * might not be needed once we use the VGA softbooter
-@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
-    * to be set correctly already and MMIO _has_ to be
-    * enabled.
-    */
--  val = inb(hwp->PIOOffset + 0x3C3);               /*@@@EE*/
--  outb(hwp->PIOOffset + 0x3C3, val | 0x01);
-+  val = inb(PIOOffset + 0x3C3);               /*@@@EE*/
-+  outb(PIOOffset + 0x3C3, val | 0x01);
-   /*
-    * set CR registers to color mode
-    * in mono mode extended CR registers
-    * are not accessible. (EE 05/04/99)
-    */
--  val = inb(hwp->PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
--  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01);
-+  val = inb(PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
-+  outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01);
-   vgaHWGetIOBase(hwp);             	/* Get VGA I/O base */
--  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
-+  vgaCRIndex = PIOOffset + hwp->IOBase + 4;
-   vgaCRReg = vgaCRIndex + 1;
- #if 1
-   /*
-@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
-   			      	/* Enable new MMIO, if TRIO mmio is already */
- 				/* enabled, then it stays enabled. */
-   outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08);
--  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val);
-+  outb(PIOOffset + VGA_MISC_OUT_W, val);
-   if (S3_TRIO_3D_SERIES(ps3v->Chipset)) {
-     outb(vgaCRIndex, 0x40);
-     val = inb(vgaCRReg);
-@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
-   hwp = VGAHWPTR(pScrn);
-   ps3v = S3VPTR(pScrn);
- 
--  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
-+  vgaCRIndex = hwp->IOBase + 4;
-+#if ABI_VIDEODRV_VERSION < 12
-+  vgaCRIndex += hwp->PIOOffset;
-+#endif
-   vgaCRReg = vgaCRIndex + 1;
-   outb(vgaCRIndex, 0x53);
- 				/* Restore register's original state */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-xgi/PKGBUILD b/extra/xf86-video-xgi/PKGBUILD
deleted file mode 100644
index 48f22a0b0..000000000
--- a/extra/xf86-video-xgi/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 140280 2011-10-11 21:28:09Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-xgi
-pkgver=1.6.0
-pkgrel=4
-pkgdesc="X.org XGI video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto')
-conflicts=('xorg-server<1.10.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-sha1sums=('826f14d6ba799cd2aae9f0c818f84cf8b75f1ddb'
-          '61ce13325c69befaa710c3389a85a8aa9d1cf28d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/extra/xf86-video-xgi/git-fixes.patch b/extra/xf86-video-xgi/git-fixes.patch
deleted file mode 100644
index f15fea88a..000000000
--- a/extra/xf86-video-xgi/git-fixes.patch
+++ /dev/null
@@ -1,451 +0,0 @@
-diff --git a/man/xgi.man b/man/xgi.man
-index 19880f2..5699ae4 100644
---- a/man/xgi.man
-+++ b/man/xgi.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi.man,v 1.14 2003/11/12 16:50:36 twini Exp $
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH XGI __drivermansuffix__ __vendorversion__
-diff --git a/src/vb_init.c b/src/vb_init.c
-index 8338410..50980c4 100755
---- a/src/vb_init.c
-+++ b/src/vb_init.c
-@@ -131,6 +131,8 @@ static void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT,
- static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT, 
-     PVB_DEVICE_INFO);
- static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO);
-+/* horrible */
-+#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType
- 
- static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo,
-     UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5],
-@@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension ,
-     }
- 
-     temp3 = 0 ;
--    for( k = 0 ; k < 4 ; k++ )
-+    for( k = 1 ; k < 4 ; k++ )
-     {
-         XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ;		/* CR6E_D[1:0] select channel */
-         temp2 = 0 ;
-diff --git a/src/vgatypes.h b/src/vgatypes.h
-index 8a60927..7484661 100755
---- a/src/vgatypes.h
-+++ b/src/vgatypes.h
-@@ -1,5 +1,3 @@
--/* $XFree86$ */
--/* $XdotOrg$ */
- /*
-  * General type definitions for universal mode switching modules
-  *
-diff --git a/src/xgi.h b/src/xgi.h
-index 715502f..e818631 100755
---- a/src/xgi.h
-+++ b/src/xgi.h
-@@ -981,6 +981,7 @@ int compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div,
- void XGI_WaitBeginRetrace(XGIIOADDRESS RelIO);
- void XGI_WaitEndRetrace(XGIIOADDRESS RelIO);
- 
-+#include <unistd.h>
- /* 2005/11/21 added by jjtseng */
- #define DelayS(sec) usleep((sec)*1000000)
- #define DelayMS(millisec) usleep((millisec)*1000)
-diff --git a/src/xgi_accel.c b/src/xgi_accel.c
-index c072691..4c298ed 100755
---- a/src/xgi_accel.c
-+++ b/src/xgi_accel.c
-@@ -200,20 +200,7 @@ extern int FbDevExist;
- #endif
- 
- #if X_BYTE_ORDER == X_BIG_ENDIAN
--static CARD32 BE_SWAP32 (CARD32 val)
--{
--	PDEBUG(ErrorF("X_BIG_ENDIAN...\n"));
--    if (CurrentColorDepth == 8)
--	    return   ((((val) & 0x000000ff) << 24) | \
--                  (((val) & 0x0000ff00) << 8) |  \
--                  (((val) & 0x00ff0000) >> 8) |  \
--                  (((val) & 0xff000000) >> 24));
--    if (CurrentColorDepth == 24)
--        return val;
--    if (CurrentColorDepth == 16)
--        return ((((val) & 0x0000ffff) << 16) | \
--		         (((val) & 0xffff0000) >> 16));
--}    
-+#define BE_SWAP32(x) lswapl(x)
- #else 
- static CARD32 BE_SWAP32 (CARD32 val)
- {
-diff --git a/src/xgi_dga.c b/src/xgi_dga.c
-index 04f90aa..8bd84bc 100755
---- a/src/xgi_dga.c
-+++ b/src/xgi_dga.c
-@@ -103,18 +103,18 @@ XGISetupDGAMode(
- 
- 	if(pMode->HDisplay != otherPitch) {
- 
--	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec));
- 	    oneMore  = TRUE;
- 
- 	} else {
- 
--	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec));
- 	    oneMore  = FALSE;
- 
- 	}
- 
- 	if(!newmodes) {
--	    xfree(modes);
-+	    free(modes);
- 	    return NULL;
- 	}
- 	modes = newmodes;
-diff --git a/src/xgi_dri.c b/src/xgi_dri.c
-index 93687e1..e575c19 100755
---- a/src/xgi_dri.c
-+++ b/src/xgi_dri.c
-@@ -46,7 +46,6 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Priv.h"
- 
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
-@@ -145,13 +144,13 @@ XGIInitVisualConfigs(ScreenPtr pScreen)
-     }
-     if (!(pXGIConfigs = (XGIConfigPrivPtr)xnfcalloc(sizeof(XGIConfigPrivRec),
- 						    numConfigs))) {
--      xfree(pConfigs);
-+      free(pConfigs);
-       return FALSE;
-     }
-     if (!(pXGIConfigPtrs = (XGIConfigPrivPtr*)xnfcalloc(sizeof(XGIConfigPrivPtr),
- 							  numConfigs))) {
--      xfree(pConfigs);
--      xfree(pXGIConfigs);
-+      free(pConfigs);
-+      free(pXGIConfigs);
-       return FALSE;
-     }
-     for (i=0; i<numConfigs; i++)
-@@ -333,7 +332,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen)
-   pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
- 
-   if (!DRIScreenInit(pScreen, pDRIInfo, &pXGI->drmSubFD)) {
--    xfree(pDRIInfo->devPrivate);
-+    free(pDRIInfo->devPrivate);
-     pDRIInfo->devPrivate=0;
-     DRIDestroyInfoRec(pXGI->pDRIInfo);
-     pXGI->pDRIInfo=0;
-@@ -537,14 +536,14 @@ XGIDRICloseScreen(ScreenPtr pScreen)
- 
-   if (pXGI->pDRIInfo) {
-     if (pXGI->pDRIInfo->devPrivate) {
--      xfree(pXGI->pDRIInfo->devPrivate);
-+      free(pXGI->pDRIInfo->devPrivate);
-       pXGI->pDRIInfo->devPrivate=0;
-     }
-     DRIDestroyInfoRec(pXGI->pDRIInfo);
-     pXGI->pDRIInfo=0;
-   }
--  if (pXGI->pVisualConfigs) xfree(pXGI->pVisualConfigs);
--  if (pXGI->pVisualConfigsPriv) xfree(pXGI->pVisualConfigsPriv);
-+  if (pXGI->pVisualConfigs) free(pXGI->pVisualConfigs);
-+  if (pXGI->pVisualConfigsPriv) free(pXGI->pVisualConfigsPriv);
- 
-   if(pXGI->agpSize){
- /* ErrorF("Freeing agp memory\n"); */
-diff --git a/src/xgi_driver.c b/src/xgi_driver.c
-index b4f83b8..b8b8679 100755
---- a/src/xgi_driver.c
-+++ b/src/xgi_driver.c
-@@ -54,7 +54,7 @@
- #include "fb.h"
- #include "micmap.h"
- #include "xf86.h"
--#include "xf86Priv.h"
-+#include "xf86Module.h"
- #include "xf86_OSproc.h"
- #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
-@@ -106,6 +106,10 @@
- #include <unistd.h>
- #endif
- 
-+#ifndef DEFAULT_DPI
-+#define DEFAULT_DPI 96
-+#endif
-+
- /* Jong 01/22/2009; compiler error; type conflict */
- /*
- #include <fcntl.h>
-@@ -556,13 +560,13 @@ XGIFreeRec(ScrnInfoPtr pScrn)
-              * head.
-              */
-             if (pXGIEnt->BIOS)
--                xfree(pXGIEnt->BIOS);
-+                free(pXGIEnt->BIOS);
-             pXGIEnt->BIOS = pXGI->BIOS = NULL;
-             if (pXGIEnt->XGI_Pr)
--                xfree(pXGIEnt->XGI_Pr);
-+                free(pXGIEnt->XGI_Pr);
-             pXGIEnt->XGI_Pr = pXGI->XGI_Pr = NULL;
-             if (pXGIEnt->RenderAccelArray)
--                xfree(pXGIEnt->RenderAccelArray);
-+                free(pXGIEnt->RenderAccelArray);
-             pXGIEnt->RenderAccelArray = pXGI->RenderAccelArray = NULL;
-         }
-         else {
-@@ -573,19 +577,19 @@ XGIFreeRec(ScrnInfoPtr pScrn)
-     }
-     else {
-         if (pXGI->BIOS)
--            xfree(pXGI->BIOS);
-+            free(pXGI->BIOS);
-         pXGI->BIOS = NULL;
-         if (pXGI->XGI_Pr)
--            xfree(pXGI->XGI_Pr);
-+            free(pXGI->XGI_Pr);
-         pXGI->XGI_Pr = NULL;
-         if (pXGI->RenderAccelArray)
--            xfree(pXGI->RenderAccelArray);
-+            free(pXGI->RenderAccelArray);
-         pXGI->RenderAccelArray = NULL;
-     }
- 
- #ifdef XGIMERGED
-     if (pXGI->MetaModes)
--        xfree(pXGI->MetaModes);
-+        free(pXGI->MetaModes);
-     pXGI->MetaModes = NULL;
- 
-     if (pXGI->CRT1Modes) {
-@@ -595,8 +599,8 @@ XGIFreeRec(ScrnInfoPtr pScrn)
-                 do {
-                     DisplayModePtr p = pScrn->currentMode->next;
-                     if (pScrn->currentMode->Private)
--                        xfree(pScrn->currentMode->Private);
--                    xfree(pScrn->currentMode);
-+                        free(pScrn->currentMode->Private);
-+                    free(pScrn->currentMode);
-                     pScrn->currentMode = p;
-                 } while (pScrn->currentMode != pScrn->modes);
-             }
-@@ -612,7 +616,7 @@ XGIFreeRec(ScrnInfoPtr pScrn)
-     pXGI->pVbe = NULL;
-     if (pScrn->driverPrivate == NULL)
-         return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -975,7 +979,7 @@ XGIProbe(DriverPtr drv, int flags)
-                                     numDevSections, drv, &usedChips);
- 
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
-     if (numUsed <= 0)
-         return FALSE;
- 
-@@ -1015,7 +1019,7 @@ XGIProbe(DriverPtr drv, int flags)
- 
- #endif
-         }
--    xfree(usedChips);
-+    free(usedChips);
- 
-     return foundScreen;
- }
-@@ -1044,11 +1048,11 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
- 
- 	ErrorF("XGICopyModeNLink()...Use Virtual Size-1\n");
- 
--    if (!((mode = xalloc(sizeof(DisplayModeRec)))))
-+    if (!((mode = malloc(sizeof(DisplayModeRec)))))
-         return dest;
-     memcpy(mode, i, sizeof(DisplayModeRec));
--    if (!((mode->Private = xalloc(sizeof(XGIMergedDisplayModeRec))))) {
--        xfree(mode);
-+    if (!((mode->Private = malloc(sizeof(XGIMergedDisplayModeRec))))) {
-+        free(mode);
-         return dest;
-     }
-     ((XGIMergedDisplayModePtr) mode->Private)->CRT1 = i;
-@@ -1125,8 +1129,8 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
-         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                    "Skipped %dx%d, not enough video RAM or beyond hardware specs\n",
-                    mode->HDisplay, mode->VDisplay);
--        xfree(mode->Private);
--        xfree(mode);
-+        free(mode->Private);
-+        free(mode);
- 
-         return dest;
-     }
-@@ -1559,10 +1563,10 @@ XGIFreeCRT2Structs(XGIPtr pXGI)
-                                    pXGI->CRT2pScrn->monitor->Modes);
-             }
-             if (pXGI->CRT2pScrn->monitor->DDC)
--                xfree(pXGI->CRT2pScrn->monitor->DDC);
--            xfree(pXGI->CRT2pScrn->monitor);
-+                free(pXGI->CRT2pScrn->monitor->DDC);
-+            free(pXGI->CRT2pScrn->monitor);
-         }
--        xfree(pXGI->CRT2pScrn);
-+        free(pXGI->CRT2pScrn);
-         pXGI->CRT2pScrn = NULL;
-     }
- }
-@@ -2438,7 +2442,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
- 
- #ifdef XGIMERGED
-     if (pXGI->MergedFB) {
--        pXGI->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
-+        pXGI->CRT2pScrn->monitor = malloc(sizeof(MonRec));
-         if (pXGI->CRT2pScrn->monitor) {
-             DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL;
-             memcpy(pXGI->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec));
-@@ -2446,11 +2450,11 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
-             pXGI->CRT2pScrn->monitor->Modes = NULL;
-             tempm = pScrn->monitor->Modes;
-             while (tempm) {
--                if (!(newm = xalloc(sizeof(DisplayModeRec))))
-+                if (!(newm = malloc(sizeof(DisplayModeRec))))
-                     break;
-                 memcpy(newm, tempm, sizeof(DisplayModeRec));
--                if (!(newm->name = xalloc(strlen(tempm->name) + 1))) {
--                    xfree(newm);
-+                if (!(newm->name = malloc(strlen(tempm->name) + 1))) {
-+                    free(newm);
-                     break;
-                 }
-                 strcpy(newm->name, tempm->name);
-@@ -2490,7 +2494,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
-                         "Failed to allocate memory for CRT2 monitor, %s.\n",
-                         mergeddisstr);
-             if (pXGI->CRT2pScrn)
--                xfree(pXGI->CRT2pScrn);
-+                free(pXGI->CRT2pScrn);
-             pXGI->CRT2pScrn = NULL;
-             pXGI->MergedFB = FALSE;
-         }
-@@ -3540,7 +3544,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
-         /* Do some MergedFB mode initialisation */
- #ifdef XGIMERGED
-         if (pXGI->MergedFB) {
--        pXGI->CRT2pScrn = xalloc(sizeof(ScrnInfoRec));
-+        pXGI->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
-         if (!pXGI->CRT2pScrn) {
-             XGIErrorLog(pScrn,
-                         "Failed to allocate memory for 2nd pScrn, %s\n",
-@@ -3586,7 +3590,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
-                     XGIErrorLog(pScrn, mergednocrt1, mergeddisstr);
-                 }
-                 if (pXGI->CRT2pScrn)
--                    xfree(pXGI->CRT2pScrn);
-+                    free(pXGI->CRT2pScrn);
-                 pXGI->CRT2pScrn = NULL;
-                 pXGI->MergedFB = FALSE;
-             }
-@@ -3627,7 +3631,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
-                 XGIErrorLog(pScrn, mergednocrt2, mergeddisstr);
-             }
-             if (pXGI->CRT2pScrn)
--                xfree(pXGI->CRT2pScrn);
-+                free(pXGI->CRT2pScrn);
-             pXGI->CRT2pScrn = NULL;
-             pXGI->MergedFB = FALSE;
-         }
-@@ -4901,7 +4905,7 @@ XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if (pXGI->ShadowFB) {
-         pXGI->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--        pXGI->ShadowPtr = xalloc(pXGI->ShadowPitch * height);
-+        pXGI->ShadowPtr = malloc(pXGI->ShadowPitch * height);
-         displayWidth = pXGI->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-         FBStart = pXGI->ShadowPtr;
-     }
-@@ -5777,17 +5781,17 @@ XGICloseScreen(int scrnIndex, ScreenPtr pScreen)
-     }
- 
-     if (pXGI->ShadowPtr) {
--        xfree(pXGI->ShadowPtr);
-+        free(pXGI->ShadowPtr);
-         pXGI->ShadowPtr = NULL;
-     }
- 
-     if (pXGI->DGAModes) {
--        xfree(pXGI->DGAModes);
-+        free(pXGI->DGAModes);
-         pXGI->DGAModes = NULL;
-     }
- 
-     if (pXGI->adaptor) {
--        xfree(pXGI->adaptor);
-+        free(pXGI->adaptor);
-         pXGI->adaptor = NULL;
-         pXGI->ResetXv = pXGI->ResetXvGamma = NULL;
-     }
-diff --git a/src/xgi_opt.c b/src/xgi_opt.c
-index 09346e4..c0608d5 100755
---- a/src/xgi_opt.c
-+++ b/src/xgi_opt.c
-@@ -195,7 +195,7 @@ xgiOptions(ScrnInfoPtr pScrn)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if(!(pXGI->Options = xalloc(sizeof(XGIOptions)))) return;
-+    if(!(pXGI->Options = malloc(sizeof(XGIOptions)))) return;
- 
-     memcpy(pXGI->Options, XGIOptions, sizeof(XGIOptions));
- 
-diff --git a/src/xgi_setup.c b/src/xgi_setup.c
-index c1d2cdc..6641b09 100755
---- a/src/xgi_setup.c
-+++ b/src/xgi_setup.c
-@@ -678,7 +678,7 @@ bAccessVGAPCIInfo(PXGI_HW_DEVICE_INFO pHwDevInfo, ULONG ulOffset, ULONG ulSet, U
- 	err = pci_device_cfg_write_u32(pXGI->PciInfo, *pulValue,
- 				       ulOffset & ~3);
-     } else {
--	err = pci_device_cfg_write_u32(pXGI->PciInfo, pulValue,
-+	err = pci_device_cfg_read_u32(pXGI->PciInfo, pulValue,
- 				       ulOffset & ~3);
-     }
- 
-diff --git a/src/xgi_video.c b/src/xgi_video.c
-index 31cffd5..df76d14 100755
---- a/src/xgi_video.c
-+++ b/src/xgi_video.c
-@@ -142,7 +142,7 @@ void XGIInitVideo(ScreenPtr pScreen)
-             adaptors = &newAdaptor;
-         } else {
-             newAdaptors =  /* need to free this someplace */
--                xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+                malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-             if(newAdaptors) {
-                 memcpy(newAdaptors, adaptors, num_adaptors *
-                                         sizeof(XF86VideoAdaptorPtr));
-@@ -157,7 +157,7 @@ void XGIInitVideo(ScreenPtr pScreen)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--        xfree(newAdaptors);
-+        free(newAdaptors);
- 
- }
- 
-@@ -395,7 +395,7 @@ XGISetupImageVideo(ScreenPtr pScreen)
-     struct v4l2_standard 	standard;
- # endif//VC    
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-                             sizeof(XGIPortPrivRec) +
-                             sizeof(DevUnion))))
-         return NULL;
diff --git a/extra/xf86-video-xgixp/PKGBUILD b/extra/xf86-video-xgixp/PKGBUILD
deleted file mode 100644
index c44223f1b..000000000
--- a/extra/xf86-video-xgixp/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 153388 2012-03-12 20:55:30Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-xgixp
-pkgver=1.8.0
-pkgrel=5
-pkgdesc="X.org XGIXP video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa') # 'glproto')
-conflicts=('xorg-server<1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        api-compat-fix-for-DRAWABLE_BUFFER.patch)
-sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3'
-          'ea140a13963bbf33cdff1ad75789d765867ec53b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
deleted file mode 100644
index f8cb64673..000000000
--- a/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 25 Mar 2011 22:46:55 +0000
-Subject: API compat fix for DRAWABLE_BUFFER
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/xgi_driver.c b/src/xgi_driver.c
-index e54d8c7..189b84a 100644
---- a/src/xgi_driver.c
-+++ b/src/xgi_driver.c
-@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr,
- {
-     switch (pDraw->type) {
-     case DRAWABLE_WINDOW:
-+#ifdef DRAWABLE_BUFFER
-     case DRAWABLE_BUFFER:
-+#endif
- 	*read_ptr = xg47_read_memory_swap_func;
- 	*write_ptr = xg47_write_memory_swap_func;
- 	break;
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/xfce-utils/PKGBUILD b/extra/xfce-utils/PKGBUILD
deleted file mode 100644
index 063795561..000000000
--- a/extra/xfce-utils/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 138663 2011-09-27 14:33:37Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfce-utils
-pkgver=4.8.3
-pkgrel=1
-pkgdesc="Utilities for Xfce"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.xfce.org/"
-groups=('xfce4')
-depends=('libxfce4ui' 'xorg-xinit' 'hicolor-icon-theme')
-makedepends=('intltool')
-optdepends=('perl:	for migration scripts'
-            'xscreensaver: for locking screen with xflock4'
-	    'gnome-screensaver: for locking screen with xflock4'
-	    'xlockmore: for locking screen with xflock4')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('03b5fba5f63f4f1a31cc7d3728f3c87e')
-sha1sums=('159d445b689ebbf73462a4b4baf5cce4e04afaab')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-dbus \
-	--disable-debug \
-	--with-vendor-info=ArchLinux # 	--enable-gen-doc \
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/xfce-utils/xfce-utils.install b/extra/xfce-utils/xfce-utils.install
deleted file mode 100644
index c58a305e0..000000000
--- a/extra/xfce-utils/xfce-utils.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  cat << EOF
-NOTE
-----
- ==> xfce can run on top of a framebuffer. However, for most users it is
- ==> best to install xorg as an x-server. Please install either xorg-xinit
- ==> as minimal environment or the xorg meta package.
- pacman -S xorg-xinit
-      -- or --
- pacman -S xorg
-EOF
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/extra/xfce4-battery-plugin/show-time-when-on-battery.patch b/extra/xfce4-battery-plugin/show-time-when-on-battery.patch
deleted file mode 100644
index d5ed36460..000000000
--- a/extra/xfce4-battery-plugin/show-time-when-on-battery.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f4a68f05e838291d1ddcb60f7c719873bfd57d27 Mon Sep 17 00:00:00 2001
-From: flo <florian.a.jung@web.de>
-Date: Fri, 18 Feb 2011 17:21:12 +0000
-Subject: Show time when on battery power (bug #3736).
-
----
-diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
-index 87339b7..838a760 100644
---- a/panel-plugin/libacpi.c
-+++ b/panel-plugin/libacpi.c
-@@ -787,7 +787,7 @@ int read_acpi_state_sysfs(int battery)
- 			acpistate->rcapacity = read_sysfs_int(buf);
- 			acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100;
- 		}
--		if (strcmp(name,"current_now") == 0)
-+		if ((strcmp(name,"current_now") == 0) || (strcmp(name,"power_now") == 0))
- 		{
- 			sprintf(buf,"%s/%s",batteries[battery], name);
- 			acpistate->prate = read_sysfs_int(buf);
---
-cgit v0.9.0.2
diff --git a/extra/xfce4-power-manager/fix-french-translation.patch b/extra/xfce4-power-manager/fix-french-translation.patch
deleted file mode 100644
index 063e533bb..000000000
--- a/extra/xfce4-power-manager/fix-french-translation.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 634c5c016d3b6e152e20173263790a3bfbbe0640 Mon Sep 17 00:00:00 2001
-From: Mike Massonnet <mmassonnet@gmail.com>
-Date: Sun, 08 Apr 2012 11:52:33 +0000
-Subject: l10n: Updated French (fr) translation to 100%
-
-New status: 211 messages complete with 0 fuzzies and 0 untranslated.
-
-Transmitted-via: Transifex (translations.xfce.org).
----
-diff --git a/po/fr.po b/po/fr.po
-index 78dc6d3..285393f 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -559,9 +559,8 @@ msgid ""
- "%s (%i%%)\n"
- "%s until is fully charged."
- msgstr ""
--"%s\n"
--"Votre %s est en charge (%i%%)\n"
--"%s jusqu'a ce qu'il soit complétement chargé."
-+"%s (%i%%)\n"
-+"%s jusqu'a ce qu'il soit complètement chargé."
- 
- #: ../src/xfpm-battery.c:230 ../src/xfpm-battery.c:266
- #, c-format
-@@ -579,8 +578,7 @@ msgid ""
- "%s (%i%%)\n"
- "Estimated time left is %s."
- msgstr ""
--"%s\n"
--"Votre %s est en décharge (%i%%)\n"
-+"%s (%i%%)\n"
- "Temps restant estimé est de %s."
- 
- #: ../src/xfpm-battery.c:248 ../src/xfpm-battery.c:269
-@@ -622,7 +620,7 @@ msgid ""
- msgstr ""
- "%s\n"
- "Votre %s est en charge (%i%%)\n"
--"%s jusqu'a ce qu'il soit complétement chargé."
-+"%s jusqu'a ce qu'il soit complètement chargé."
- 
- #: ../src/xfpm-battery.c:444
- #, c-format
---
-cgit v0.9.0.3
diff --git a/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch b/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch
deleted file mode 100644
index 47e067144..000000000
--- a/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/lib/screenshooter-capture.c	
-+++ a/lib/screenshooter-capture.c	
-@@ -381,6 +381,18 @@ static GdkPixbuf
-                   rec_height += rectangle.y;
-                 }
- 
-+              if (rec_x < 0)
-+                {
-+                  rec_width = rec_width + rec_x;
-+                  rec_x = 0;
-+                }
-+
-+              if (rec_y < 0)
-+                {
-+                  rec_height = rec_height + rec_y;
-+                  rec_y = 0;
-+                }
-+
-               if (x_orig + rec_x + rec_width > gdk_screen_width ())
-                 rec_width = gdk_screen_width () - x_orig - rec_x;
- 
diff --git a/extra/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch b/extra/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch
deleted file mode 100644
index a142df822..000000000
--- a/extra/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfce4-screenshooter-1.7.9.orig/Makefile.in	2010-02-07 14:45:15.000000000 +0100
-+++ xfce4-screenshooter-1.7.9/Makefile.in	2010-02-16 23:57:31.000000000 +0100
-@@ -282,7 +282,7 @@
- INTLTOOL_PERL = @INTLTOOL_PERL@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lm -lX11
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/extra/xfce4-settings/xfce4-settings-4.6.0.patch b/extra/xfce4-settings/xfce4-settings-4.6.0.patch
deleted file mode 100644
index 559e2f9e5..000000000
--- a/extra/xfce4-settings/xfce4-settings-4.6.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.6.0/xfsettingsd/xsettings.xml
---- xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml	2009-02-20 10:12:35.000000000 -0700
-+++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml	2009-04-16 15:25:44.000000000 -0600
-@@ -2,10 +2,12 @@
- 
- <channel name="xsettings" version="1.0">
-   <property name="Net" type="empty">
--    <property name="ThemeName" type="string" value="Xfce"/>
--    <property name="IconThemeName" type="string" value="Rodent"/>
-+    <property name="ThemeName" type="string" value="Clearlooks"/>
-+    <property name="IconThemeName" type="string" value="gnome"/>
-   </property>
-   <property name="Xft" type="empty">
-     <property name="DPI" type="int" value="-1"/>
-+    <property name="Antialias" type="int" value="1"/>
-+    <property name="HintStyle" type="string" value="hintfull"/>
-   </property>
- </channel>
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
deleted file mode 100644
index e75d19add..000000000
--- a/extra/xulrunner/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 153514 2012-03-15 13:26:26Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-pkgname=xulrunner
-pkgver=11.0
-pkgrel=1
-pkgdesc="Mozilla Runtime Environment"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13')
-url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
-        mozconfig
-        mozilla-pkgconfig.patch
-        libvpx.patch)
-options=('!emptydirs')
-replaces=('xulrunner-oss')
-md5sums=('4b07acf47857aff72776d805409cdd1b'
-         '8dfb78c5bd0581c8cf4753813132bf0b'
-         '27271ce647a83906ef7a24605e840d61'
-         '5d418ecdbdb9f40597df6b978b0b5ee5')
-
-build() {
-  cd "$srcdir/mozilla-release"
-  cp "$srcdir/mozconfig" .mozconfig
-
-  #fix libdir/sdkdir - fedora
-  patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
-  patch -Np1 -i "$srcdir/libvpx.patch"
-
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
-  export PYTHON="/usr/bin/python2"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd "$srcdir/mozilla-release"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation"
-
-  # add xulrunner library path to ld.so.conf
-  install -d $pkgdir/etc/ld.so.conf.d
-  echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
-
-  chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/header.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/typelib.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpidl.py"
-}
diff --git a/extra/xulrunner/libvpx.patch b/extra/xulrunner/libvpx.patch
deleted file mode 100644
index f883b8e08..000000000
--- a/extra/xulrunner/libvpx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in
---- mozilla-release.orig/configure.in	2012-02-05 16:01:35.722024142 +0000
-+++ mozilla-release/configure.in	2012-02-05 16:03:34.871064547 +0000
-@@ -5629,7 +5629,7 @@
-             dnl v0.9.6 one to check for.
-             AC_TRY_COMPILE([
-                 #include <vpx/vpx_decoder.h>
--                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
-+                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-                     #error "test failed."
-                 #endif
-                 ],
diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig
deleted file mode 100644
index 82a6ae512..000000000
--- a/extra/xulrunner/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch
deleted file mode 100644
index 037d4aee0..000000000
--- a/extra/xulrunner/mozilla-pkgconfig.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:11:38.100005674 +0000
-+++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:14:35.095147521 +0000
-@@ -6,5 +6,6 @@
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
-+Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue -ldl
- Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul.pc.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/libxul.pc.in	2011-12-19 22:14:04.375412141 +0000
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- idldir=%idldir%
- 
-diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in
---- mozilla-release.orig/xulrunner/installer/Makefile.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/Makefile.in	2011-12-19 22:18:28.743135321 +0000
-@@ -108,6 +108,7 @@
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in
---- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:18:55.569571004 +0000
-@@ -7,4 +7,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
--Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
author	Parabola <dev@list.parabolagnulinux.org>	2012-05-04 20:00:41 +0000
committer	Parabola <dev@list.parabolagnulinux.org>	2012-05-04 20:00:41 +0000
commit	b2c353d874b85e06f355a9419852e2616613c7d0 (patch)
tree	f0773e0a930d308198ef5036d4f74e7f53015e6e /extra
parent	0a24fb835cac4007388213ad0afb15257b035b14 (diff)