Thu Mar 14 00:05:23 PDT 2013

26 files changed, 348 insertions, 250 deletions

diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD
index dda533b5b..d0814d595 100644
--- a/extra/autogen/PKGBUILD
+++ b/extra/autogen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157991 2012-04-30 17:51:02Z dan $
+# $Id: PKGBUILD 179949 2013-03-13 11:07:49Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soufly.nl>
 # Contributor: Tor Krill
 
 pkgname=autogen
-pkgver=5.15
+pkgver=5.17.2
 pkgrel=1
 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ depends=('guile' 'libxml2')
 options=('!libtool')
 install=autogen.install
 source=(http://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('5fba3c0e1ec0965061f27e8e79bd6da2'
-         'ed74e586ade1a61f753d391f3849c25b')
+md5sums=('567dd065d24294c5c31517e399c2fcf5'
+         'af72d4d6f27486366e7712c41f61b8fa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 7ee20c4bf..2ed945e90 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178833 2013-02-27 14:34:41Z andrea $
+# $Id: PKGBUILD 179991 2013-03-13 21:33:19Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -17,18 +17,18 @@ pkgname=('calligra-filters'
          'calligra-handbook'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.6.1
-pkgrel=2
+pkgver=2.6.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
 makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
-             'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
+             'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
              'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa' 'vc')
