components/gamin/patches/gamin-03-const.patch
author Vladimir Marek <Vladimir.Marek@oracle.com>
Wed, 19 Aug 2015 10:12:59 +0200
changeset 4805 ad8cc19e4aec
permissions -rw-r--r--
21036504 Move libgamin from Desktop to Userland consolidation

Fix compilation of recent glib removing G_CONST_RETURN

https://bugzilla.gnome.org/show_bug.cgi?id=658884

diff -ur gamin-0.1.10/server.orig/gam_node.c gamin-0.1.10/server/gam_node.c
--- gamin-0.1.10/server.orig/gam_node.c	Mon Aug 26 15:25:23 2013
+++ gamin-0.1.10/server/gam_node.c	Mon Aug 26 15:25:54 2013
@@ -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);
diff -ur gamin-0.1.10/server.orig/gam_node.h gamin-0.1.10/server/gam_node.h
--- gamin-0.1.10/server.orig/gam_node.h	Mon Aug 26 15:25:22 2013
+++ gamin-0.1.10/server/gam_node.h	Mon Aug 26 15:25:54 2013
@@ -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);
 
diff -ur gamin-0.1.10/server.orig/gam_subscription.c gamin-0.1.10/server/gam_subscription.c
--- gamin-0.1.10/server.orig/gam_subscription.c	Mon Aug 26 15:25:22 2013
+++ gamin-0.1.10/server/gam_subscription.c	Mon Aug 26 15:25:54 2013
@@ -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)
diff -ur gamin-0.1.10/server.orig/gam_subscription.h gamin-0.1.10/server/gam_subscription.h
--- gamin-0.1.10/server.orig/gam_subscription.h	Mon Aug 26 15:25:22 2013
+++ gamin-0.1.10/server/gam_subscription.h	Mon Aug 26 15:25:54 2013
@@ -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);