Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/mingw32-binutils/PKGBUILD
	community/numlockx/PKGBUILD
	community/slock/PKGBUILD
	extra/graphviz/PKGBUILD

12 files changed, 171 insertions, 45 deletions

diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD
index 2e1094690..7c22b9d5d 100644
--- a/extra/epiphany-extensions/PKGBUILD
+++ b/extra/epiphany-extensions/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 140164 2011-10-08 07:58:37Z ibiru $
+# $Id: PKGBUILD 142997 2011-11-20 09:46:20Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany-extensions
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 url="http://www.gnome.org/projects/epiphany/"
 pkgdesc="Various extentions for the Epiphany web browser"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('epiphany' 'opensp' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool')
+makedepends=('gnome-doc-utils' 'intltool' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=epiphany-extensions.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        rss-link-dbus-glib.patch)
+sha256sums=('0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae'
+            '6e1ba177e8480984b4c5447aca5e7cf8bcfacbb90bcf041fa1b6d2a4dc3e818b')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/rss-link-dbus-glib.patch"
+  autoreconf -fi
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
@@ -25,6 +30,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/epiphany-extensions/rss-link-dbus-glib.patch b/extra/epiphany-extensions/rss-link-dbus-glib.patch
new file mode 100644
index 000000000..1737c49ea
--- /dev/null
+++ b/extra/epiphany-extensions/rss-link-dbus-glib.patch
@@ -0,0 +1,29 @@
+From 2066084961b77810477b658cabbb7f6e90a17b94 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 19 Nov 2011 01:01:12 -0500
+Subject: [PATCH] rss: add DBUS_LIBS to librssextension_la_LIBADD
+
+Otherwise, epiphany-3.2 crashes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=664369
+---
+ extensions/rss/Makefile.am |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/extensions/rss/Makefile.am b/extensions/rss/Makefile.am
+index ed6962f..da669c8 100644
+--- a/extensions/rss/Makefile.am
++++ b/extensions/rss/Makefile.am
+@@ -25,6 +25,9 @@ librssextension_la_LDFLAGS = \
+ 	-export-symbols $(top_srcdir)/ephy-extension.symbols \
+ 	$(AM_LDFLAGS)
+ 
++librssextension_la_LIBADD = \
++	$(DBUS_LIBS)
++
+ uidir = $(pkgdatadir)/ui
+ ui_DATA = rss-ui.ui
+ 
+-- 
+1.7.8.rc3
+
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index 97f181e2a..d284831b3 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 135708 2011-08-18 01:12:48Z eric $
+# $Id: PKGBUILD 143020 2011-11-21 02:06:36Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
-pkgver=2.3.0
+pkgver=2.3.1
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeciv.org/"
 license=('GPL')
-depends=('gtk2' 'sdl_mixer' 'bzip2' 'hicolor-icon-theme')
+depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme')
 options=('!libtool')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('70fd4285f2da7d41bdadac43458e62c9')
-sha1sums=('d4e871ad749e1807957df4e353fbb8f5510b7248')
+sha1sums=('9d9ee9f48f4c945fc6525139d340443d5a25aac4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ggz-gtk-client/PKGBUILD b/extra/ggz-gtk-client/PKGBUILD
new file mode 100644
index 000000000..4f886abb8
--- /dev/null
+++ b/extra/ggz-gtk-client/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 143018 2011-11-21 01:24:00Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor: dazzy
+
+pkgname=ggz-gtk-client
+pkgver=0.0.14.1
+pkgrel=5
+pkgdesc="GGZ Gaming Zone GTK+ client"
+arch=('i686' 'x86_64')
+url="http://www.ggzgamingzone.org/"
+license=('GPL')
+depends=('gtk2' 'ggz-client-libs')
+options=('!libtool')
+source=(http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/ggz-gtk-client-${pkgver}.tar.gz
+	gtk2.patch)
+md5sums=('87f67ff01f867bd04ba894a7c6a9f7fc'
+         '368f993d07befd41681ac76ef532b448')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/gtk2.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/ggz-gtk-client/gtk2.patch b/extra/ggz-gtk-client/gtk2.patch
new file mode 100644
index 000000000..b8332f401
--- /dev/null
+++ b/extra/ggz-gtk-client/gtk2.patch
@@ -0,0 +1,40 @@
+--- ggz-gtk-client-0.0.14.1/ggz-gtk/props.c	2008-01-05 20:03:36.000000000 +0100
++++ ggz-gtk-client-0.0.14.1.PATCHED/ggz-gtk/props.c	2010-08-04 01:53:37.573425091 +0200
+@@ -1203,7 +1203,7 @@
+   gtk_box_pack_start (GTK_BOX (vbox9), color_table, TRUE, TRUE, 0);
+   gtk_container_set_border_width (GTK_CONTAINER (color_table), 3);
+ 
+-  h_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1);
++  h_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0);
+   h_spin = gtk_spin_button_new (GTK_ADJUSTMENT (h_spin_adj), 1, 0);
+   gtk_widget_ref (h_spin);
+   g_object_set_data_full(G_OBJECT (dlg_props), "h_spin", h_spin,
+@@ -1213,7 +1213,7 @@
+                     (GtkAttachOptions) (0), 0, 0);
+   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (h_spin), TRUE);
+ 
+-  n_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1);
++  n_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0);
+   n_spin = gtk_spin_button_new (GTK_ADJUSTMENT (n_spin_adj), 1, 0);
+   gtk_widget_ref (n_spin);
+   g_object_set_data_full(G_OBJECT (dlg_props), "n_spin", n_spin,
+@@ -1223,7 +1223,7 @@
+                     (GtkAttachOptions) (0), 0, 0);
+   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (n_spin), TRUE);
+ 
+-  f_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1);
++  f_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0);
+   f_spin = gtk_spin_button_new (GTK_ADJUSTMENT (f_spin_adj), 1, 0);
+   gtk_widget_ref (f_spin);
+   g_object_set_data_full(G_OBJECT (dlg_props), "f_spin", f_spin,
+--- ggz-gtk-client-0.0.14.1/ggz-gtk/xtext.c	2008-01-05 20:03:36.000000000 +0100
++++ ggz-gtk-client-0.0.14.1.PATCHED/ggz-gtk/xtext.c	2010-08-04 01:52:36.446764446 +0200
+@@ -720,7 +720,7 @@
+ 	xtext->overdraw = FALSE;
+ 	xtext->tint_red = xtext->tint_green = xtext->tint_blue = TINT_VALUE;
+ 
+-	xtext->adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 1, 1, 1, 1);
++	xtext->adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 1, 1, 1, 0);
+ 	g_object_ref (G_OBJECT (xtext->adj));
+ 	gtk_object_sink ((GtkObject *) xtext->adj);
+ 
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 82955938d..77c52b0f7 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142406 2011-11-09 04:33:51Z dan $
+# $Id: PKGBUILD 143010 2011-11-20 20:58:22Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.7.3
+pkgver=1.7.7.4
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -80,11 +80,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-md5sums=('da2b3c226d8e99d8f66e708129f57a0a'
-         'f801b4c7b2c9dea7c0ff969f4acaa12c'
-         '8e2648910fd5dd4f1c41d3c7fa9e9156'
-         '2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('dc9d773004cdae17453e330a02de630a1beeeb404d0601b9e8c1aef0a0efd100'
-            '62bec01d704d3495fcf66a3b97a8fb7c337a06202784fa7a7fa510360e79671f'
-            '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
-            'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
+sha1sums=('5b6920989480a37ec65977e756b24961578795dd'
+          'cb21e55ae793865453c165a0e666348f2db8c740'
+          'f2b41828bd912b72e2cb3e14677739c4f370de66'
+          '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 2af2c4c62..07deaf13d 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 129245 2011-06-26 09:32:03Z bisson $
+# $Id: PKGBUILD 143016 2011-11-21 00:00:02Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.28.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('gd' 'librsvg' 'libxaw' 'ghostscript' 'pango')
+depends=('gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
 makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt')
 optdepends=('mono: sharp bindings'
             'guile: guile bindings'
diff --git a/extra/gts/PKGBUILD b/extra/gts/PKGBUILD
new file mode 100644
index 000000000..57d38d906
--- /dev/null
+++ b/extra/gts/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 143014 2011-11-20 23:59:13Z bisson $
+
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Thomas Dziedzic <gostrc at gmail>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+
+pkgname=gts
+pkgver=0.7.6
+pkgrel=2
+pkgdesc='Provides useful functions to deal with 3D surfaces meshed with interconnected triangles'
+url='http://gts.sourceforge.net/'
+license=('LGPL')
+arch=('i686' 'x86_64')
+depends=('glib2')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('000720bebecf0b153eb28260bd30fbd979dcc040')
+options=('!libtool')
+
+build() {
+	cd "${pkgname}-${pkgver}"
+	./configure --prefix=/usr --disable-static
+	make
+}
+
+package() {
+	cd "${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 7fdf2f8a4..9de106e09 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141744 2011-11-02 18:12:04Z andrea $
+# $Id: PKGBUILD 143000 2011-11-20 11:13:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -14,8 +14,7 @@ depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
         'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
         'docbook-xsl')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
-        'hspell')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index 53b0aed9f..145f1465c 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141224 2011-10-26 20:11:17Z heftig $
+# $Id: PKGBUILD 143012 2011-11-20 22:59:47Z heftig $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libgda
-pkgver=5.0.0
+pkgver=5.0.2
 pkgrel=1
 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
 arch=(i686 x86_64 'mips64el')
@@ -12,12 +12,12 @@ depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
          'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
          'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2'
          'iso-codes' 'openssl' 'libgcrypt' 'libldap')
-makedepends=('intltool' 'gobject-introspection' 'openjdk6' 'gtk-doc')
+makedepends=('intltool' 'gobject-introspection' 'openjdk6' 'gtk-doc' 'vala')
 options=('!libtool')
 url="http://www.gnome-db.org"
 install=libgda.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b8f14505d8e921b97b20a0ff99e10c611bd57c317b0f081e7f76bc2c87ae1fea')
+sha256sums=('53e710a76298a224546803ecee711e610c68cf6938bd908e6d7e3c9bab183593')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index c86beeb4a..af7957d73 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 138186 2011-09-18 09:16:04Z heftig $
+# $Id: PKGBUILD 142993 2011-11-20 08:43:27Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=p11-kit
-pkgver=0.6
-pkgrel=2
+pkgver=0.9
+pkgrel=1
 pkgdesc="Library to work with PKCS#11 modules"
 arch=(i686 x86_64 mips64el)
 url="http://p11-glue.freedesktop.org"
@@ -11,7 +11,7 @@ license=('BSD')
 depends=(glibc)
 options=(!libtool)
 source=($url/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('c1ff3e52f172fda8bf3b426f7fb63c92')
+md5sums=('029aa2a3a103e7eb81b4aa731b93539e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD
index 375333cc0..047c970fd 100644
--- a/extra/telepathy-qt4/PKGBUILD
+++ b/extra/telepathy-qt4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140179 2011-10-08 12:12:17Z ibiru $
+# $Id: PKGBUILD 142995 2011-11-20 09:11:34Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-qt4
-pkgver=0.7.3
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,20 +12,20 @@ license=('LGPL')
 options=('!libtool')
 depends=('qt' 'telepathy-farsight')
 makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
-source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a8e4f9f996b074a4e9a8950ddb5240d7')
+source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('b93f03f063d784855d83e1b3c79a1cc5')
 
 build() {
-    cd "${srcdir}"
+    cd "$srcdir"
     mkdir build
     cd build
-    cmake ../${pkgname}-${pkgver} \
+    cmake ../$pkgname-$pkgver \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr
     make
 }
 
 package() {
-    cd "${srcdir}"/build
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir"/build
+    make DESTDIR="$pkgdir" install
 }