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

Conflicts:
	community/flashrom/PKGBUILD
	extra/chmlib/PKGBUILD
	extra/crypto++/PKGBUILD
	extra/dvgrab/PKGBUILD
	extra/ebook-tools/PKGBUILD
	extra/fping/PKGBUILD
	extra/garcon/PKGBUILD
	extra/gpart/PKGBUILD
	extra/gtk2-perl/PKGBUILD
	extra/hd2u/PKGBUILD
	extra/hexedit/PKGBUILD

2 files changed, 65 insertions, 4 deletions

diff --git a/extra/gamin/PKGBUILD b/extra/gamin/PKGBUILD
index b811faa3a..9de513ac9 100644
--- a/extra/gamin/PKGBUILD
+++ b/extra/gamin/PKGBUILD
@@ -1,11 +1,12 @@
 # $Id: PKGBUILD 30749 2010-10-20 11:18:33Z schuay $
+# Maintainer:
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Pulphix <crimea.v@libero.it>
 
 pkgname=gamin
 pkgver=0.1.10
-pkgrel=5
-pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor).'
+pkgrel=6
+pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor)'
 url='http://www.gnome.org/~veillard/gamin'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,12 +16,16 @@ options=('libtool')
 optdepends=('python2: for the python module.')
 provides=('fam')
 conflicts=('fam')
-source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b4ec549e57da470c04edd5ec2876a028')
+source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"
+        'fix-deprecated-const.patch')
+md5sums=('b4ec549e57da470c04edd5ec2876a028'
+         'f679aeb48fe9dd376c8828cc9b6941ab')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  patch -p1 -i "${srcdir}"/fix-deprecated-const.patch
+
   # python 2
   sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' python/gamin.py
 
diff --git a/extra/gamin/fix-deprecated-const.patch b/extra/gamin/fix-deprecated-const.patch
new file mode 100644
index 000000000..3d5f6133f
--- /dev/null
+++ b/extra/gamin/fix-deprecated-const.patch
@@ -0,0 +1,56 @@
+Description: Don't use deprecated G_CONST_RETURN. Fixes building with newer glib versions.
+Author: Matthias Klose <doko@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/829504
+
+Index: gamin/server/gam_node.c
+===================================================================
+--- gamin.orig/server/gam_node.c	2011-10-18 16:09:04.873780685 +0200
++++ gamin/server/gam_node.c	2011-10-18 16:09:01.965780543 +0200
+@@ -122,7 +122,7 @@
+  * it has finished with the string.  If it must keep it longer, it
+  * should makes its own copy.  The returned string must not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ gam_node_get_path(GamNode * node)
+ {
+     g_assert(node);
+Index: gamin/server/gam_node.h
+===================================================================
+--- gamin.orig/server/gam_node.h	2011-10-18 16:09:04.729780677 +0200
++++ gamin/server/gam_node.h	2011-10-18 16:09:01.961780544 +0200
+@@ -58,7 +58,7 @@
+ void                  gam_node_set_is_dir          (GamNode         *node,
+ 						   gboolean        is_dir);
+ 	
+-G_CONST_RETURN char  *gam_node_get_path            (GamNode         *node);
++const char  *gam_node_get_path            (GamNode         *node);
+ 
+ GList                *gam_node_get_subscriptions   (GamNode         *node);
+ 
+Index: gamin/server/gam_subscription.c
+===================================================================
+--- gamin.orig/server/gam_subscription.c	2011-10-18 16:09:04.817780682 +0200
++++ gamin/server/gam_subscription.c	2011-10-18 16:09:01.965780543 +0200
+@@ -141,7 +141,7 @@
+  * @param sub the GamSubscription
+  * @returns The path being monitored.  It should not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ gam_subscription_get_path(GamSubscription * sub)
+ {
+     if (sub == NULL)
+Index: gamin/server/gam_subscription.h
+===================================================================
+--- gamin.orig/server/gam_subscription.h	2011-10-18 16:09:04.929780687 +0200
++++ gamin/server/gam_subscription.h	2011-10-18 16:09:01.965780543 +0200
+@@ -21,7 +21,7 @@
+ 
+ int                  gam_subscription_get_reqno    (GamSubscription *sub);
+ 
+-G_CONST_RETURN char *gam_subscription_get_path     (GamSubscription *sub);
++const char *gam_subscription_get_path     (GamSubscription *sub);
+ 
+ GamListener         *gam_subscription_get_listener (GamSubscription *sub);
+