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

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

39 files changed, 1291 insertions, 784 deletions

diff --git a/community-testing/erlang/PKGBUILD b/community-testing/erlang/PKGBUILD
deleted file mode 100644
index c255213c7..000000000
--- a/community-testing/erlang/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 69278 2012-04-12 02:34:43Z tdziedzic $
-# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de>
-# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
-
-pkgname=erlang
-pkgver=R15B01
-pkgrel=1
-pkgdesc='A small concurrent functional programming language developed by Ericsson.'
-arch=(i686 x86_64)
-url='http://www.erlang.org/index.html'
-license=('custom')
-depends=('ncurses' 'glibc')
-makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa')
-optdepends=('wxgtk: for wx support'
-            'mesa: for wx support'
-            'unixodbc: database'
-            'java-environment: for Java support')
-options=('!makeflags')
-source=("http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz"
-        "http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz")
-md5sums=('f12d00f6e62b36ad027d6c0c08905fad'
-         'd87412c2a1e6005bbe29dfe642a9ca20')
-
-build() {
-  cd "$srcdir/otp_src_${pkgver/./-}"
-
-  export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
-  export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < \
-    lib/erl_interface/vsn.mk)
-
-  sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
-
-  CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support \
-    --enable-threads
-  make
-}
-
-package() {
-  cd "$srcdir/otp_src_${pkgver/./-}"
-
-  make INSTALL_PREFIX="$pkgdir" install
-
-  # fix prefix
-  cd "$pkgdir/usr/lib/erlang"
-  sed -i "s#$pkgdir##" bin/erl bin/start "erts-${ERTSVERSION}/bin/erl" \
-    "erts-${ERTSVERSION}/bin/start" releases/RELEASES
-
-  # fix symlinks
-  cd bin/
-  ln -sf "../erts-${ERTSVERSION}/bin/epmd"
-
-  cd "$pkgdir/usr/bin"
-  for file in *; do
-    ln -sfv "../lib/erlang/bin/$file"
-  done
-
-  ln -s "../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call" \
-    "$pkgdir/usr/bin/erl_call"
-
-  # install documentation
-  install -d "$pkgdir/usr/share/doc/erlang"
-  install -Dm0644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang"
-
-  # install man pages
-  cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
-
-  # install license
-  install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" \
-    "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
-}
diff --git a/community-testing/gnome-packagekit/PKGBUILD b/community-testing/gnome-packagekit/PKGBUILD
deleted file mode 100644
index 535845f6e..000000000
--- a/community-testing/gnome-packagekit/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 69218 2012-04-10 06:33:58Z jconder $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-
-pkgname=gnome-packagekit
-pkgver=3.4.0
-pkgrel=1
-pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
-arch=('i686' 'x86_64')
-url='http://www.packagekit.org/'
-license=('GPL')
-depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify'
-         'packagekit')
-makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower')
-optdepends=('polkit-gnome: required for privileged actions'
-            'gnome-settings-daemon-updates: update and message notifications')
-options=('!emptydirs' '!libtool')
-install="$pkgname.install"
-source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('4f23be695b70bdda8b5c15237472a735bb1745af11dbc324eead9b988f2343c6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  _mime='application/x-xz-compressed-tar;application/x-servicepack;'
-  sed -i "s@MimeType=.*@MimeType=$_mime@" data/gpk-install-local-file.desktop.in
-
-  sed -i 's@python@python2@' python/enum-convertor.py
-  sed -i 's@python enum-convertor.py@python2 enum-convertor.py@' python/packagekit/Makefile.{am,in}
-
-  export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr \
-	      --sysconfdir=/etc \
-	      --disable-gtk-doc \
-	      --disable-schemas-compile \
-	      --disable-scrollkeeper
-  make -s
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make -s DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/gnome-packagekit/gnome-packagekit.install b/community-testing/gnome-packagekit/gnome-packagekit.install
deleted file mode 100644
index 620670d57..000000000
--- a/community-testing/gnome-packagekit/gnome-packagekit.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  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() {
-  if (( $(vercmp $2 2.91.90) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-packagekit
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/gnome-settings-daemon-updates/PKGBUILD b/community-testing/gnome-settings-daemon-updates/PKGBUILD
deleted file mode 100644
index 0358ab285..000000000
--- a/community-testing/gnome-settings-daemon-updates/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 69220 2012-04-10 06:39:32Z jconder $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-
-_pkgname=gnome-settings-daemon
-pkgname=$_pkgname-updates
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Updates plugin for the GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-packagekit' "$_pkgname")
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
-options=('!emptydirs' '!libtool')
-install=$_pkgname.install
-url="http://www.gnome.org"
-source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
-        'systemd-fallback.patch'
-        'arch.patch')
-sha256sums=('5639cbba28caa7b3e33990f49aeed11ed9325e78e76af2175d9ccd5ff298401d'
-            '82b721d0e274af15ed2770052d550d3162d2d37e5e9ee5e6fcebac1ed6cb8199'
-            '727ab3e8181464af32ba604b2931b77cd6d4fbf34e10bbba99bb213eb992466e')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/arch.patch"
-  patch -Np1 -i "$srcdir/systemd-fallback.patch"
-
-  gnome-autogen.sh --prefix=/usr \
-              --sysconfdir=/etc \
-	      --localstatedir=/var \
-	      --libexecdir=/usr/lib/gnome-settings-daemon \
-	      --disable-static \
-	      --enable-systemd
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make -s
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make -C 'plugins/updates' DESTDIR="${pkgdir}" install
-
-  _schema='org.gnome.settings-daemon.plugins.updates.gschema.xml'
-  install -D -m644 "data/$_schema" "$pkgdir/usr/share/glib-2.0/schemas/$_schema"
-}
diff --git a/community-testing/gnome-settings-daemon-updates/arch.patch b/community-testing/gnome-settings-daemon-updates/arch.patch
deleted file mode 100644
index 6718e4db9..000000000
--- a/community-testing/gnome-settings-daemon-updates/arch.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-index c09096a..3fa4159 100644
---- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-+++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-@@ -31,7 +31,7 @@
-       <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and also WiFi if 'connection-use-wifi' is enabled and mobile broadband if 'connection-use-mobile' is enabled.</_description>
-     </key>
-     <key name="auto-update-type" enum="org.gnome.settings-daemon.GsdUpdateType">
--      <default>'security'</default>
-+      <default>'none'</default>
-       <_summary>Automatically install these types of updates</_summary>
-       <_description>Automatically install these types of updates.</_description>
-     </key>
-@@ -56,7 +56,7 @@
-       <_description>The last time we notified the user about non-critical updates. Value is in seconds since the epoch, or zero for never.</_description>
-     </key>
-     <key name="frequency-get-upgrades" type="i">
--      <default>604800</default>
-+      <default>0</default>
-       <_summary>How often to check for distribution upgrades</_summary>
-       <_description>How often to check for distribution upgrades. Value is in seconds.</_description>
-     </key>
-diff --git a/plugins/updates/Makefile.am b/plugins/updates/Makefile.am
-index 9510c65..191092d 100644
---- a/plugins/updates/Makefile.am
-+++ b/plugins/updates/Makefile.am
-@@ -15,7 +15,9 @@ libupdates_la_SOURCES = \
- 	gsd-updates-firmware.h \
- 	gsd-updates-firmware.c \
- 	gsd-updates-manager.h \
--	gsd-updates-manager.c
-+	gsd-updates-manager.c \
-+	gsd-updates-watch.h \
-+	gsd-updates-watch.c
- 
- libupdates_la_CPPFLAGS = \
- 	-I$(top_srcdir)/gnome-settings-daemon \
-diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
-index 4ed046c..9842b32 100644
---- a/plugins/updates/gsd-updates-manager.c
-+++ b/plugins/updates/gsd-updates-manager.c
-@@ -32,6 +32,7 @@
- #include "gsd-updates-manager.h"
- #include "gsd-updates-firmware.h"
- #include "gsd-updates-refresh.h"
-+#include "gsd-updates-watch.h"
- #include "gsd-updates-common.h"
- #include "gnome-settings-profile.h"
- 
-@@ -46,6 +47,7 @@ struct GsdUpdatesManagerPrivate
-         GCancellable            *cancellable;
-         GsdUpdatesRefresh       *refresh;
-         GsdUpdatesFirmware      *firmware;
-+        GsdUpdatesWatch         *watch;
-         GSettings               *settings_ftp;
-         GSettings               *settings_gsd;
-         GSettings               *settings_http;
-@@ -1358,6 +1360,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager,
-         g_signal_connect (manager->priv->refresh, "get-updates",
-                           G_CALLBACK (due_get_updates_cb), manager);
- 
-+	/* watch transaction progress */
-+	manager->priv->watch = gsd_updates_watch_new ();
-+
-         /* get http settings */
-         manager->priv->settings_http = g_settings_new ("org.gnome.system.proxy.http");
-         g_signal_connect (manager->priv->settings_http, "changed",
-@@ -1463,6 +1468,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager)
-                 g_object_unref (manager->priv->firmware);
-                 manager->priv->firmware = NULL;
-         }
-+        if (manager->priv->watch != NULL) {
-+                g_object_unref (manager->priv->watch);
-+                manager->priv->watch = NULL;
-+        }
-         if (manager->priv->proxy_session != NULL) {
-                 g_object_unref (manager->priv->proxy_session);
-                 manager->priv->proxy_session = NULL;
-diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c
-new file mode 100644
-index 0000000..37d8778
---- /dev/null
-+++ b/plugins/updates/gsd-updates-watch.c
-@@ -0,0 +1,179 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2007-2011 Richard Hughes <richard@hughsie.com>
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * 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 General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include "config.h"
-+
-+#include <unistd.h>
-+#include <glib/gi18n.h>
-+#include <packagekit-glib2/packagekit.h>
-+#include <libnotify/notify.h>
-+
-+#include "gsd-updates-watch.h"
-+
-+#define GSD_UPDATES_WATCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchPrivate))
-+
-+struct GsdUpdatesWatchPrivate
-+{
-+	PkTransactionList *tlist;
-+	PkClient *client;
-+};
-+
-+G_DEFINE_TYPE (GsdUpdatesWatch, gsd_updates_watch, G_TYPE_OBJECT)
-+
-+static void
-+gsd_updates_watch_message_cb (PkMessage *item, GsdUpdatesWatch *watch)
-+{
-+	NotifyNotification *notification;
-+	gchar *details = NULL;
-+	const gchar *title, *message;
-+	GError *error = NULL;
-+
-+	g_return_if_fail (PK_IS_MESSAGE (item));
-+	g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+	g_object_get (item, "details", &details, NULL);
-+	title = _("More information");
-+	message = details;
-+
-+	/* use a better title if available */
-+	if (g_str_has_prefix (details, "<b>")) {
-+		gchar *end = g_strstr_len (details, -1, "</b>\n");
-+		if (end != NULL && g_strstr_len (details, end - details, "\n") == NULL) {
-+			title = details + 3;
-+			*end = '\0';
-+			message = end + 5;
-+		}
-+	}
-+
-+	/* display a notification */
-+	notification = notify_notification_new (title, message, NULL);
-+	notify_notification_set_app_name (notification, _("Software Updates"));
-+	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
-+	notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
-+
-+	if (!notify_notification_show (notification, &error)) {
-+		g_warning ("error: %s", error->message);
-+		g_error_free (error);
-+	}
-+
-+	g_free (details);
-+}
-+
-+static void
-+gsd_updates_watch_adopt_cb (PkClient *client, GAsyncResult *res, GsdUpdatesWatch *watch)
-+{
-+	PkResults *results;
-+	PkProgress *progress = NULL;
-+	guint uid;
-+	GPtrArray *array;
-+	GError *error = NULL;
-+
-+	g_return_if_fail (PK_IS_CLIENT (client));
-+	g_return_if_fail (G_IS_ASYNC_RESULT (res));
-+	g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+	results = pk_client_generic_finish (client, res, &error);
-+	if (results == NULL) {
-+		g_warning ("failed to adopt: %s", error->message);
-+		g_error_free (error);
-+		goto out;
-+	}
-+
-+	g_object_get (results, "progress", &progress, NULL);
-+	g_object_get (progress, "uid", &uid, NULL);
-+
-+	/* only display messages from the same user */
-+	if (uid != getuid ()) {
-+		g_printerr ("ignoring messages\n");
-+		goto out;
-+	}
-+
-+	array = pk_results_get_message_array (results);
-+	g_ptr_array_foreach (array, (GFunc) gsd_updates_watch_message_cb, watch);
-+	g_ptr_array_unref (array);
-+
-+out:
-+	if (progress != NULL) {
-+		g_object_unref (progress);
-+	}
-+	if (results != NULL) {
-+		g_object_unref (results);
-+	}
-+}
-+
-+static void
-+gsd_updates_watch_tlist_added_cb (PkTransactionList *tlist, const gchar *tid, GsdUpdatesWatch *watch)
-+{
-+	g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist));
-+	g_return_if_fail (tid != NULL);
-+	g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+	/* listen for messages */
-+	pk_client_adopt_async (watch->priv->client, tid, NULL, NULL, NULL,
-+			       (GAsyncReadyCallback) gsd_updates_watch_adopt_cb, watch);
-+}
-+
-+static void
-+gsd_updates_watch_init (GsdUpdatesWatch *watch)
-+{
-+	g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+	watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch);
-+	watch->priv->tlist = pk_transaction_list_new ();
-+	watch->priv->client = pk_client_new ();
-+
-+	g_signal_connect (watch->priv->tlist, "added",
-+			  G_CALLBACK (gsd_updates_watch_tlist_added_cb), watch);
-+}
-+
-+static void
-+gsd_updates_watch_finalize (GObject *object)
-+{
-+	GsdUpdatesWatch *watch;
-+
-+	g_return_if_fail (GSD_IS_UPDATES_WATCH (object));
-+
-+	watch = GSD_UPDATES_WATCH (object);
-+	g_return_if_fail (watch->priv != NULL);
-+
-+	if (watch->priv->tlist != NULL) {
-+		g_object_unref (watch->priv->tlist);
-+	}
-+	if (watch->priv->client != NULL) {
-+		g_object_unref (watch->priv->client);
-+	}
-+
-+	G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object);
-+}
-+
-+GsdUpdatesWatch *
-+gsd_updates_watch_new (void)
-+{
-+	return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL));
-+}
-+
-+static void
-+gsd_updates_watch_class_init (GsdUpdatesWatchClass *klass)
-+{
-+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+	object_class->finalize = gsd_updates_watch_finalize;
-+	g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate));
-+}
-diff --git a/plugins/updates/gsd-updates-watch.h b/plugins/updates/gsd-updates-watch.h
-new file mode 100644
-index 0000000..d90976e
---- /dev/null
-+++ b/plugins/updates/gsd-updates-watch.h
-@@ -0,0 +1,52 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2007-2011 Richard Hughes <richard@hughsie.com>
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * 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 General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#ifndef __GSD_UPDATES_WATCH_H
-+#define __GSD_UPDATES_WATCH_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define GSD_TYPE_UPDATES_WATCH          (gsd_updates_watch_get_type ())
-+#define GSD_UPDATES_WATCH(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatch))
-+#define GSD_UPDATES_WATCH_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchClass))
-+#define GSD_IS_UPDATES_WATCH(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_UPDATES_WATCH))
-+
-+typedef struct GsdUpdatesWatchPrivate GsdUpdatesWatchPrivate;
-+
-+typedef struct
-+{
-+         GObject                         parent;
-+         GsdUpdatesWatchPrivate         *priv;
-+} GsdUpdatesWatch;
-+
-+typedef struct
-+{
-+        GObjectClass    parent_class;
-+} GsdUpdatesWatchClass;
-+
-+GType                    gsd_updates_watch_get_type           (void);
-+GsdUpdatesWatch         *gsd_updates_watch_new                (void);
-+
-+G_END_DECLS
-+
-+#endif /* __GSD_UPDATES_WATCH_H */
diff --git a/community-testing/gnome-settings-daemon-updates/systemd-fallback.patch b/community-testing/gnome-settings-daemon-updates/systemd-fallback.patch
deleted file mode 100644
index ffe953c63..000000000
--- a/community-testing/gnome-settings-daemon-updates/systemd-fallback.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-commit b9ded09387f0b99ece97baee18595eb9e86a5b9b
-Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-Date:   Mon Mar 12 01:52:54 2012 +0100
-
-    Fallback to CK if systemd is not available
-
-    Be nice to distributions where systemd is optional. This will select
-    the code path at runtime depending on whether the system was booted
-    using systemd.
-
-diff --git a/configure.ac b/configure.ac
-index 3b4789f..d522852 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd],
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-   SESSION_TRACKING=systemd
- else
-diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c
-index 5786300..83fe21e 100644
---- a/gnome-settings-daemon/gnome-settings-session.c
-+++ b/gnome-settings-daemon/gnome-settings-session.c
-@@ -30,6 +30,7 @@
- #include "gnome-settings-session.h"
-
- #ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
- #include <systemd/sd-login.h>
-
- typedef struct
-@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate
- {
- #ifdef HAVE_SYSTEMD
-         GSource                   *sd_source;
--#else
-+#endif
-	GDBusProxy		*proxy_session;
-	GCancellable		*cancellable;
--#endif
-	gchar			*session_id;
-	GnomeSettingsSessionState state;
- };
-@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data)
-         return TRUE;
- }
-
--#else /* HAVE_SYSTEMD */
-+#endif /* HAVE_SYSTEMD */
-
- static void
- gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
-@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d
-	g_object_unref (proxy_manager);
- }
-
--#endif /* HAVE_SYSTEMD */
--
- static void
- gnome_settings_session_init (GnomeSettingsSession *session)
- {
-	session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
-
- #ifdef HAVE_SYSTEMD
--        sd_pid_get_session (getpid(), &session->priv->session_id);
-+        session->priv->sd_source = NULL;
-+
-+        if (sd_booted () > 0) {
-+                sd_pid_get_session (getpid(), &session->priv->session_id);
-
--        session->priv->sd_source = sd_source_new ();
--        g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
--        g_source_attach (session->priv->sd_source, NULL);
-+                session->priv->sd_source = sd_source_new ();
-+                g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-+                g_source_attach (session->priv->sd_source, NULL);
-
--        sessions_changed (session);
--#else
-+                sessions_changed (session);
-+                return;
-+        }
-+#endif
-	session->priv->cancellable = g_cancellable_new ();
-
-	/* connect to ConsoleKit */
-@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session)
-				  session->priv->cancellable,
-				  got_manager_proxy_cb,
-				  session);
--#endif
- }
-
- static void
-@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object)
-         if (session->priv->sd_source != NULL) {
-                 g_source_destroy (session->priv->sd_source);
-                 g_source_unref (session->priv->sd_source);
-+                goto out;
-         }
--#else
-+#endif
-+
-	g_cancellable_cancel (session->priv->cancellable);
-
-	if (session->priv->proxy_session != NULL)
-		g_object_unref (session->priv->proxy_session);
-	g_object_unref (session->priv->cancellable);
--#endif
-
-+out:
-	G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
- }
-
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 8db04e5..9883d76 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -2031,7 +2031,7 @@ systemd_stop (void)
-         g_object_unref (bus);
- }
-
--#else
-+#endif
-
- static void
- consolekit_stop_cb (GObject *source_object,
-@@ -2081,7 +2081,6 @@ consolekit_stop (void)
-                            consolekit_stop_cb, NULL);
-         g_object_unref (proxy);
- }
--#endif
-
- static void
- upower_sleep_cb (GObject *source_object,
-@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager,
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
- #ifdef HAVE_SYSTEMD
--                systemd_stop ();
--#else
--                consolekit_stop ();
-+                if (sd_booted () > 0)
-+                        systemd_stop ();
-+                else
- #endif
-+                        consolekit_stop ();
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
diff --git a/community/goobox/PKGBUILD b/community/goobox/PKGBUILD
new file mode 100644
index 000000000..6a5d3a949
--- /dev/null
+++ b/community/goobox/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 69379 2012-04-15 01:54:25Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=goobox
+pkgver=3.0.1
+pkgrel=1
+pkgdesc="CD player and ripper for GNOME"
+arch=('i686' 'x86_64')
+url="http://people.gnome.org/~paobac/goobox/"
+license=('GPL')
+depends=('brasero' 'libmusicbrainz3' 'libnotify' 'xdg-utils')
+makedepends=('gconf' 'intltool' 'gnome-doc-utils')
+optdepends=('gstreamer0.10-good-plugins: rip CDs into flac and wav format')
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        fix-notifications.patch)
+sha256sums=('344351ab8a9aee9e1c7f490e84c972a0df57eec5b44d31247c7ef268bf4cb60e'
+            '41f1307c271ee003d2e7435d6e9a7c5f72d3668ce0cc50842769c34f97c7fe99')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=674121
+  patch -Np1 -i "$srcdir/fix-notifications.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --disable-scrollkeeper --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/goobox/fix-notifications.patch b/community/goobox/fix-notifications.patch
new file mode 100644
index 000000000..6ca9c65cb
--- /dev/null
+++ b/community/goobox/fix-notifications.patch
@@ -0,0 +1,25 @@
+diff -Naur goobox-3.0.1.orig/src/main.c goobox-3.0.1/src/main.c
+--- goobox-3.0.1.orig/src/main.c	2011-08-22 19:55:45.000000000 +0200
++++ goobox-3.0.1/src/main.c	2012-04-15 02:59:34.476683867 +0200
+@@ -729,15 +729,15 @@
+ 						window,
+ 						NULL);
+ 
+-		notify_notification_set_hint_byte (notification,
+-						   "action-icons",
+-						   TRUE);
++		notify_notification_set_hint (notification,
++					      "action-icons",
++					      g_variant_new_boolean (TRUE));
+ 	}
+ 
+ 	if (notification_supports_persistence)
+-		notify_notification_set_hint_byte (notification,
+-						    "resident" /* "transient" */,
+-						    TRUE);
++		notify_notification_set_hint (notification,
++					      "resident" /* "transient" */,
++					      g_variant_new_boolean (TRUE));
+ 
+ 	notify_notification_show (notification, NULL);
+ 
diff --git a/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install b/community/goobox/goobox.install
index 326aa98a2..aa4c3e059 100644
--- a/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install
+++ b/community/goobox/goobox.install
@@ -1,11 +1,13 @@
 post_install() {
   glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
 }
 
 post_upgrade() {
-  post_install
+  post_install $1
 }
 
 post_remove() {
-  post_install
+  post_install $1
 }
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index 2cbe07aa9..30d7ddca1 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67842 2012-03-15 00:01:16Z kkeen $
+# $Id: PKGBUILD 69361 2012-04-14 14:13:25Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 
 pkgname=gtkwave
