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

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

2 files changed, 53 insertions, 7 deletions

diff --git a/extra/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch b/extra/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch
new file mode 100644
index 000000000..5352688a2
--- /dev/null
+++ b/extra/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch
@@ -0,0 +1,40 @@
+From 715c6ddf3de90936c9ba7a6bb6904b7072d3b241 Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru@archlinux.org>
+Date: Fri, 30 Sep 2011 10:57:14 +0000
+Subject: [PATCH] Avoid use of deprecated G_CONST_RETURN
+
+Signed-off-by: Ionut Biru <ibiru@archlinux.org>
+---
+ libepc/enums.c.in |    2 +-
+ libepc/enums.h.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libepc/enums.c.in b/libepc/enums.c.in
+index 75f737c..bc81b84 100644
+--- a/libepc/enums.c.in
++++ b/libepc/enums.c.in
+@@ -65,7 +65,7 @@ G@Type@Class*
+  *
+  * Returns: The string representation of @value, or %NULL.
+  */
+-G_CONST_RETURN gchar*
++const gchar*
+ @enum_name@_to_string (@EnumName@ value)
+ {
+   const G@Type@Value *@type@_value = g_@type@_get_value (@enum_name@_get_class (), value);
+diff --git a/libepc/enums.h.in b/libepc/enums.h.in
+index fea8b07..48973e5 100644
+--- a/libepc/enums.h.in
++++ b/libepc/enums.h.in
+@@ -19,7 +19,7 @@ G_BEGIN_DECLS
+ 
+ GType                 @enum_name@_get_type  (void) G_GNUC_CONST;
+ G@Type@Class*           @enum_name@_get_class (void) G_GNUC_CONST;
+-G_CONST_RETURN gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE;
++const gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE;
+ /*** END value-header ***/
+ 
+ /*** BEGIN file-tail ***/
+-- 
+1.7.6.4
+
diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD
index 2aab6c6fc..2ad391d40 100644
--- a/extra/libepc/PKGBUILD
+++ b/extra/libepc/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 135788 2011-08-18 15:04:18Z andyrtr $
+# $Id: PKGBUILD 139209 2011-10-01 18:55:29Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libepc
-pkgver=0.3.11
-pkgrel=2
+pkgver=0.4.1
+pkgrel=1
 pkgdesc="Easy Publish and Consume Library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://live.gnome.org/libepc"
-depends=('gtk2' 'avahi' 'libsoup')
-makedepends=('intltool')
+depends=('gtk3' 'avahi' 'libsoup')
+makedepends=('intltool' 'gtk-doc' 'gnome-common')
 options=('!libtool' '!makeflags')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz
+        0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch)
+sha256sums=('1377defd339122a5ef71509d3b761810c58f178985d655b74bc34760ef4ae49e'
+            'd2bcfd72abc4cd74975a70c667c38d88154117d1eef10a8e8b75bc07cb1dde06')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch"
+  gnome-autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
@@ -25,3 +29,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
+
+