[arch-commits] Commit in gamin/repos (6 files)

Andrea Scarpino andrea at archlinux.org
Mon Nov 28 04:36:41 EST 2011


    Date: Monday, November 28, 2011 @ 04:36:41
  Author: andrea
Revision: 143670

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gamin/repos/extra-i686/PKGBUILD
    (from rev 143669, gamin/trunk/PKGBUILD)
  gamin/repos/extra-i686/fix-deprecated-const.patch
    (from rev 143669, gamin/trunk/fix-deprecated-const.patch)
  gamin/repos/extra-x86_64/PKGBUILD
    (from rev 143669, gamin/trunk/PKGBUILD)
  gamin/repos/extra-x86_64/fix-deprecated-const.patch
    (from rev 143669, gamin/trunk/fix-deprecated-const.patch)
Deleted:
  gamin/repos/extra-i686/PKGBUILD
  gamin/repos/extra-x86_64/PKGBUILD

-----------------------------------------+
 extra-i686/PKGBUILD                     |   77 +++++++++++++++---------------
 extra-i686/fix-deprecated-const.patch   |   56 +++++++++++++++++++++
 extra-x86_64/PKGBUILD                   |   77 +++++++++++++++---------------
 extra-x86_64/fix-deprecated-const.patch |   56 +++++++++++++++++++++
 4 files changed, 194 insertions(+), 72 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-11-28 09:36:16 UTC (rev 143669)
+++ extra-i686/PKGBUILD	2011-11-28 09:36:41 UTC (rev 143670)
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 30749 2010-10-20 11:18:33Z schuay $
-# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
-# Contributor: Pulphix <crimea.v at 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).'
-url='http://www.gnome.org/~veillard/gamin'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('glib2')
-makedepends=('python2')
-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')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python 2
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' python/gamin.py
-
-  ./configure --prefix=/usr --disable-static --with-threads \
-    --disable-debug-api --disable-debug --libexecdir=/usr/lib/gamin \
-    --with-python=/usr/bin/python2
-  make
-}
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-# vim:set ts=2 sw=2 et:

Copied: gamin/repos/extra-i686/PKGBUILD (from rev 143669, gamin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-11-28 09:36:41 UTC (rev 143670)
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 30749 2010-10-20 11:18:33Z schuay $
+# Maintainer:
+# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
+# Contributor: Pulphix <crimea.v at libero.it>
+
+pkgname=gamin
+pkgver=0.1.10
+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')
+depends=('glib2')
+makedepends=('python2')
+options=('libtool')
+optdepends=('python2: for the python module.')
+provides=('fam')
+conflicts=('fam')
+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
+
+  ./configure --prefix=/usr --disable-static --with-threads \
+    --disable-debug-api --disable-debug --libexecdir=/usr/lib/gamin \
+    --with-python=/usr/bin/python2
+  make
+}
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+# vim:set ts=2 sw=2 et:

Copied: gamin/repos/extra-i686/fix-deprecated-const.patch (from rev 143669, gamin/trunk/fix-deprecated-const.patch)
===================================================================
--- extra-i686/fix-deprecated-const.patch	                        (rev 0)
+++ extra-i686/fix-deprecated-const.patch	2011-11-28 09:36:41 UTC (rev 143670)
@@ -0,0 +1,56 @@
+Description: Don't use deprecated G_CONST_RETURN. Fixes building with newer glib versions.
+Author: Matthias Klose <doko at 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);
+ 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-11-28 09:36:16 UTC (rev 143669)
+++ extra-x86_64/PKGBUILD	2011-11-28 09:36:41 UTC (rev 143670)
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 30749 2010-10-20 11:18:33Z schuay $
-# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
-# Contributor: Pulphix <crimea.v at 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).'
-url='http://www.gnome.org/~veillard/gamin'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('glib2')
-makedepends=('python2')
-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')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python 2
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' python/gamin.py
-
-  ./configure --prefix=/usr --disable-static --with-threads \
-    --disable-debug-api --disable-debug --libexecdir=/usr/lib/gamin \
-    --with-python=/usr/bin/python2
-  make
-}
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-# vim:set ts=2 sw=2 et:

Copied: gamin/repos/extra-x86_64/PKGBUILD (from rev 143669, gamin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-11-28 09:36:41 UTC (rev 143670)
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 30749 2010-10-20 11:18:33Z schuay $
+# Maintainer:
+# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
+# Contributor: Pulphix <crimea.v at libero.it>
+
+pkgname=gamin
+pkgver=0.1.10
+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')
+depends=('glib2')
+makedepends=('python2')
+options=('libtool')
+optdepends=('python2: for the python module.')
+provides=('fam')
+conflicts=('fam')
+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
+
+  ./configure --prefix=/usr --disable-static --with-threads \
+    --disable-debug-api --disable-debug --libexecdir=/usr/lib/gamin \
+    --with-python=/usr/bin/python2
+  make
+}
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+# vim:set ts=2 sw=2 et:

Copied: gamin/repos/extra-x86_64/fix-deprecated-const.patch (from rev 143669, gamin/trunk/fix-deprecated-const.patch)
===================================================================
--- extra-x86_64/fix-deprecated-const.patch	                        (rev 0)
+++ extra-x86_64/fix-deprecated-const.patch	2011-11-28 09:36:41 UTC (rev 143670)
@@ -0,0 +1,56 @@
+Description: Don't use deprecated G_CONST_RETURN. Fixes building with newer glib versions.
+Author: Matthias Klose <doko at 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);
+ 



More information about the arch-commits mailing list