0002-no-const-return.patch 2.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
  2. build failures.
  3. Upstream-Status: Pending
  4. Index: gamin-0.1.10/server/gam_node.c
  5. ===================================================================
  6. --- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314 +0100
  7. +++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100
  8. @@ -122,7 +122,7 @@
  9. * it has finished with the string. If it must keep it longer, it
  10. * should makes its own copy. The returned string must not be freed.
  11. */
  12. -G_CONST_RETURN char *
  13. +const char *
  14. gam_node_get_path(GamNode * node)
  15. {
  16. g_assert(node);
  17. Index: gamin-0.1.10/server/gam_node.h
  18. ===================================================================
  19. --- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269 +0100
  20. +++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100
  21. @@ -58,7 +58,7 @@
  22. void gam_node_set_is_dir (GamNode *node,
  23. gboolean is_dir);
  24. -G_CONST_RETURN char *gam_node_get_path (GamNode *node);
  25. +const char *gam_node_get_path (GamNode *node);
  26. GList *gam_node_get_subscriptions (GamNode *node);
  27. Index: gamin-0.1.10/server/gam_subscription.c
  28. ===================================================================
  29. --- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12 15:25:40.497177525 +0100
  30. +++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304 +0100
  31. @@ -141,7 +141,7 @@
  32. * @param sub the GamSubscription
  33. * @returns The path being monitored. It should not be freed.
  34. */
  35. -G_CONST_RETURN char *
  36. +const char *
  37. gam_subscription_get_path(GamSubscription * sub)
  38. {
  39. if (sub == NULL)
  40. Index: gamin-0.1.10/server/gam_subscription.h
  41. ===================================================================
  42. --- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12 15:25:28.507178266 +0100
  43. +++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285 +0100
  44. @@ -21,7 +21,7 @@
  45. int gam_subscription_get_reqno (GamSubscription *sub);
  46. -G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
  47. +const char *gam_subscription_get_path (GamSubscription *sub);
  48. GamListener *gam_subscription_get_listener (GamSubscription *sub);