-pkgver=3.3.34
+pkgver=3.3.35
 pkgrel=1
 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2')
 makedepends=('gperf')
 install='gtkwave.install'
 source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz")
-md5sums=('eef932f2e4826d10acb05d96d7a4e665')
+md5sums=('f7de1e24ca4e3c5396d38dc6232d1f91')
 
 build() {
   cd "${srcdir}/gtkwave-${pkgver}"
diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD
index 09b784329..dc8c305c7 100644
--- a/community/mygui/PKGBUILD
+++ b/community/mygui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67266 2012-03-06 06:11:36Z svenstaro $
+# $Id: PKGBUILD 69363 2012-04-14 17:09:46Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Andrew Belitsky <belitsky.a@gmail.com>
 pkgbase=mygui
 pkgname=('mygui' 'mygui-docs')
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A multilayer and overlappable GUI System for OGRE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mygui.info/"
@@ -23,6 +23,7 @@ build() {
   sed -i -e 's:../share:/usr/share:' \
          -e 's:"bin":"../opt/MYGUI":' \
          CMake/InstallResources.cmake
+  sed -i '71 i set(MYGUI_GCC_VISIBILITY_FLAGS "")' CMakeLists.txt
 
   # get a clean build dir
   [[ -d build ]] && rm -rf build
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index f0e0c4bde..af1a3aabb 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69264 2012-04-11 06:54:34Z jconder $
+# $Id: PKGBUILD 69346 2012-04-14 12:26:30Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -14,7 +14,7 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
 pkgver=0.25
-pkgrel=1
+pkgrel=2
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mythtv.org"
@@ -33,7 +33,8 @@ build() {
   cd "$srcdir/$pkgbase-$pkgver"
   find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
-  sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i mythzoneminder/mythzmserver/zmserver.cpp
+  sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php'
+  sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp'
 
   ./configure --prefix=/usr \
               --enable-all \
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 94b113887..2cf1623d5 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69216 2012-04-10 05:27:08Z jconder $
+# $Id: PKGBUILD 69338 2012-04-14 09:48:38Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
-pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python')
-pkgver=0.6.21
-pkgrel=3
+pkgname=('packagekit' 'packagekit-qt2' 'packagekit-python')
+pkgver=0.6.22
+pkgrel=1
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.packagekit.org"
@@ -12,23 +12,17 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
              'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
              'shared-mime-info' 'sqlite' 'udev')
 options=('!libtool')
-source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
-        'alpm.patch')
-sha256sums=('68e5d4d07adf50b1fae6cbc0963555345ba7fc12d86d3e3387874547a5448b8e'
-            'ab6a9be1741aba6972f3327ac625b802e9404e21fe60ca0919a440e8ac9df965')
+source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz")
+sha256sums=('b9f71721b0b16e106c0a1ce28c97b2277a34b0c15d1a171f4898f34117ebaa2d')
 
 build() {
   cd "$srcdir/PackageKit-$pkgver"
 
-  patch -Np1 -i "$srcdir/alpm.patch"
-
   sed -i 's@SUBDIRS = test@SUBDIRS =@' 'backends/Makefile.in'
   sed -i 's@python @python2 @' 'lib/python/packagekit/Makefile.in'
   sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py
 
   export PYTHON=/usr/bin/python2
-  # TODO: remove when upstream is patched
-  autoreconf
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var \
@@ -48,7 +42,7 @@ build() {
               --disable-dummy \
               --enable-alpm \
               --with-default-backend=alpm
-  make -s
+  make -s CFLAGS='-D_FILE_OFFSET_BITS=64'
 }
 
 package_packagekit() {
@@ -78,15 +72,6 @@ package_packagekit() {
   touch "$pkgdir/var/log/PackageKit"
 }
 
-package_packagekit-qt() {
-  depends=('packagekit' 'qt')
-  pkgdesc=('Qt bindings for PackageKit')
-
-  cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt"
-
-  make DESTDIR="$pkgdir" install
-}
-
 package_packagekit-qt2() {
   depends=('packagekit' 'qt')
   pkgdesc=('Qt bindings for PackageKit')
diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD
index 6f8752173..4e5a6c99c 100644
--- a/community/remmina/PKGBUILD
+++ b/community/remmina/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 66273 2012-02-23 07:08:35Z spupykin $
+# $Id: PKGBUILD 69336 2012-04-14 04:21:10Z lcarlier $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=remmina
 pkgver=1.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Remmina is a remote desktop client written in GTK+. "
 arch=(i686 x86_64 'mips64el')
 url="http://remmina.sourceforge.net/"
@@ -17,8 +17,8 @@ provides=("grdc" "grdc=$pkgver" 'remmina-plugins')
 conflicts=("grdc")
 install=remmina.install
 source=(https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz
-		'https://github.com/FreeRDP/Remmina/commit/569d9bb702d06c061dfbbf3c590d57ea83a04369.diff'
-		'https://github.com/FreeRDP/Remmina/commit/f7d1038ba358a295fb46c681db5c47e4ead97306.diff')
+	'https://github.com/FreeRDP/Remmina/commit/569d9bb702d06c061dfbbf3c590d57ea83a04369.diff'
+	'https://github.com/FreeRDP/Remmina/commit/f7d1038ba358a295fb46c681db5c47e4ead97306.diff')
 md5sums=('701c540acaab961bc3adf130a2ddb8b1'
          'a979c898d5e53446cec9d01912ad9243'
          'b2a9c0e80ac7b0c8a26935bbe289aa3b')
@@ -27,7 +27,7 @@ build() {
   cd ${srcdir}/FreeRDP-Remmina-*/
   patch -p1 -i "${srcdir}/569d9bb702d06c061dfbbf3c590d57ea83a04369.diff"
   patch -p1 -i "${srcdir}/f7d1038ba358a295fb46c681db5c47e4ead97306.diff"
-  export LDFLAGS="-lX11 -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lpthread"
+  export LDFLAGS="-lX11 -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lpthread -lgnutls"
   cmake -DWITH_APPINDICATOR=OFF -DCMAKE_INSTALL_PREFIX=/usr .
   make
   make DESTDIR=${pkgdir} install
diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD
index 854a17c40..00d997621 100644
--- a/core/dbus-core/PKGBUILD
+++ b/core/dbus-core/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 140075 2011-10-06 07:35:37Z ibiru $
+# $Id: PKGBUILD 156105 2012-04-14 07:39:59Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-core
-pkgver=1.4.16
-pkgrel=1.1
+pkgver=1.4.20
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem')
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'shadow') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
         dbus)
-md5sums=('44a2a10678e7e50460879c3eb4453a65'
+md5sums=('79eca2f2c1894ac347acce128314428b'
          '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
@@ -27,7 +27,7 @@ build() {
       --enable-inotify --disable-dnotify \
       --disable-verbose-mode --disable-static \
       --disable-tests --disable-asserts \
-      --with-systemdsystemunitdir=/lib/systemd/system
+      --with-systemdsystemunitdir=/usr/lib/systemd/system
   make
 }
 
@@ -37,8 +37,7 @@ package(){
 
   rm -f "${pkgdir}/usr/bin/dbus-launch"
   rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
-
-  chown 81:81 "${pkgdir}/var/run/dbus"
+  rm -rf "${pkgdir}/var/run"
 
   install -m755 -d "${pkgdir}/etc/rc.d"
   install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/"
@@ -46,12 +45,6 @@ package(){
   #Fix configuration file
   sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf"
 
-  #install .keep files so pacman doesn't delete empty dirs
-  touch "${pkgdir}/usr/share/dbus-1/services/.keep"
-  touch "${pkgdir}/usr/share/dbus-1/system-services/.keep"
-  touch "${pkgdir}/etc/dbus-1/session.d/.keep"
-  touch "${pkgdir}/etc/dbus-1/system.d/.keep"
-
   install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
 }
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index 8120d8b36..9e5382388 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 128602 2011-06-24 13:59:34Z ibiru $
+# $Id: PKGBUILD 156109 2012-04-14 07:40:13Z andyrtr $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dbus-python
-pkgver=0.84.0
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Python bindings for DBUS"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-depends=('dbus-glib' 'python2')
-makedepends=('pkg-config' 'docutils')
+depends=('dbus-core' 'python2')
+makedepends=('docutils' 'dbus-glib')
+optdepends=('dbus-glib: glib mainloop support')
 options=('!libtool')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('fe69a2613e824463e74f10913708c88a')
+md5sums=('775a8235736bf760cdd96e2d76546469')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/dbus/30-dbus b/extra/dbus/30-dbus
index 603e92d3e..69d2660da 100644
--- a/extra/dbus/30-dbus
+++ b/extra/dbus/30-dbus
@@ -6,4 +6,3 @@ dbuslaunch="`which dbus-launch 2>/dev/null`"
 if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
   eval `$dbuslaunch --sh-syntax --exit-with-session`
 fi
-
diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD
index 46e810395..17f83e1f2 100644
--- a/extra/dbus/PKGBUILD
+++ b/extra/dbus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140077 2011-10-06 07:35:45Z ibiru $
+# $Id: PKGBUILD 156107 2012-04-14 07:40:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.4.16
-pkgrel=1.1
+pkgver=1.4.20
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL' 'custom')
 depends=("dbus-core>=${pkgver}" 'libx11')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
         30-dbus)
-md5sums=('44a2a10678e7e50460879c3eb4453a65'
-         'd14e59575f04e55d21a04907b6fd9f3c')
+md5sums=('79eca2f2c1894ac347acce128314428b'
+         '9fafe8b28460aeaa6054309ef4c5ed92')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index b943786ca..e87adfe29 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154452 2012-03-28 18:46:15Z foutrelis $
+# $Id: PKGBUILD 156139 2012-04-14 11:33:09Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 pkgname=garcon
-pkgver=0.1.11
+pkgver=0.1.12
 pkgrel=1
 pkgdesc="Implementation of the freedesktop.org menu specification"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,12 +15,13 @@ makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
 replaces=('libxfce4menu')
 options=('!libtool' '!makeflags')
 source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2)
-sha256sums=('272c1207a3449ce969a86ebdc61c6afcad05003f0a986e222bb90c01c1692dfc')
+sha256sums=('bb5145fff4f09fd20db114918d76212ce7b55bd8b0540e2bf26248e6af1902c8')
 
 build() {
   cd "$srcdir/garcon-$pkgver"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 4173fb9d6..1ce8ead12 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153265 2012-03-12 17:50:21Z andrea $
+# $Id: PKGBUILD 156129 2012-04-14 10:02:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk2
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ conflicts=('oxygen-gtk')
 replaces=('oxygen-gtk')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('88cc3da77fec3802564b6d16b4268300')
+md5sums=('e829b07082280bc0744623ae477b550e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index 5e8587085..09bf2af92 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153267 2012-03-12 17:51:08Z andrea $
+# $Id: PKGBUILD 156131 2012-04-14 10:03:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=oxygen-gtk3
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('gtk3' 'dbus-glib')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('3e884df6afe8a549063748ff12b5065c')
+md5sums=('a60a0548826916313197943e89a08455')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 26fc428d1..be87f4b35 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 154524 2012-03-29 20:18:01Z andrea $
+# $Id: PKGBUILD 156133 2012-04-14 10:06:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.8.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
+makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
     'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
     'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
     'mysql' 'unixodbc' 'cups' 'gtk2')
@@ -19,6 +19,9 @@ source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'qtconfig.desktop'
         'gcc47.patch'
+        'improve-cups-support.patch'
+        'fix-buffer-overflow.patch'
+        'fix-cursortox-crash.patch'
 	'declarative-fix-sigbus.patch')
 md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
          'fc211414130ab2764132e7370f8e5caa'
@@ -26,6 +29,9 @@ md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
          'f11852b97583610f3dbb669ebc3e21bc'
          '6b771c8a81dd90b45e8a79afa0e5bbfd'
          'd8a0e81075b290ddc18ecd33b9b7ee22'
+         'c439c7731c25387352d8453ca7574971'
+         'c493dca3c11fffb9af6719c6735cb0d2'
+         '13171b6aec2f240be05feb968178f70e'
          'aac963d05a9d5733e2bfce9e26607f51')
 
 build() {
@@ -35,6 +41,15 @@ build() {
   patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
 
   patch -p1 -i "${srcdir}"/gcc47.patch
+  
+  # (FS#29158)
+  patch -p1 -i "${srcdir}"/fix-buffer-overflow.patch
+  
+  # (FS#29402) (QTBUG#24718)
+  patch -p1 -i "${srcdir}"/fix-cursortox-crash.patch
+
+  # (FS#28381) (KDEBUG#180051)
+  patch -p1 -i "${srcdir}"/improve-cups-support.patch
 
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
@@ -76,7 +91,7 @@ build() {
 
 package_qt() {
     pkgdesc='A cross-platform application and UI framework'
-    depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
+    depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
       'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
       'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
     optdepends=('postgresql-libs: PostgreSQL driver'
diff --git a/extra/qt/fix-buffer-overflow.patch b/extra/qt/fix-buffer-overflow.patch
new file mode 100644
index 000000000..f0334f247
--- /dev/null
+++ b/extra/qt/fix-buffer-overflow.patch
@@ -0,0 +1,34 @@
+From 827e5c4c689d4ecb4f8c1ab48c9a7ab712fe2ca7 Mon Sep 17 00:00:00 2001
+From: John Tapsell <john.tapsell.ext@basyskom.com>
+Date: Mon, 12 Mar 2012 22:07:47 +0000
+Subject: [PATCH] Harfbuzz-thai - fix buffer overflow when setting item
+ attributes
+
+Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713
+Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
+---
+ src/3rdparty/harfbuzz/src/harfbuzz-thai.c          |    9 +++++-
+ .../qtextscriptengine/tst_qtextscriptengine.cpp    |   29 ++++++++++++++++++++
+ 2 files changed, 36 insertions(+), 2 deletions(-)
+
+diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
+index bf6c35b..3c0ffe8 100644
+--- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
++++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
+@@ -263,8 +263,13 @@ static HB_Bool HB_ThaiConvertStringToGlyphIndices (HB_ShaperItem *item)
+                 // The only glyphs that should be passed to this function that cannot be mapped to
+                 // tis620 are the ones of type Inherited class.  Pass these glyphs untouched.
+                 glyphString[slen++] = string[i];
+-                if (string[i] == 0x200D || string[i] == 0x200C)
+-                    item->attributes[slen-1].dontPrint = true; // Hide ZWJ and ZWNJ characters
++                if (string[i] == 0x200D || string[i] == 0x200C) {
++                    // Check that we do not run out of bounds when setting item->attributes.  If we do
++                    // run out of bounds then this function will return false, the necessary amount of
++                    // memory is reallocated, and this function will then be called again.
++                    if (slen <= item->num_glyphs)
++                        item->attributes[slen-1].dontPrint = true; // Hide ZWJ and ZWNJ characters
++                }
+             } else {
+                 glyphString[slen++] = (HB_UChar16) thai_get_glyph_index (font_type, rglyphs[lgi]);
+             }
+
diff --git a/extra/qt/fix-cursortox-crash.patch b/extra/qt/fix-cursortox-crash.patch
new file mode 100644
index 000000000..fbc9c1370
--- /dev/null
+++ b/extra/qt/fix-cursortox-crash.patch
@@ -0,0 +1,32 @@
+Index: fix-cursortox-crash.patch
+===================================================================
+--- fix-cursortox-crash.patch	(revision 0)
++++ fix-cursortox-crash.patch	(arbetskopia)
+#commit cac12f4592477d99ef6fffaad40345bf85ef53b5
+#Author: Jiang Jiang <jiang.jiang@nokia.com>
+#Date:   Mon Apr 2 12:32:05 2012 +0200
+#
+#    Fix a crash in cursorToX() when new block is added
+#    
+#    When an empty new block is being added, the layoutData->memory data
+#    will be 0, thus QTextEngine::attributes() will return 0. We should
+#    only access the attributes pointer when some text actually exist.
+#    
+#    Task-number: QTBUG-24718
+#    Change-Id: I9ce9f7b57bccf24099a02832ce30fb6cebfaad33
+#
+diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
+index ee658d9..16f7150 100644
+--- a/src/gui/text/qtextlayout.cpp
++++ b/src/gui/text/qtextlayout.cpp
+@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
+     int pos = *cursorPos;
+     int itm;
+     const HB_CharAttributes *attributes = eng->attributes();
++    if (!attributes) {
++        *cursorPos = 0;
++        return x.toReal();
++    }
+     while (pos < line.from + line.length && !attributes[pos].charStop)
+         pos++;
+     if (pos == line.from + (int)line.length) {
diff --git a/extra/qt/improve-cups-support.patch b/extra/qt/improve-cups-support.patch
new file mode 100644
index 000000000..e0305e11b
--- /dev/null
+++ b/extra/qt/improve-cups-support.patch
@@ -0,0 +1,84 @@
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
+@@ -569,6 +569,32 @@
+ void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
+ {
+     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
++
++    if (cups) {
++        const ppd_option_t* duplex = cups->ppdOption("Duplex");
++        if (duplex) {
++            // copy default ppd duplex to qt dialog
++            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++                options.duplexShort->setChecked(true);
++            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++                options.duplexLong->setChecked(true);
++            else
++                options.noDuplex->setChecked(true);
++        }
++
++        if (cups->currentPPD()) {
++            // set default color
++            if (cups->currentPPD()->color_device)
++                options.color->setChecked(true);
++            else
++                options.grayscale->setChecked(true);
++        }
++
++        // set collation
++        const ppd_option_t *collate = cups->ppdOption("Collate");
++        if (collate)
++            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
++    }
+ }
+ #endif
+ 
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
+@@ -627,6 +627,44 @@
+                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
+         setOutputFormat(QPrinter::PdfFormat);
+     }
++
++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
++    // fill in defaults from ppd file
++    QCUPSSupport cups;
++
++    int printernum = -1;
++    for (int i = 0; i < cups.availablePrintersCount(); i++) {
++        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
++            printernum = i;
++    }
++    if (printernum >= 0) {
++        cups.setCurrentPrinter(printernum);
++
++        const ppd_option_t* duplex = cups.ppdOption("Duplex");
++        if (duplex) {
++            // copy default ppd duplex to qt dialog
++            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++                setDuplex(DuplexShortSide);
++            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++                setDuplex(DuplexLongSide);
++            else
++                setDuplex(DuplexNone);
++        }
++
++        if (cups.currentPPD()) {
++            // set default color
++            if (cups.currentPPD()->color_device)
++                setColorMode(Color);
++            else
++                setColorMode(GrayScale);
++        }
++
++        // set collation
++        const ppd_option_t *collate = cups.ppdOption("Collate");
++        if (collate)
++            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
++    }
++#endif
+ }
+ 
+ /*!
diff --git a/extra/xbase/PKGBUILD b/extra/xbase/PKGBUILD
new file mode 100644
index 000000000..0fa63a7fa
--- /dev/null
+++ b/extra/xbase/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 156152 2012-04-14 16:31:07Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+pkgname=xbase
+pkgver=2.0.0
+pkgrel=2
+pkgdesc="An XBase compatible C++ class library"
+arch=('i686' 'x86_64')
+url='http://linux.techass.com/projects/xdb/'
+license=('LGPL')
+depends=('bash' 'gcc-libs')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/xdb/${pkgname}-${pkgver}.tar.gz"
+        'fix-build.patch'
+        'gcc43.patch'
+        'gcc47.patch')
+md5sums=('9b29362031716a12491beb9f8cc882f2'
+         'f66c1d19a51552b1748ab9158156b103'
+         '0d5a59a59eb2c79d172bd4339de35372'
+         '879bf5107605eee2cbec2dca116edac6')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i "${srcdir}/fix-build.patch"
+  patch -p1 -i "${srcdir}/gcc43.patch"
+  patch -p1 -i "${srcdir}/gcc47.patch"
+ 
+  # Workaround to build on x86_64
+  ./configure --host=i686-pc-linux-gnu --prefix=/usr
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -k check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/xbase/fix-build.patch b/extra/xbase/fix-build.patch
new file mode 100644
index 000000000..c5ff720da
--- /dev/null
+++ b/extra/xbase/fix-build.patch
@@ -0,0 +1,11 @@
+--- xbase-2.0.0/xbase/ntx.h.orig	2006-04-09 07:40:43.000000000 -0400
++++ xbase-2.0.0/xbase/ntx.h	2006-04-09 07:40:53.000000000 -0400
+@@ -218,7 +218,7 @@ class XBDLLEXPORT xbNtx : public xbIndex
+    xbShort  KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }
+    xbShort  KeyExists( xbDouble );
+ 
+-   xbShort xbNtx::AllocKeyBufs(void);
++   xbShort AllocKeyBufs(void);
+ 
+    virtual void GetExpression(char *buf, int len);
+ };
diff --git a/extra/xbase/gcc43.patch b/extra/xbase/gcc43.patch
new file mode 100644
index 000000000..933682a2c
--- /dev/null
+++ b/extra/xbase/gcc43.patch
@@ -0,0 +1,573 @@
+diff -up xbase-2.0.0/xbase/xbstring.h.gcc43 xbase-2.0.0/xbase/xbstring.h
+--- xbase-2.0.0/xbase/xbstring.h.gcc43	2001-01-27 06:00:32.000000000 +0100
++++ xbase-2.0.0/xbase/xbstring.h	2008-03-11 20:21:20.000000000 +0100
+@@ -56,7 +56,7 @@
+ #endif
+ 
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ /*! \file xbstring.h
+ */
+@@ -119,7 +119,7 @@ public:
+   bool operator <= ( const xbString& ) const;
+   bool operator >= ( const xbString& ) const;
+ 
+-  friend ostream& operator << ( ostream&, const xbString& );
++  friend std::ostream& operator << ( std::ostream&, const xbString& );
+ 
+   xbString &remove(size_t pos = 0, int n = npos);
+   xbString mid(size_t pos = 0, int n = npos) const;
+diff -up xbase-2.0.0/xbase/dbf.cpp.gcc43 xbase-2.0.0/xbase/dbf.cpp
+--- xbase-2.0.0/xbase/dbf.cpp.gcc43	2008-03-11 20:24:01.000000000 +0100
++++ xbase-2.0.0/xbase/dbf.cpp	2008-03-11 20:25:01.000000000 +0100
+@@ -79,6 +79,9 @@
+ 
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++using std::endl;
++
+ /*! \file dbf.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/xbstring.cpp.gcc43 xbase-2.0.0/xbase/xbstring.cpp
+--- xbase-2.0.0/xbase/xbstring.cpp.gcc43	2008-03-11 20:33:00.000000000 +0100
++++ xbase-2.0.0/xbase/xbstring.cpp	2008-03-11 20:33:00.000000000 +0100
+@@ -582,7 +582,7 @@ bool xbString::operator>=( const xbStrin
+ //! Short description.
+ /*!
+ */
+-XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) {
++XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) {
+   return os << xbs.data;
+ }
+ 
+diff -up xbase-2.0.0/xbase/exp.cpp.gcc43 xbase-2.0.0/xbase/exp.cpp
+--- xbase-2.0.0/xbase/exp.cpp.gcc43	2008-03-11 20:23:54.000000000 +0100
++++ xbase-2.0.0/xbase/exp.cpp	2008-03-11 20:24:30.000000000 +0100
+@@ -64,6 +64,8 @@
+ 
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++
+ /*! \file exp.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/html.cpp.gcc43 xbase-2.0.0/xbase/html.cpp
+--- xbase-2.0.0/xbase/html.cpp.gcc43	2008-03-11 20:27:18.000000000 +0100
++++ xbase-2.0.0/xbase/html.cpp	2008-03-11 20:28:56.000000000 +0100
+@@ -68,6 +68,9 @@
+ 
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++using std::endl;
++
+ /*! \file html.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/ntx.cpp.gcc43 xbase-2.0.0/xbase/ntx.cpp
+--- xbase-2.0.0/xbase/ntx.cpp.gcc43	2008-03-11 20:33:48.000000000 +0100
++++ xbase-2.0.0/xbase/ntx.cpp	2008-03-11 20:33:59.000000000 +0100
+@@ -75,6 +75,9 @@
+ 
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++using std::endl;
++
+ /*! \file ntx.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/xbase.cpp.gcc43 xbase-2.0.0/xbase/xbase.cpp
+--- xbase-2.0.0/xbase/xbase.cpp.gcc43	2008-03-11 20:32:08.000000000 +0100
++++ xbase-2.0.0/xbase/xbase.cpp	2008-03-11 20:32:08.000000000 +0100
+@@ -62,6 +62,9 @@
+ 
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++using std::endl;
++
+ /*! \file xbase.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/stack.cpp.gcc43 xbase-2.0.0/xbase/stack.cpp
+--- xbase-2.0.0/xbase/stack.cpp.gcc43	2000-11-10 20:04:17.000000000 +0100
++++ xbase-2.0.0/xbase/stack.cpp	2008-03-11 20:31:16.000000000 +0100
+@@ -59,10 +59,12 @@
+ 
+ #include <string.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include <xbase/xstack.h>
+ 
++using std::cout;
++
+ /*! \file stack.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/ndx.cpp.gcc43 xbase-2.0.0/xbase/ndx.cpp
+--- xbase-2.0.0/xbase/ndx.cpp.gcc43	2001-03-21 01:28:53.000000000 +0100
++++ xbase-2.0.0/xbase/ndx.cpp	2008-03-11 20:21:20.000000000 +0100
+@@ -66,7 +66,9 @@
+ #endif
+ 
+ #include <xbase/xbase.h>
+-#include <iostream.h>
++#include <iostream>
++
++using std::cout; 
+ 
+ #ifdef XB_INDEX_NDX
+ 
+diff -up xbase-2.0.0/xbase/expfunc.cpp.gcc43 xbase-2.0.0/xbase/expfunc.cpp
+--- xbase-2.0.0/xbase/expfunc.cpp.gcc43	2008-03-11 20:26:54.000000000 +0100
++++ xbase-2.0.0/xbase/expfunc.cpp	2008-03-11 20:26:54.000000000 +0100
+@@ -64,6 +64,7 @@
+ #include <xbase/exp.h>
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
+ 
+ /*! \file expfunc.cpp
+ */
+diff -up xbase-2.0.0/xbase/memo.cpp.gcc43 xbase-2.0.0/xbase/memo.cpp
+--- xbase-2.0.0/xbase/memo.cpp.gcc43	2008-03-11 20:30:29.000000000 +0100
++++ xbase-2.0.0/xbase/memo.cpp	2008-03-11 20:30:40.000000000 +0100
+@@ -59,6 +59,8 @@
+ #include <stdio.h>
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++
+ /*! \file memo.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/xbfilter.cpp.gcc43 xbase-2.0.0/xbase/xbfilter.cpp
+--- xbase-2.0.0/xbase/xbfilter.cpp.gcc43	2008-03-11 20:34:21.000000000 +0100
++++ xbase-2.0.0/xbase/xbfilter.cpp	2008-03-11 20:34:25.000000000 +0100
+@@ -60,6 +60,9 @@
+ #include <xbase/xbase.h>
+ #include <xbase/xbexcept.h>
+ 
++using std::cout;
++using std::endl;
++
+ /*! \file xbfilter.cpp
+ */
+ 
+diff -up xbase-2.0.0/xbase/html.h.gcc43 xbase-2.0.0/xbase/html.h
+--- xbase-2.0.0/xbase/html.h.gcc43	2008-03-11 20:25:52.000000000 +0100
++++ xbase-2.0.0/xbase/html.h	2008-03-11 20:26:22.000000000 +0100
+@@ -66,6 +66,8 @@
+ 
+ #include <xbase/xtypes.h>
+ 
++#include <iostream>
++
+ /*! \file html.h
+ */
+ 
+@@ -92,28 +94,28 @@ public:
+    //! Short description.
+    /*!
+    */
+-   void   BoldOff( void ) { cout << "</b>\n"; };
++   void   BoldOff( void ) { std::cout << "</b>\n"; };
+    //! Short description.
+    /*!
+    */
+-   void   BoldOn( void ) { cout << "<b>"; };
++   void   BoldOn( void ) { std::cout << "<b>"; };
+    //! Short description.
+    /*!
+    */
+-   void   Bullet( void ) { cout << "<li>"; };
++   void   Bullet( void ) { std::cout << "<li>"; };
+    void   DumpArray( void );
+    //! Short description.
+    /*!
+    */
+-   void   EmphasizeOff( void ) { cout << "</em>\n"; };
++   void   EmphasizeOff( void ) { std::cout << "</em>\n"; };
+    //! Short description.
+    /*!
+    */
+-   void   EmphasizeOn( void ) { cout << "<em>"; };
++   void   EmphasizeOn( void ) { std::cout << "<em>"; };
+    //! Short description.
+    /*!
+    */
+-   void   EndHtmlPage( void ) { cout << "</BODY>\n</HTML>\n"; }
++   void   EndHtmlPage( void ) { std::cout << "</BODY>\n</HTML>\n"; }
+    xbShort  GenFormFields(xbDbf *d, xbShort Option,const char * Title,xbFieldList *fl);
+    xbShort  GetArrayNo( const char * FieldName );
+    const  char * GetCookie( const char *CookieName );
+@@ -124,47 +126,47 @@ public:
+    //! Short description.
+    /*!
+    */
+-   void   HeaderOff( xbShort i ){ cout << "</h" << i << ">\n"; };
++   void   HeaderOff( xbShort i ){ std::cout << "</h" << i << ">\n"; };
+    //! Short description.
+    /*!
+    */
+-   void   HeaderOn( xbShort i ){ cout << "<h" << i << ">\n"; };
++   void   HeaderOn( xbShort i ){ std::cout << "<h" << i << ">\n"; };
+    //! Short description.
+    /*!
+    */
+-   void   ItalicOff( void ) { cout << "</i>\n"; };
++   void   ItalicOff( void ) { std::cout << "</i>\n"; };
+    //! Short description.
+    /*!
+    */
+-   void   ItalicOn( void ) { cout << "<i>"; };
++   void   ItalicOn( void ) { std::cout << "<i>"; };
+    //! Short description.
+    /*!
+    */
+-   void   NewLine( void ) { cout << "<br>"; }
++   void   NewLine( void ) { std::cout << "<br>"; }
+    xbShort  PostMethod( void );
+    void   PrintEncodedChar( char );
+    void   PrintEncodedString( const char *s );
+    //! Short description.
+    /*!
+    */
+-   void   PrintHtml( char * s ) { cout << s; };
++   void   PrintHtml( char * s ) { std::cout << s; };
+    //! Short description.
+    /*!
+    */
+-   void   PrintHtml( xbLong l ) { cout << l; };
++   void   PrintHtml( xbLong l ) { std::cout << l; };
+    //! Short description.
+    /*!
+    */
+-   void   PrintHtml( xbShort i ) { cout << i; };
++   void   PrintHtml( xbShort i ) { std::cout << i; };
+    //! Short description.
+    /*!
+    */
+-   void   PrintHtml( int i ) { cout << i; };
++   void   PrintHtml( int i ) { std::cout << i; };
+    void   StartHtmlPage( const char *Title );
+    //! Short description.
+    /*!
+    */
+-   void   StartTextPage( void ) { cout << "Content-type: text/plain\n\n"; }
++   void   StartTextPage( void ) { std::cout << "Content-type: text/plain\n\n"; }
+    void   TextOut( const char *String );
+    xbLong   Tally( const char *FileName );
+    xbShort  SetCookie(const char *Name, const char *Value, const char *ExpDate,
+diff -up xbase-2.0.0/xbase/dbf.h.gcc43 xbase-2.0.0/xbase/dbf.h
+--- xbase-2.0.0/xbase/dbf.h.gcc43	2001-01-13 21:20:53.000000000 +0100
++++ xbase-2.0.0/xbase/dbf.h	2008-03-11 20:21:20.000000000 +0100
+@@ -65,7 +65,6 @@
+ #include <xbase/xtypes.h>
+ #include <xbase/xdate.h>
+ 
+-#include <iostream.h>
+ #include <stdio.h>
+ 
+ /*! \file dbf.h
+diff -up xbase-2.0.0/examples/sample1.cpp.gcc43 xbase-2.0.0/examples/sample1.cpp
+--- xbase-2.0.0/examples/sample1.cpp.gcc43	2008-03-11 20:35:01.000000000 +0100
++++ xbase-2.0.0/examples/sample1.cpp	2008-03-11 20:36:40.000000000 +0100
+@@ -47,6 +47,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++
+ /* set the stack large for dos compiles */
+ #ifdef __XBDOS
+ #include <stdio.h>
+diff -up xbase-2.0.0/examples/sample2.cpp.gcc43 xbase-2.0.0/examples/sample2.cpp
+--- xbase-2.0.0/examples/sample2.cpp.gcc43	2008-03-11 20:36:03.000000000 +0100
++++ xbase-2.0.0/examples/sample2.cpp	2008-03-11 20:36:41.000000000 +0100
+@@ -53,6 +53,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++
+ /* set the stack large for dos compiles */
+ #ifdef __XBDOS
+ #include <stdio.h>
+diff -up xbase-2.0.0/examples/sample5.cpp.gcc43 xbase-2.0.0/examples/sample5.cpp
+--- xbase-2.0.0/examples/sample5.cpp.gcc43	2008-03-11 20:36:36.000000000 +0100
++++ xbase-2.0.0/examples/sample5.cpp	2008-03-11 20:36:40.000000000 +0100
+@@ -45,6 +45,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++
+ /* set the stack large for dos compiles */
+ #ifdef __XBDOS
+ #include <stdio.h>
+diff -up xbase-2.0.0/examples/sample4.cpp.gcc43 xbase-2.0.0/examples/sample4.cpp
+--- xbase-2.0.0/examples/sample4.cpp.gcc43	2008-03-11 20:36:25.000000000 +0100
++++ xbase-2.0.0/examples/sample4.cpp	2008-03-11 20:36:47.000000000 +0100
+@@ -51,6 +51,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++
+ #ifdef __XBDOS
+ #include <stdio.h>
+ extern unsigned _stklen = 100000;
+diff -up xbase-2.0.0/examples/exfilter.cpp.gcc43 xbase-2.0.0/examples/exfilter.cpp
+--- xbase-2.0.0/examples/exfilter.cpp.gcc43	2008-03-11 20:37:14.000000000 +0100
++++ xbase-2.0.0/examples/exfilter.cpp	2008-03-11 20:37:28.000000000 +0100
+@@ -50,6 +50,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
+ 
+ int main()
+ {
+diff -up xbase-2.0.0/examples/sample3.cpp.gcc43 xbase-2.0.0/examples/sample3.cpp
+--- xbase-2.0.0/examples/sample3.cpp.gcc43	2008-03-11 20:36:10.000000000 +0100
++++ xbase-2.0.0/examples/sample3.cpp	2008-03-11 20:36:46.000000000 +0100
+@@ -54,6 +54,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ /* set the stack large for dos compiles */
+ #ifdef __XBDOS
+ #include <stdio.h>
+diff -up xbase-2.0.0/bin/undelall.cpp.gcc43 xbase-2.0.0/bin/undelall.cpp
+--- xbase-2.0.0/bin/undelall.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/undelall.cpp	2008-03-11 20:40:33.000000000 +0100
+@@ -45,6 +45,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main(int ac,char** av)
+ {
+     if (ac <= 1) {
+diff -up xbase-2.0.0/bin/checkndx.cpp.gcc43 xbase-2.0.0/bin/checkndx.cpp
+--- xbase-2.0.0/bin/checkndx.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/checkndx.cpp	2008-03-11 20:40:29.000000000 +0100
+@@ -45,6 +45,8 @@
+ 
+ #include "xbase/xbase.h"
+ 
++using std::cout;
++
+ int main(int ac,char** av)
+ {
+ #ifdef XBASE_DEBUG
+diff -up xbase-2.0.0/bin/packdbf.cpp.gcc43 xbase-2.0.0/bin/packdbf.cpp
+--- xbase-2.0.0/bin/packdbf.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/packdbf.cpp	2008-03-11 20:40:32.000000000 +0100
+@@ -46,6 +46,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main(int ac,char** av)
+ {
+     if (ac <= 1) {
+diff -up xbase-2.0.0/bin/zap.cpp.gcc43 xbase-2.0.0/bin/zap.cpp
+--- xbase-2.0.0/bin/zap.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/zap.cpp	2008-03-11 20:40:33.000000000 +0100
+@@ -45,6 +45,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main(int ac,char** av)
+ {
+    if (ac <= 1) {
+diff -up xbase-2.0.0/bin/reindex.cpp.gcc43 xbase-2.0.0/bin/reindex.cpp
+--- xbase-2.0.0/bin/reindex.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/reindex.cpp	2008-03-11 20:40:32.000000000 +0100
+@@ -47,6 +47,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ static void
+ showStatus(xbLong itemNum, xbLong numItems)
+ {
+diff -up xbase-2.0.0/bin/copydbf.cpp.gcc43 xbase-2.0.0/bin/copydbf.cpp
+--- xbase-2.0.0/bin/copydbf.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/copydbf.cpp	2008-03-11 20:40:29.000000000 +0100
+@@ -44,6 +44,8 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++
+ int main(int ac,char** av)
+ {
+    if (3 != ac) {
+diff -up xbase-2.0.0/bin/deletall.cpp.gcc43 xbase-2.0.0/bin/deletall.cpp
+--- xbase-2.0.0/bin/deletall.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/deletall.cpp	2008-03-11 20:40:30.000000000 +0100
+@@ -45,6 +45,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main(int ac,char** av)
+ {
+     if (ac <= 1) {
+diff -up xbase-2.0.0/bin/dumphdr.cpp.gcc43 xbase-2.0.0/bin/dumphdr.cpp
+--- xbase-2.0.0/bin/dumphdr.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/dumphdr.cpp	2008-03-11 20:40:31.000000000 +0100
+@@ -47,6 +47,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main( int ac, char ** av )
+ {
+ #ifdef XBASE_DEBUG
+diff -up xbase-2.0.0/bin/dumprecs.cpp.gcc43 xbase-2.0.0/bin/dumprecs.cpp
+--- xbase-2.0.0/bin/dumprecs.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/dumprecs.cpp	2008-03-11 20:40:31.000000000 +0100
+@@ -52,6 +52,9 @@
+ #include <xbase/xbexcept.h>
+ #endif
+ 
++using std::cout;
++using std::endl;
++
+ int main(int ac,char** av)
+ {
+     if (ac <= 1) {
+diff -up xbase-2.0.0/bin/dumpdbt.cpp.gcc43 xbase-2.0.0/bin/dumpdbt.cpp
+--- xbase-2.0.0/bin/dumpdbt.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/dumpdbt.cpp	2008-03-11 20:40:31.000000000 +0100
+@@ -47,6 +47,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main( int ac, char **av )
+ {
+ #ifdef XB_MEMO_FIELDS
+diff -up xbase-2.0.0/bin/dbfxtrct.cpp.gcc43 xbase-2.0.0/bin/dbfxtrct.cpp
+--- xbase-2.0.0/bin/dbfxtrct.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/dbfxtrct.cpp	2008-03-11 20:40:30.000000000 +0100
+@@ -47,6 +47,9 @@
+ 
+ #include "xbase/xbase.h"
+ 
++using std::cout;
++using std::endl;
++
+ /*************************************************************************/
+ void Usage();
+ void Usage()
+diff -up xbase-2.0.0/bin/dbfutil1.cpp.gcc43 xbase-2.0.0/bin/dbfutil1.cpp
+--- xbase-2.0.0/bin/dbfutil1.cpp.gcc43	2008-03-11 20:39:22.000000000 +0100
++++ xbase-2.0.0/bin/dbfutil1.cpp	2008-03-11 20:41:22.000000000 +0100
+@@ -42,6 +42,10 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::cin;
++using std::endl;
++
+ xbXBase x;
+ xbDbf d( &x );
+ xbIndex *ix;
+diff -up xbase-2.0.0/libtest/indextst.cpp.gcc43 xbase-2.0.0/libtest/indextst.cpp
+--- xbase-2.0.0/libtest/indextst.cpp.gcc43	2008-03-11 20:41:46.000000000 +0100
++++ xbase-2.0.0/libtest/indextst.cpp	2008-03-11 20:42:30.000000000 +0100
+@@ -31,6 +31,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ /* set the stack large for dos compiles */
+ #ifdef __XBDOS
+ #include <stdio.h>
+diff -up xbase-2.0.0/libtest/exptest.cpp.gcc43 xbase-2.0.0/libtest/exptest.cpp
+--- xbase-2.0.0/libtest/exptest.cpp.gcc43	2008-03-11 20:41:46.000000000 +0100
++++ xbase-2.0.0/libtest/exptest.cpp	2008-03-11 20:42:30.000000000 +0100
+@@ -27,6 +27,9 @@
+ 
+ #include "xbase/xbase.h"
+ 
++using std::cout;
++using std::endl;
++
+ class ExpTestor{
+  public:
+   ExpTestor( xbDbf * );
+diff -up xbase-2.0.0/libtest/locktest.cpp.gcc43 xbase-2.0.0/libtest/locktest.cpp
+--- xbase-2.0.0/libtest/locktest.cpp.gcc43	2008-03-11 20:41:46.000000000 +0100
++++ xbase-2.0.0/libtest/locktest.cpp	2008-03-11 20:42:31.000000000 +0100
+@@ -7,6 +7,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main(int, char**)
+ {
+ #if 0 // FIXME - seriously
+diff -up xbase-2.0.0/libtest/testdate.cpp.gcc43 xbase-2.0.0/libtest/testdate.cpp
+--- xbase-2.0.0/libtest/testdate.cpp.gcc43	2008-03-11 20:41:46.000000000 +0100
++++ xbase-2.0.0/libtest/testdate.cpp	2008-03-11 20:42:32.000000000 +0100
+@@ -56,6 +56,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main()
+ {
+    xbString StringDate( "19601007" );      /* oct 7 1960 */
+diff -up xbase-2.0.0/libtest/testhtml.cpp.gcc43 xbase-2.0.0/libtest/testhtml.cpp
+--- xbase-2.0.0/libtest/testhtml.cpp.gcc43	2008-03-11 20:41:46.000000000 +0100
++++ xbase-2.0.0/libtest/testhtml.cpp	2008-03-11 20:42:33.000000000 +0100
+@@ -48,6 +48,9 @@
+ 
+ #include <xbase/xbase.h>
+ 
++using std::cout;
++using std::endl;
++
+ int main()
+ {
+ #ifdef XB_HTML
diff --git a/extra/xbase/gcc47.patch b/extra/xbase/gcc47.patch
new file mode 100644
index 000000000..1b9b19307
--- /dev/null
+++ b/extra/xbase/gcc47.patch
@@ -0,0 +1,11 @@
+--- xbase-2.0.0/bin/dumprecs.cpp~	2012-04-14 15:39:16.524933225 +0000
++++ xbase-2.0.0/bin/dumprecs.cpp	2012-04-14 15:39:59.264599200 +0000
+@@ -77,7 +77,7 @@
+      }
+ 
+      cout << "\nLoop through forwards...\n";
+-     int i = 0;
++     i = 0;
+      while(i<MyFile.NoOfRecords()) {
+        MyFile.DumpRecord(i+1);
+        i++;
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index c4b39d7cb..ebad4ce88 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155978 2012-04-10 15:57:30Z andyrtr $
+# $Id: PKGBUILD 156103 2012-04-14 07:35:46Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.0.902
+pkgver=1.12.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -22,7 +22,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run.1
         10-quirks.conf
 	loongson.patch)
-sha1sums=('75c1ee8d10a2ce6f678deeff23c971e31a212dab'
+sha1sums=('922b963901f4711449b53fb32ce3e14f5b642766'
           '63836e5cfb4ae7353fb2e31239a544409c7ead32'
           '175de5630b43dbc97778adfba5563b7fdd77f11f'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index c75323c8f..5b3d97223 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,10 +12,10 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE
 _basekernel=3.3
-_sublevel=1
+_sublevel=2
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
-pkgrel=1.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5487da14ca81715a469c7594d39722fa'
-         '58799da6f62daf1e54a256d02792b91f'
+         'b43d3bdecfa355bf45bd1154819e3687'
          '559487f3e438ad95f1c80aa11abf2ed0'
          'f3749180b53d042091a483300ef04f8d'
          'a8a3843046926eb7ab81312cd438c5c5'
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 6f0d7a347..861ce1f51 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.3.1-1.1-LIBRE
+KERNEL_VERSION=3.3.2-1-LIBRE
 
 post_install () {
   # updating module dependencies
diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD
index a87c3082a..df4bb9a16 100644
--- a/libre/mariadb/PKGBUILD
+++ b/libre/mariadb/PKGBUILD
@@ -4,23 +4,23 @@
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
-_falsename=mysql
-__falsename=MySQL
+falsename=mysql
+_falsename=MySQL
 pkgbase=mariadb
 _pkgbase=MariaDB
 pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}")
 pkgver=5.5.23
-pkgrel=2
+pkgrel=1.4
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.${pkgbase}.org/"
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgbase}-${pkgver}.tar.gz"
-        "${pkgbase}d"
+        "${falsename}d"
         'my.cnf')
 md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f'
-         '4c491570ec9f2db20b080082119a1714'
+         '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
 build() {
@@ -35,22 +35,22 @@ build() {
   cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc/${pkgbase} \
-    -DMYSQL_DATADIR=/var/lib/${pkgbase} \
-    -DMYSQL_UNIX_ADDR=/var/run/${pkgbase}/${pkgbase}.sock \
+    -DSYSCONFDIR=/etc/${falsename} \
+    -DMYSQL_DATADIR=/var/lib/${falsename} \
+    -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \
     -DDEFAULT_CHARSET=utf8 \
     -DDEFAULT_COLLATION=utf8_general_ci \
     -DENABLED_LOCAL_INFILE=ON \
-    -DINSTALL_INFODIR=share/${pkgbase}/docs \
+    -DINSTALL_INFODIR=share/${falsename}/docs \
     -DINSTALL_MANDIR=share/man \
-    -DINSTALL_PLUGINDIR=/usr/lib/${pkgbase}/plugin \
+    -DINSTALL_PLUGINDIR=/usr/lib/${falsename}/plugin \
     -DINSTALL_SCRIPTDIR=bin \
-    -DINSTALL_INCLUDEDIR=include/${pkgbase} \
-    -DINSTALL_DOCREADMEDIR=share/${pkgbase} \
-    -DINSTALL_SUPPORTFILESDIR=share/${pkgbase} \
-    -DINSTALL_MYSQLSHAREDIR=share/${pkgbase} \
-    -DINSTALL_DOCDIR=share/${pkgbase}/docs \
-    -DINSTALL_SHAREDIR=share/${pkgbase} \
+    -DINSTALL_INCLUDEDIR=include/${falsename} \
+    -DINSTALL_DOCREADMEDIR=share/${falsename} \
+    -DINSTALL_SUPPORTFILESDIR=share/${falsename} \
+    -DINSTALL_MYSQLSHAREDIR=share/${falsename} \
+    -DINSTALL_DOCDIR=share/${falsename}/docs \
+    -DINSTALL_SHAREDIR=share/${falsename} \
     -DWITH_READLINE=ON \
     -DWITH_ZLIB=system \
     -DWITH_SSL=system \
@@ -69,75 +69,72 @@ build() {
 }
 
 package_libmariadbclient(){
-  pkgdesc="${_pkgbase} client libraries (branch of ${__falsename})"
+  pkgdesc="${_pkgbase} client libraries (branch of ${_falsename})"
   depends=('openssl')
-  replaces=("lib${_falsename}client")
-  conflicts=("lib${_falsename}client")
-  provides=("lib${_falsename}client=${pkgver}")
+  conflicts=("lib${falsename}client")
+  provides=("lib${falsename}client=${pkgver}")
   
   cd "${srcdir}"/build
-  for dir in include lib${_falsename} lib${_falsename}d libservices; do
+  for dir in include lib${falsename} lib${falsename}d libservices; do
     make -C ${dir} DESTDIR="${pkgdir}" install
   done
 
   install -d "${pkgdir}"/usr/bin
-  install -m755 scripts/${_falsename}_config "${pkgdir}"/usr/bin/
+  install -m755 scripts/${falsename}_config "${pkgdir}"/usr/bin/
   install -d "${pkgdir}"/usr/share/man/man1
-  for man in ${_falsename}_config ${_falsename}_client_test_embedded ${_falsename}test_embedded; do
+  for man in ${falsename}_config ${falsename}_client_test_embedded ${falsename}test_embedded; do
     install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
   done
 }
 
 package_mariadb-clients(){
-  pkgdesc="${_pkgbase} client tools (branch of ${__falsename})"
+  pkgdesc="${_pkgbase} client tools (branch of ${_falsename})"
   depends=("lib${pkgbase}client")
-  replaces=("${_falsename}-clients")
-  conflicts=("${_falsename}-clients")
-  provides=("${_falsename}-clients=${pkgver}")
+  conflicts=("${falsename}-clients")
+  provides=("${falsename}-clients=${pkgver}")
 
   cd "${srcdir}"/build
   make -C client DESTDIR="${pkgdir}" install
 
   # install man pages
   install -d "${pkgdir}"/usr/share/man/man1
-  for man in ${_falsename} ${_falsename}admin ${_falsename}check ${_falsename}dump ${_falsename}import ${_falsename}show ${_falsename}slap; do
+  for man in ${falsename} ${falsename}admin ${falsename}check ${falsename}dump ${falsename}import ${falsename}show ${falsename}slap; do
     install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
   done
 
   # provided by mariadb
-  rm "${pkgdir}"/usr/bin/{${_falsename}_{plugin,upgrade},${_falsename}binlog,${_falsename}test}
+  rm "${pkgdir}"/usr/bin/{${falsename}_{plugin,upgrade},${falsename}binlog,${falsename}test}
 }
 
 package_mariadb(){
-  pkgdesc="A fast SQL database server branch of ${__falsename} - ${_pkgbase}"
+  pkgdesc="A fast SQL database server branch of ${_falsename} - ${_pkgbase}"
   backup=("etc/${pkgbase}/my.cnf")
-  install=${pkgbase}.install
+  install=${falsename}.install
   depends=("${pkgbase}-clients")
-  optdepends=('perl-dbi' "perl-dbd-${_falsename}")
-  replaces=("${_falsename}")
-  conflicts=("${_falsename}")
-  provides=("${_falsename}=${pkgver}")
+  optdepends=('perl-dbi' "perl-dbd-${falsename}")
+  conflicts=("${falsename}")
+  provides=("${falsename}=${pkgver}")
   options=('emptydirs')
 
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
 
-  install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${pkgbase}/my.cnf
-  install -Dm755 "${srcdir}"/${pkgbase}d "${pkgdir}"/etc/rc.d/${pkgbase}d
+  install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${falsename}/my.cnf
+  install -Dm755 "${srcdir}"/${falsename}d "${pkgdir}"/etc/rc.d/${falsename}d
 
   # provided by libmariadbclient
-  rm "${pkgdir}"/usr/bin/{${_falsename}_config,${_falsename}_client_test_embedded,${_falsename}test_embedded}
-  rm "${pkgdir}"/usr/lib/lib${_falsename}*
+  rm "${pkgdir}"/usr/bin/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}
+  rm "${pkgdir}"/usr/lib/lib${falsename}*
   rm -r "${pkgdir}"/usr/include/
-  rm "${pkgdir}"/usr/share/man/man1/{${_falsename}_config,${_falsename}_client_test_embedded,${_falsename}test_embedded}.1
+  rm "${pkgdir}"/usr/share/man/man1/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}.1
   
   # provided by mariadb-clients
-  rm "${pkgdir}"/usr/bin/{${_falsename},${_falsename}admin,${_falsename}check,${_falsename}dump,${_falsename}import,${_falsename}show,${_falsename}slap}
-  rm "${pkgdir}"/usr/share/man/man1/{${_falsename},${_falsename}admin,${_falsename}check,${_falsename}dump,${_falsename}import,${_falsename}show,${_falsename}slap}.1
+  rm "${pkgdir}"/usr/bin/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}
+  rm "${pkgdir}"/usr/share/man/man1/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}.1
 
   # not needed
-  rm -r "${pkgdir}"/usr/{data,${_falsename}-test,sql-bench}
-  rm "${pkgdir}"/usr/share/man/man1/${_falsename}-test-run.pl.1
+  rm -r "${pkgdir}"/usr/{data,${falsename}-test,sql-bench}
+  rm "${pkgdir}"/usr/share/man/man1/${falsename}-test-run.pl.1
 
-  install -dm700 "${pkgdir}"/var/lib/${pkgbase}
+  install -dm700 "${pkgdir}"/var/lib/${falsename}
 }
diff --git a/libre/mariadb/mysql.install b/libre/mariadb/mysql.install
new file mode 100644
index 000000000..9a4479215
--- /dev/null
+++ b/libre/mariadb/mysql.install
@@ -0,0 +1,26 @@
+post_install(){
+  groupadd -g 89 mysql &>/dev/null
+  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+  usr/bin/mysql_install_db --user=mysql --basedir=/usr
+  chown -R mysql:mysql var/lib/mysql &>/dev/null
+}
+
+post_upgrade(){
+  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+
+  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
+    echo " >> "
+    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
+    echo " >> "
+  fi
+}
+
+post_remove(){
+  if getent passwd mysql >/dev/null 2>&1; then
+    userdel mysql
+  fi
+  if getent group mysql >/dev/null 2>&1; then
+    groupdel mysql
+  fi
+}
diff --git a/libre/mariadb/mysqld b/libre/mariadb/mysqld
new file mode 100644
index 000000000..1ac88a7cc
--- /dev/null
+++ b/libre/mariadb/mysqld
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+getPID() {
+   echo $(pgrep -u mysql mysqld 2>/dev/null);
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting MySQL Server"
+    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
+    if [ -z "$(getPID)" ]; then
+       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        timeo=30
+        while [ $timeo -gt 0 ]; do
+          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
+          echo "$response" | grep -q "mysqld is alive" && break
+          sleep 1
+          let timeo=${timeo}-1
+        done
+        if [ $timeo -eq 0 ]; then
+          stat_fail
+          exit 1
+        else
+          echo $(getPID) > /var/run/mysqld/mysqld.pid
+          add_daemon mysqld
+          stat_done
+        fi
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping MySQL Server"
+    if [ ! -z "$(getPID)" ]; then
+      timeo=30
+      kill $(getPID) &> /dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      fi
+      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
+        sleep 1
+        let timeo=${timeo}-1
+      done
+      if [ -z "$(getPID)" ]; then
+        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
+        rm_daemon mysqld
+        stat_done
+      else
+        stat_fail
+        exit 1
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
new file mode 100644
index 000000000..4d39c9116
--- /dev/null
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -0,0 +1,99 @@
+# $Id: PKGBUILD 153514 2012-03-15 13:26:26Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+
+# With many changes from iceweasel-libre.
+
+# We're getting this from Debian Sid
+_debname=iceweasel
+_debver=11.0
+_debrel=2
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_pkgname=xulrunner
+pkgname=xulrunner-libre
+pkgver=${_debver}.${_debrel}
+pkgrel=1
+pkgdesc="Mozilla Runtime Environment"
+arch=('i686' 'x86_64' 'mips64el')
+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' 'quilt')
+url="http://wiki.mozilla.org/XUL:Xul_Runner"
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
+        mozconfig
+        mozilla-pkgconfig.patch
+        gcc47.patch)
+options=('!emptydirs')
+conflicts=('xulrunner')
+provides=("xulrunner=${_debver}")
+replaces=('xulrunner-oss' 'xulrunner')
+md5sums=('01d9d18909ca9fff2483d8fd779a0f89'
+         '59349da94b095fe0623d09ce75696766'
+         'f407208a750cdc9bea3a6a3a3e42dd89'
+         '6277c508cf24a78c596decae2e568997'
+         '27271ce647a83906ef7a24605e840d61'
+         'aeaf587f7a962ebcc81515e1f1706cd1')
+
+dpkg-source() {
+  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+  export QUILT_PATCHES=debian/patches
+  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+  export QUILT_DIFF_ARGS='--no-timestamps'
+  mv mozilla-release "${_debname}-${_debver}"
+  mv debian "${_debname}-${_debver}"
+  cd "${_debname}-${_debver}"
+
+# Doesn't apply and seems unimportant
+  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
+
+  quilt push -a
+  find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
+  cd ..
+}
+
+build() {
+# Don't run this if we're using -e
+if [ $NOEXTRACT -eq 0 ]; then
+  msg2 "Applying Debian patches..."
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+
+  msg2 "Starting normal build..."
+  mv "${_debname}-${_debver}" "$srcdir/mozilla-release"
+  cd "$srcdir/mozilla-release"
+
+  cp "$srcdir/mozconfig" .mozconfig
+
+  #fix libdir/sdkdir - fedora
+  patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
+  patch -Np1 -i "$srcdir/gcc47.patch"
+fi
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver}"
+  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-${_debver}/dictionaries"
+  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-${_debver}/hyphenation"
+
+  # add xulrunner library path to ld.so.conf
+  install -d $pkgdir/etc/ld.so.conf.d
+  echo "/usr/lib/xulrunner-${_debver}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
+
+  chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpt.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpt.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/header.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/typelib.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpidl.py"
+}
diff --git a/libre/xulrunner-libre/gcc47.patch b/libre/xulrunner-libre/gcc47.patch
new file mode 100644
index 000000000..5bdd36c6f
--- /dev/null
+++ b/libre/xulrunner-libre/gcc47.patch
@@ -0,0 +1,44 @@
+--- mozilla-release.orig/ipc/chromium/src/base/file_util.cc	2012-03-06 14:26:03.000000000 -0200
++++ mozilla-release/ipc/chromium/src/base/file_util.cc		2012-04-04 18:50:02.094431651 -0300
+@@ -8,7 +8,7 @@
+ #include <io.h>
+ #endif
+ #include <stdio.h>
+-#if defined(ANDROID)
++#if defined(ANDROID) || defined(OS_POSIX)
+ #include <unistd.h>
+ #endif
+
+--- mozilla-release.orig/ipc/chromium/src/base/message_pump_libevent.cc	2012-03-06 14:26:03.000000000 -0200
++++ mozilla-release/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-04 19:55:24.140455837 -0300
+@@ -6,6 +6,7 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+
+--- mozilla-release.orig/ipc/chromium/src/base/file_util_linux.cc	2012-03-06 14:26:03.000000000 -0200
++++ mozilla-release/ipc/chromium/src/base/file_util_linux.cc	2012-04-04 20:49:49.756138306 -0300
+@@ -5,6 +5,7 @@
+ #include "base/file_util.h"
+ 
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include <string>
+ #include <vector>
+
+--- mozilla-release.orig/ipc/chromium/src/base/time_posix.cc	2012-03-06 14:26:03.000000000 -0200
++++ mozilla-release/ipc/chromium/src/base/time_posix.cc		2012-04-04 20:55:12.678037291 -0300
+@@ -8,6 +8,7 @@
+ #include <mach/mach_time.h>
+ #endif
+ #include <sys/time.h>
++#include <unistd.h>
+ #ifdef ANDROID
+ #include <time64.h>
+ #else
+
diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig
new file mode 100644
index 000000000..d6cc06648
--- /dev/null
+++ b/libre/xulrunner-libre/mozconfig
@@ -0,0 +1,34 @@
+. $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-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
diff --git a/libre/xulrunner-libre/mozilla-pkgconfig.patch b/libre/xulrunner-libre/mozilla-pkgconfig.patch
new file mode 100644
index 000000000..037d4aee0
--- /dev/null
+++ b/libre/xulrunner-libre/mozilla-pkgconfig.patch
@@ -0,0 +1,40 @@
+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