+             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('8ba98f3ccb3c5097eb059d86b51f6139')
+md5sums=('1c2feb12677ee71eb2e428e589b33862')
 
 build() {
   mkdir build
@@ -107,7 +107,7 @@ package_calligra-karbon() {
 package_calligra-kexi() {
   pkgdesc="Develop desktop database applications"
   depends=('calligra-libs' 'glew' 'fftw')
-  optdepends=('libmysqlclient: MySQL driver'
+  optdepends=('libmariadbclient: MariaDB driver'
               'freetds: Sybase & MS SQL driver'
               'xbase: XBase driver'
               'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD
index 9ba5e1e92..3822b8e89 100644
--- a/extra/dbus-glib/PKGBUILD
+++ b/extra/dbus-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162401 2012-06-26 20:15:42Z andyrtr $
+# $Id: PKGBUILD 179955 2013-03-13 11:59:13Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dbus-glib
-pkgver=0.100
+pkgver=0.100.2
 pkgrel=1
 pkgdesc="GLib bindings for DBUS"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d33959a9c0c6a158f5ac6d640316e89e')
+md5sums=('ad0920c7e3aad669163bb59171cf138e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index eea4b775c..bce513ea2 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176001 2013-01-25 17:18:47Z ioni $
+# $Id: PKGBUILD 179957 2013-03-13 12:28:12Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.6.3
+pkgver=3.6.4
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ install=$pkgname.install
 url="http://www.gnome.org"
 license=('GPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('37a0d0d4f6c8515e70e34f1e7e1f457f4c7736f35ba0f18c4b4bca0a17db7de0')
+sha256sums=('50b4ca21bc57d2fe4933ea3072bf11d5e6069d0ecaacced0bd0f55f098d09f4e')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 0b4ed50be..dccdcd330 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176002 2013-01-25 17:24:35Z ioni $
+# $Id: PKGBUILD 179984 2013-03-13 20:18:27Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.6.3
+pkgver=3.6.4
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2c564f3e59cb26663d3e3992c881842815fb8fbc037074475f906030c8c5fd25')
+sha256sums=('7bf7054d85b7d1bd0e62d69f15ef80dbe781f57359bf91e7c427cd93378ba4a1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index 31e7a370f..dfd2e82fd 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170051 2012-10-31 09:24:25Z jgc $
+# $Id: PKGBUILD 179963 2013-03-13 14:27:34Z jgc $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf
-pkgver=3.2.5
-pkgrel=3
+pkgver=3.2.6
+pkgrel=1
 pkgdesc="A configuration database system"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -13,17 +13,11 @@ options=('!libtool')
 install=gconf.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz
-        gconf-dbus-fix-use-after-free.patch
-        gconf-dbus-fix-shutdown.patch
-        gsettings-schema-convert-dont-fail.patch
         gconf-merge-schema
         gconfpkg
         gconf-reload.patch
         01_xml-gettext-domain.patch)
-sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
-            '76c078218e7c3e93691ddd4d7fd9f5c83d4862d0a0406d17b805f3106b50375d'
-            'ddf55a40a260dd00364b32b3200bd8a76e890070ea6267fbfb322907c0946ab2'
-            'be6f084a31229e8edfd6936005c6bb4f2d1548b777df5937923b4702f7a9ac19'
+sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c'
             'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
             'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
             '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
@@ -31,10 +25,6 @@ sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
 
 build() {
   cd "GConf-$pkgver"
-  # Upstream fixes from git
-  patch -Np1 -i "$srcdir/gconf-dbus-fix-shutdown.patch"
-  patch -Np1 -i "$srcdir/gsettings-schema-convert-dont-fail.patch"
-  patch -Np1 -i "$srcdir/gconf-dbus-fix-use-after-free.patch"
 
   # Patch from fedora - reloads gconf after installing schemas
   patch -Np1 -i "$srcdir/gconf-reload.patch"
diff --git a/extra/gconf/gconf-dbus-fix-shutdown.patch b/extra/gconf/gconf-dbus-fix-shutdown.patch
deleted file mode 100644
index b294284b2..000000000
--- a/extra/gconf/gconf-dbus-fix-shutdown.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 39299610083e0e7f9b44e62b7f4e51e89693cf89 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 06 Mar 2012 19:39:06 +0000
-Subject: dbus: fix shutdown
-
-gconftool-2 wasn't properly shutting down gconfd, because
-it was trying to do it before connecting to the daemon.
-
-This commit makes sure that we always first try to connect to
-the daemon before asking it to shutdown.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=671490
----
-diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
-index 442a94b..f167fc5 100644
---- a/gconf/gconf-dbus.c
-+++ b/gconf/gconf-dbus.c
-@@ -2483,7 +2483,13 @@ gconf_shutdown_daemon (GError** err)
- {
-   DBusMessage *message;
- 
--  /* Don't want to spawn it if it's already down */
-+  /* If we haven't reached out to it yet,
-+   * reach out now.
-+   */
-+  if (global_conn == NULL)
-+    gconf_ping_daemon();
-+
-+  /* But we don't want to spawn it if it's already down */
-   if (global_conn == NULL || !service_running)
-     return;
-   
---
-cgit v0.9.0.2
diff --git a/extra/gconf/gconf-dbus-fix-use-after-free.patch b/extra/gconf/gconf-dbus-fix-use-after-free.patch
deleted file mode 100644
index d99b222cc..000000000
--- a/extra/gconf/gconf-dbus-fix-use-after-free.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 84884e9df7ce8c081a1c223c66a799b82545ff1e Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 18 Oct 2012 20:08:02 +0000
-Subject: gconf-dbus: fix use after free
-
-gconf_engine_get_fuller is accessing freed memory.
-The problem is that it's referencing strings that are owned
-by a D-Bus message, and they go away when the D-Bus message is freed.
-
-This commit addresses the problem by duplicating the strings and
-freeing them later.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=667167
----
-diff --git a/gconf/gconf-dbus-utils.c b/gconf/gconf-dbus-utils.c
-index 6fd5bfa..92f5980 100644
---- a/gconf/gconf-dbus-utils.c
-+++ b/gconf/gconf-dbus-utils.c
-@@ -569,11 +569,11 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
- 				   gchar           **schema_name_p)
- {
-   DBusMessageIter  struct_iter;
--  gchar           *key;
-+  const gchar     *key;
-   GConfValue      *value;
-   gboolean         is_default;
-   gboolean         is_writable;
--  gchar           *schema_name;
-+  const gchar     *schema_name;
- 
-   g_return_val_if_fail (dbus_message_iter_get_arg_type (main_iter) == DBUS_TYPE_STRUCT,
- 			FALSE);
-@@ -587,7 +587,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
-   value = utils_get_value (&struct_iter);
- 
-   dbus_message_iter_next (&struct_iter);
--  schema_name = (gchar *) utils_get_optional_string (&struct_iter);
-+  schema_name = utils_get_optional_string (&struct_iter);
- 
-   dbus_message_iter_next (&struct_iter);
-   dbus_message_iter_get_basic (&struct_iter, &is_default);
-@@ -596,7 +596,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
-   dbus_message_iter_get_basic (&struct_iter, &is_writable);
- 
-   if (key_p)
--    *key_p = key;
-+    *key_p = g_strdup (key);
- 
-   if (value_p)
-     *value_p = value;
-@@ -604,7 +604,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
-     gconf_value_free (value);
- 
-   if (schema_name_p)
--    *schema_name_p = schema_name;
-+    *schema_name_p = g_strdup (schema_name);
-   
-   if (is_default_p)
-     *is_default_p = is_default;
-diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
-index f167fc5..5610fcf 100644
---- a/gconf/gconf-dbus.c
-+++ b/gconf/gconf-dbus.c
-@@ -1252,12 +1252,13 @@ gconf_engine_get_fuller (GConfEngine *conf,
-   
-   if (schema_name && schema_name[0] != '/')
-     {
-+      g_free (schema_name);
-       schema_name = NULL;
-     }
-   
-   if (schema_name_p)
--    *schema_name_p = g_strdup (schema_name);
--  
-+    *schema_name_p = schema_name;
-+
-   return val;
- }
- 
-@@ -2402,7 +2403,7 @@ handle_notify (DBusConnection *connection,
- 	       GConfEngine *conf2)
- {
-   GConfEngine *conf;
--  gchar *key, *schema_name;
-+  gchar *key = NULL, *schema_name = NULL;
-   gboolean is_default, is_writable;
-   DBusMessageIter iter;
-   GConfValue *value;
-@@ -2466,6 +2467,8 @@ handle_notify (DBusConnection *connection,
- 
-   if (value)
-     gconf_value_free (value);
-+  g_free (key);
-+  g_free (schema_name);
- 
-   if (!match)
-     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
---
-cgit v0.9.0.2
diff --git a/extra/gconf/gsettings-schema-convert-dont-fail.patch b/extra/gconf/gsettings-schema-convert-dont-fail.patch
deleted file mode 100644
index 92040b343..000000000
--- a/extra/gconf/gsettings-schema-convert-dont-fail.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 02f12f41b031a1c2672e7cf1cb8ebde58288c547 Mon Sep 17 00:00:00 2001
-From: Guido Günther <agx@sigxcpu.org>
-Date: Thu, 23 Feb 2012 20:14:18 +0000
-Subject: gsettings-schema-convert: Don't fail to convert lists without default element
-
----
-diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert
-index a60dc35..913cc83 100755
---- a/gsettings/gsettings-schema-convert
-+++ b/gsettings/gsettings-schema-convert
-@@ -854,11 +854,10 @@ class GConfSchema:
-         # Fix the default value to be parsable by GVariant
-         if self.type == 'list':
-             l = self.default.strip()
--            if not (l[0] == '[' and l[-1] == ']'):
--                if not l:
--                    l = '[]'
--                else:
--                    raise GSettingsSchemaConvertException('Cannot parse default list value \'%s\' for key \'%s\'.' % (self.default, self.applyto or self.key))
-+            if not l:
-+                l = '[]'
-+            elif not (l[0] == '[' and l[-1] == ']'):
-+                raise GSettingsSchemaConvertException('Cannot parse default list value \'%s\' for key \'%s\'.' % (self.default, self.applyto or self.key))
-             values = l[1:-1].strip()
-             if not values:
-                 self.default = '[]'
---
-cgit v0.9.0.2
diff --git a/extra/genius/PKGBUILD b/extra/genius/PKGBUILD
index 38916969c..8c7e38e31 100644
--- a/extra/genius/PKGBUILD
+++ b/extra/genius/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 154806 2012-03-30 18:41:27Z heftig $
+# $Id: PKGBUILD 179965 2013-03-13 14:34:29Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 
 pkgname=genius
-pkgver=1.0.15
+pkgver=1.0.16
 pkgrel=1
 pkgdesc="Advanced calculator including a mathematical programming language"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.jirka.org/genius.html"
-depends=('vte>=0.26.2' 'gtksourceview2>=2.10.5' 'mpfr>=3.0.0' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.0')
+depends=('vte' 'gtksourceview2' 'mpfr' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!makeflags')
 install=genius.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('941e9d09d9f151f3f36ae190bad3c4e2887a552a301dc99af5fd06f8c5c76377')
+sha256sums=('45ce3e0b02c109588ff9a4c74e7c3541b3de89ea93f20ab08178c51c6ab4fb78')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD
index 2e91ef567..1f8343a00 100644
--- a/extra/gnome-nettool/PKGBUILD
+++ b/extra/gnome-nettool/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 169903 2012-10-30 22:34:22Z heftig $
+# $Id: PKGBUILD 179951 2013-03-13 11:42:54Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@nospam.gmail.com>
 
 pkgname=gnome-nettool
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Collection of GNOME3 Networking Tools."
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
+depends=('gtk3' 'libgtop' 'ldns' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
 makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools')
 optdepends=('nmap: Port scanning'
             'net-tools: Network statistics')
 groups=('gnome-extra')
 url="http://www.gnome.org"
 install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        ldns.patch)
+sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79'
+            '8bd83fe863d2945689afd753e5908a2bc033206e25f28d88783ae8d859d6bfeb')
 
 build() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../ldns.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-schemas-compile
   make
diff --git a/extra/gnome-nettool/ldns.patch b/extra/gnome-nettool/ldns.patch
new file mode 100644
index 000000000..318e89777
--- /dev/null
+++ b/extra/gnome-nettool/ldns.patch
@@ -0,0 +1,21 @@
+diff -u -r gnome-nettool-3.2.0/src/lookup.c gnome-nettool-3.2.0-ldns/src/lookup.c
+--- gnome-nettool-3.2.0/src/lookup.c	2012-01-03 10:38:09.000000000 +0100
++++ gnome-nettool-3.2.0-ldns/src/lookup.c	2013-03-13 12:32:31.551213914 +0100
+@@ -98,7 +98,7 @@
+ 
+ 	parent = gtk_widget_get_toplevel (netinfo->output);
+ 	
+-	program = util_find_program_dialog ("dig", parent);
++	program = util_find_program_dialog ("drill", parent);
+ 
+ 	if (program != NULL) {
+ 		use_reverse_lookup = pattern_match (host, address_regular_expression);
+@@ -116,7 +116,7 @@
+ 		command_line = g_new (gchar *, num_terms + 1);
+ 		i = 0;
+ 		command_line[i++] = g_strdup (program);
+-		command_line[i++] = g_strdup ("dig");
++		command_line[i++] = g_strdup ("drill");
+ 		if (command_options != NULL) {
+ 			for (j = 0; command_options[j] != NULL; j++)
+ 				command_line[i++] = g_strdup (command_options[j]);
diff --git a/extra/gnome-sharp/02_fix_pkg-config_paths.patch b/extra/gnome-sharp/02_fix_pkg-config_paths.patch
new file mode 100644
index 000000000..d8e239032
--- /dev/null
+++ b/extra/gnome-sharp/02_fix_pkg-config_paths.patch
@@ -0,0 +1,49 @@
+## 02_fix_pkg-config_paths.dpatch by Mirco Bauer <meebey@debian.org>
+##
+## Modified by Archlinux: removed libdir change
+
+diff -urNad gnome-sharp-2.24.1~/art/art-sharp-2.0.pc.in gnome-sharp-2.24.1/art/art-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/art/art-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/art/art-sharp-2.0.pc.in	2009-03-21 19:03:32.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
+diff -urNad gnome-sharp-2.24.1~/gconf/GConf/gconf-sharp-2.0.pc.in gnome-sharp-2.24.1/gconf/GConf/gconf-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gconf/GConf/gconf-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gconf/GConf/gconf-sharp-2.0.pc.in	2009-03-21 19:03:26.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ 
+diff -urNad gnome-sharp-2.24.1~/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in gnome-sharp-2.24.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in
+--- gnome-sharp-2.24.1~/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in	2009-03-21 19:03:20.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ 
+diff -urNad gnome-sharp-2.24.1~/gnome/gnome-sharp-2.0.pc.in gnome-sharp-2.24.1/gnome/gnome-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gnome/gnome-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gnome/gnome-sharp-2.0.pc.in	2009-03-21 19:03:07.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
+diff -urNad gnome-sharp-2.24.1~/gnomevfs/gnome-vfs-sharp-2.0.pc.in gnome-sharp-2.24.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gnomevfs/gnome-vfs-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in	2009-03-21 19:03:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
diff --git a/extra/gnome-sharp/04_initialize_dbus_glib_threading.patch b/extra/gnome-sharp/04_initialize_dbus_glib_threading.patch
new file mode 100644
index 000000000..a7f841718
--- /dev/null
+++ b/extra/gnome-sharp/04_initialize_dbus_glib_threading.patch
@@ -0,0 +1,51 @@
+From e9d06b56a54dcd399d1d3eaaf62bdacb7e07084d Mon Sep 17 00:00:00 2001
+From: Mirco Bauer <meebey@meebey.net>
+Date: Sat, 2 Mar 2013 13:44:46 +0100
+Subject: [PATCH] Explicitly initialize D-Bus GLib threading
+
+When gconf was switched from orbit to dbus it was no longer thread-safe by
+default. This behavior can only get back by explicitly initializing dbus-glib's
+threads. This issue affects multi-threaded GConf# users like Banshee leading
+them to SEGVs.
+
+For more details see:
+https://bugzilla.gnome.org/show_bug.cgi?id=683830
+---
+ gconf/GConf/Client.cs                 |   11 +++++++++++
+ gconf/GConf/gconf-sharp.dll.config.in |    1 +
+ 2 files changed, 12 insertions(+)
+
+diff --git a/gconf/GConf/Client.cs b/gconf/GConf/Client.cs
+index b8cc881..64efc9f 100644
+--- a/gconf/GConf/Client.cs
++++ b/gconf/GConf/Client.cs
+@@ -31,6 +31,17 @@ namespace GConf
+ 		[DllImport("gconf-2")]
+ 		static extern IntPtr gconf_client_get_default ();
+ 
++		[DllImport("dbus-glib-1")]
++		static extern void dbus_g_thread_init ();
++
++		static Client ()
++		{
++			// HACK: we have to initialize dbus' threading else GConf with its
++			// dbus backend will not be thread safe and SEGVs in our face, see:
++			// https://bugzilla.gnome.org/show_bug.cgi?id=683830
++			dbus_g_thread_init();
++		}
++
+ 		public Client ()
+ 		{
+ 			Initialize ();
+diff --git a/gconf/GConf/gconf-sharp.dll.config.in b/gconf/GConf/gconf-sharp.dll.config.in
+index 9fb7d15..f20ddae 100644
+--- a/gconf/GConf/gconf-sharp.dll.config.in
++++ b/gconf/GConf/gconf-sharp.dll.config.in
+@@ -1,3 +1,4 @@
+ <configuration>
+   <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
++  <dllmap dll="dbus-glib-1" target="libdbus-glib-1@LIB_PREFIX@.2@LIB_SUFFIX@"/>
+ </configuration>
+-- 
+1.7.10.4
+
diff --git a/extra/gnome-sharp/PKGBUILD b/extra/gnome-sharp/PKGBUILD
index 33518bbfe..988ecf5da 100644
--- a/extra/gnome-sharp/PKGBUILD
+++ b/extra/gnome-sharp/PKGBUILD
@@ -1,17 +1,21 @@
-# $Id: PKGBUILD 148756 2012-02-05 11:49:19Z ibiru $
+# $Id: PKGBUILD 179961 2013-03-13 13:55:50Z jgc $
 # Maintainer: tobias <tobias@archlinux.org>
 
 pkgbase=gnome-sharp
 pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
 pkgver=2.24.2
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
 makedepends=('gtk-sharp-2' 'libgnomeui' 'monodoc')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('3b38f53960c736d4afb8f04204efe98b')
+source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2
+        02_fix_pkg-config_paths.patch
+        04_initialize_dbus_glib_threading.patch)
+md5sums=('3b38f53960c736d4afb8f04204efe98b'
+         'a8c1bf57a384f5fc20a5890f9f1cef5a'
+         '90cd7ea88aaa3011522376153433d115')
 
 build() {
   # get rid of that .wapi errors; thanks to brice
@@ -19,6 +23,8 @@ build() {
   mkdir -p "${MONO_SHARED_DIR}"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
+  patch -Np1 -i ../04_initialize_dbus_glib_threading.patch
+  patch -Np1 -i ../02_fix_pkg-config_paths.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index eda21bb8a..c25f8186b 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169916 2012-10-30 22:34:57Z heftig $
+# $Id: PKGBUILD 179947 2013-03-13 11:01:23Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.6.0
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5ee068ca7f4d0e410aabbddee3937559138163d84c00e5bef1e9050beb7409cd')
+sha256sums=('c6816f77eaae791dadeef89596df811e2fa353088241aa0613bb8e1af63304f6')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index 97721c542..cf6214957 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,32 +1,40 @@
-# $Id: PKGBUILD 173830 2012-12-24 16:09:54Z jgc $
+# $Id: PKGBUILD 179971 2013-03-13 16:25:37Z jgc $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.12.0
+pkgver=1.12.1
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
 depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils')
+makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils' 'gobject-introspection')
 optdepends=('python2-gobject: for python plugin support'
             'perl: for perl plugin support'
             'psiconv: for Psion 5 file support'
             'yelp: for viewing the help manual')
 install=gnumeric.install
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        gnumeric-1.12.1-automake-1.13.patch
+        revert-warnings.patch)
+sha256sums=('0f5a7af3acae7db643eb00e8b4fca6a9e90162259c6a73e4214cfa8c96cc3901'
+            '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275'
+            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../gnumeric-1.12.1-automake-1.13.patch
+  patch -Np0 -i ../revert-warnings.patch
+
   # Remove invalid mime type. (FS#26338)
   sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in
 
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --enable-ssindex --disable-schemas-compile
+    --enable-ssindex --disable-schemas-compile --enable-introspection --enable-compile-warnings=no
   make
 }
 
diff --git a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch b/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch
new file mode 100644
index 000000000..1ae1fb955
--- /dev/null
+++ b/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch
@@ -0,0 +1,104 @@
+diff -up gnumeric-1.12.0/test/Makefile.am.automake-1_13 gnumeric-1.12.0/test/Makefile.am
+--- gnumeric-1.12.0/test/Makefile.am.automake-1_13	2011-05-18 02:54:24.000000000 +0200
++++ gnumeric-1.12.0/test/Makefile.am	2013-01-05 18:25:56.380686587 +0100
+@@ -25,7 +25,99 @@
+ #
+ # 90xx: Misc stuff.
+ 
+-TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl))
++TESTS = \
++t1000-statfuns.pl \
++t1001-mathfuns.pl \
++t1002-finfuns.pl \
++t1003-engfuns.pl \
++t1004-textfuns.pl \
++t1005-logfuns.pl \
++t1006-datefuns.pl \
++t1007-dbfuns.pl \
++t1008-infofuns.pl \
++t1009-lookfuns.pl \
++t1010-bitwise.pl \
++t1011-yalta2008.pl \
++t1100-chitest.pl \
++t1101-ftest.pl \
++t1102-ttest.pl \
++t1103-sumif.pl \
++t1104-linest.pl \
++t1800-operators.pl \
++t1900-array.pl \
++t1901-regress.pl \
++t1902-array-intersection.pl \
++t2000-names-insdel.pl \
++t2001-func-help.pl \
++t2002-nonascii-numbers.pl \
++t2003-random-generators.pl \
++t2800-style-optimizer.pl \
++t5900-sc.pl \
++t5901-qpro.pl \
++t5902-applix.pl \
++t5903-sylk.pl \
++t5904-mps.pl \
++t6000-statfuns.pl \
++t6001-mathfuns.pl \
++t6002-objs.pl \
++t6003-lookfuns.pl \
++t6004-chart-tests.pl \
++t6004-finfuns.pl \
++t6100-statfuns-ods.pl \
++t6101-mathfuns-ods.pl \
++t6102-objs-ods.pl \
++t6103-lookfuns-ods.pl \
++t6104-finfuns-ods.pl \
++t7000-goal-seek.pl \
++t7100-solver-blend.pl \
++t7101-solver-afiro.pl \
++t7110-solver-Misra1a.pl \
++t7111-solver-Chwirut2.pl \
++t7112-solver-Chwirut1.pl \
++t7113-solver-Lanczos3.pl \
++t7114-solver-Gauss1.pl \
++t7115-solver-Gauss2.pl \
++t7116-solver-DanWood.pl \
++t7117-solver-Misra1b.pl \
++t7120-solver-Kirby2.pl \
++t7121-solver-Hahn1.pl \
++t7122-solver-Nelson.pl \
++t7123-solver-MGH17.pl \
++t7124-solver-Lanczos1.pl \
++t7125-solver-Lanczos2.pl \
++t7126-solver-Gauss3.pl \
++t7127-solver-Misra1c.pl \
++t7128-solver-Misra1d.pl \
++t7129-solver-Roszman1.pl \
++t7130-solver-ENSO.pl \
++t7140-solver-MGH09.pl \
++t7141-solver-Thurber.pl \
++t7142-solver-BoxBOD.pl \
++t7143-solver-Rat42.pl \
++t7144-solver-MGH10.pl \
++t7145-solver-Eckerle4.pl \
++t7146-solver-Rat43.pl \
++t7147-solver-Bennett5.pl \
++t8000-valgrind.pl \
++t8001-valgrind-xls.pl \
++t8002-valgrind-gnumeric.pl \
++t8003-valgrind-pdf.pl \
++t8004-valgrind-xls-macro.pl \
++t8005-valgrind-chart-fit.pl \
++t8050-valgrind-sstest.pl \
++t8100-null-false.pl \
++t8101-gfree.pl \
++t8102-glade-visible.pl \
++t8103-gtk.pl \
++t8104-glade-parsing.pl \
++t8200-gslice1.pl \
++t8201-gslice2.pl \
++t8202-gslice3.pl \
++t9000-ssindex.pl \
++t9100-number-match.pl \
++t9999-epilogue.pl
++
++
+ SUPPS = common.supp gui.supp t8003-valgrind-pdf.supp
+ 
+ import-db:
diff --git a/extra/gnumeric/revert-warnings.patch b/extra/gnumeric/revert-warnings.patch
new file mode 100644
index 000000000..bf9df5dd7
--- /dev/null
+++ b/extra/gnumeric/revert-warnings.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2013-03-13 16:09:02.355422066 +0000
++++ configure.ac	2013-03-13 16:09:26.701917153 +0000
+@@ -269,8 +269,6 @@
+ 			 -Wchar-subscripts -Wwrite-strings \
+ 			 -Wdeclaration-after-statement -Wnested-externs \
+ 			 -Wmissing-noreturn \
+-			 -Werror=missing-prototypes -Werror=nested-externs \
+-			 -Werror=implicit-function-declaration \
+ 			 -Wmissing-declarations -Wno-pointer-sign \
+ 			 -Werror=format-security -Wbitwise -Wcast-to-as \
+ 			 -Wdefault-bitfield-sign -Wdo-while -Wparen-string \
diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD
index 835e9bf90..cdd1f57e6 100644
--- a/extra/goffice/PKGBUILD
+++ b/extra/goffice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173831 2012-12-24 16:09:55Z jgc $
+# $Id: PKGBUILD 179967 2013-03-13 14:50:17Z jgc $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=goffice
-pkgver=0.10.0
+pkgver=0.10.1
 pkgrel=1
 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ options=('!libtool')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection')
 depends=('librsvg' 'gtk3' 'libgsf' 'libspectre')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439')
+sha256sums=('5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index 4f5db3a9c..a892a6114 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173131 2012-12-11 14:42:20Z jgc $
+# $Id: PKGBUILD 179980 2013-03-13 20:13:10Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 pkgname=gphoto2
-pkgver=2.5.0
+pkgver=2.5.1
 pkgrel=1
 pkgdesc="A digital camera download and access program."
 arch=(i686 x86_64)
@@ -11,6 +11,7 @@ url="http://www.gphoto.org"
 license=('GPL' 'LGPL')
 depends=('libgphoto2' 'popt' 'readline')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('03cda6d5b7c647ac4c90d0081f2cb7c7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,4 +23,3 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('64c6d291c5bd50388af0c51da71efb59')
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 527036737..1a6ff1011 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,14 +1,15 @@
-#$Id: PKGBUILD 169951 2012-10-30 22:46:41Z heftig $
+#$Id: PKGBUILD 179959 2013-03-13 13:10:14Z jgc $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 depends=('dbus-core' 'glib2' 'libgcrypt')
 makedepends=('intltool' 'gobject-introspection')
+optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD
index eaf184a4a..f419a2f9e 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173128 2012-12-11 14:42:12Z jgc $
+# $Id: PKGBUILD 179978 2013-03-13 20:08:25Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=libgphoto2
-pkgver=2.5.0
+pkgver=2.5.1
 pkgrel=1
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb')
 install=libgphoto2.install
 options=('libtool')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ea9b3b07a3738c0a77958d6fe13ae524')
+md5sums=('92780eb4baf7b512b86b5e7300ec91a5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index 6dbf141c0..5207bbb34 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169025 2012-10-17 10:20:51Z allan $
+# $Id: PKGBUILD 179941 2013-03-13 02:09:45Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
@@ -6,29 +6,28 @@
 pkgbase=python-numpy
 pkgname=('python2-numpy' 'python-numpy')
 pkgver=1.7.0
-_pkgver=1.7.0b2
-pkgrel=1
+pkgrel=2
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64')
 license=('custom')
-url="http://numpy.scipy.org/"
+url="http://www.numpy.org/"
 makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
-source=(http://downloads.sourceforge.net/numpy/numpy-${_pkgver}.tar.gz)
-md5sums=('1b62cf0e34e2db58b0241b00d603df24')
+source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
+md5sums=('4fa54e40b6a243416f0248123b6ec332')
 
 build() {
   cd "${srcdir}"
-  cp -a numpy-${_pkgver} numpy-py2-${_pkgver}
+  cp -a numpy-${pkgver} numpy-py2-${pkgver}
 
-  export Atlas=None
+  export ATLAS=None
   export LDFLAGS="$LDFLAGS -shared"
 
   echo "Building Python2"
-  cd "${srcdir}/numpy-py2-${_pkgver}"
+  cd "${srcdir}/numpy-py2-${pkgver}"
   python2 setup.py config_fc --fcompiler=gnu95 build
 
   echo "Building Python3"
-  cd "${srcdir}/numpy-${_pkgver}"
+  cd "${srcdir}/numpy-${pkgver}"
   python setup.py config_fc --fcompiler=gnu95 build
 }
 
@@ -36,7 +35,12 @@ package_python2-numpy() {
   depends=('lapack' 'python2')
   optdepends=('python-nose: testsuite')
 
-  cd "${srcdir}/numpy-py2-${_pkgver}"
+  _pyver=2.7
+
+  export ATLAS=None
+  export LDFLAGS="$LDFLAGS -shared"
+
+  cd "${srcdir}/numpy-py2-${pkgver}"
   python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
 
   install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
@@ -46,6 +50,9 @@ package_python2-numpy() {
          -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
          -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
              $(find ${pkgdir} -name '*.py')
+
+  install -m755 -d "${pkgdir}/usr/include/python${_pyver}"
+  ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy"
 }
 
 package_python-numpy() {
@@ -54,9 +61,17 @@ package_python-numpy() {
   replaces=('python3-numpy')
   conflicts=('python3-numpy')
 
-  cd "${srcdir}/numpy-${_pkgver}"
+  _pyver=3.3
+
+  export ATLAS=None
+  export LDFLAGS="$LDFLAGS -shared"
+
+  cd "${srcdir}/numpy-${pkgver}"
   python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"
-  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/python-numpy"
+  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-numpy/"
+
+  install -m755 -d "${pkgdir}/usr/include/python${_pyver}"
+  ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy"
 }
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index ba448576f..70a829815 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175827 2013-01-22 09:52:02Z foutrelis $
+# $Id: PKGBUILD 179969 2013-03-13 15:12:30Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
@@ -7,12 +7,12 @@
 
 pkgname=slim
 pkgver=1.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop-independent graphical login manager for X11"
 arch=('i686' 'x86_64')
 url="http://slim.berlios.de/"
 license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'xorg-xauth')
 makedepends=('cmake' 'freeglut')
 backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
 source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
@@ -34,7 +34,7 @@ build() {
     -DCMAKE_SKIP_RPATH=ON \
     -DUSE_PAM=yes \
     -DUSE_CONSOLEKIT=no
-	make
+  make
 }
 
 package() {
diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD
index 23934a11a..3210aac2c 100644
--- a/extra/xchm/PKGBUILD
+++ b/extra/xchm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166331 2012-09-06 15:41:21Z giovanni $
+# $Id: PKGBUILD 179976 2013-03-13 18:06:41Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=xchm
-pkgver=1.21
+pkgver=1.22
 pkgrel=1
 pkgdesc="A cross-platform GUI front-end to chmlib"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ install=xchm.install
 source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
         'xchm.desktop'
         'xchm.xml')
-md5sums=('9bfe439ce94554ebae95d84f7a1db8e7'
+md5sums=('3856ec4e6e54a80d0811707975fc8995'
          '31fb9692b9ee9f2a205f58b9ff4bc4fe'
          '4102b0a393f5c60236143cc034664dd0')