diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-12 23:32:36 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-14 12:04:28 +0100 |
| commit | a7f5554f92523ab51a774b70e9e6bd5d8fa36b00 (patch) | |
| tree | 75528915311abd292e1469e5a02e7780051873a7 | |
| parent | e1d888cd20aafafdab60ec2a857f4ee19d1f9342 (diff) | |
| download | openembedded-core-a7f5554f92523ab51a774b70e9e6bd5d8fa36b00.tar.gz | |
gamin: Fix glib 2.30 deprecation issues
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/gamin/gamin/noconst.patch | 59 | ||||
| -rw-r--r-- | meta/recipes-extended/gamin/gamin_0.1.10.bb | 5 |
2 files changed, 62 insertions, 2 deletions
diff --git a/meta/recipes-extended/gamin/gamin/noconst.patch b/meta/recipes-extended/gamin/gamin/noconst.patch new file mode 100644 index 0000000000..7b2998c279 --- /dev/null +++ b/meta/recipes-extended/gamin/gamin/noconst.patch @@ -0,0 +1,59 @@ +G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid +build failures. + +RP 2011/10/12 + +Upstream-Status: Pending + +Index: gamin-0.1.10/server/gam_node.c +=================================================================== +--- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314 +0100 ++++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100 +@@ -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-0.1.10/server/gam_node.h +=================================================================== +--- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269 +0100 ++++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100 +@@ -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-0.1.10/server/gam_subscription.c +=================================================================== +--- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12 15:25:40.497177525 +0100 ++++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304 +0100 +@@ -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-0.1.10/server/gam_subscription.h +=================================================================== +--- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12 15:25:28.507178266 +0100 ++++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285 +0100 +@@ -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); + diff --git a/meta/recipes-extended/gamin/gamin_0.1.10.bb b/meta/recipes-extended/gamin/gamin_0.1.10.bb index 080a3253f0..9da7e51a19 100644 --- a/meta/recipes-extended/gamin/gamin_0.1.10.bb +++ b/meta/recipes-extended/gamin/gamin_0.1.10.bb @@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=412a9be54757a155d0b997b52b519f62" DEPENDS = "glib-2.0" PROVIDES = "fam" -PR = "r3" +PR = "r4" SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \ - file://no-abstract-sockets.patch" + file://no-abstract-sockets.patch \ + file://noconst.patch" SRC_URI[md5sum] = "b4ec549e57da470c04edd5ec2876a028" SRC_URI[sha256sum] = "28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1" |