summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-12 23:32:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 13:18:07 +0100
commitc0e04c44eb0bb89c0737ef491c24fc3f36d3bc54 (patch)
tree577aff83685d597bbab0a02b1b56f6cb25e103bb
parent2912f89b25691c01e7a0ed93683846a7dad35c23 (diff)
downloadpoky-c0e04c44eb0bb89c0737ef491c24fc3f36d3bc54.tar.gz
gamin: Fix glib 2.30 deprecation issues
(From OE-Core rev: a7f5554f92523ab51a774b70e9e6bd5d8fa36b00) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/gamin/gamin/noconst.patch59
-rw-r--r--meta/recipes-extended/gamin/gamin_0.1.10.bb5
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 @@
1G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
2build failures.
3
4RP 2011/10/12
5
6Upstream-Status: Pending
7
8Index: gamin-0.1.10/server/gam_node.c
9===================================================================
10--- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314 +0100
11+++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100
12@@ -122,7 +122,7 @@
13 * it has finished with the string. If it must keep it longer, it
14 * should makes its own copy. The returned string must not be freed.
15 */
16-G_CONST_RETURN char *
17+const char *
18 gam_node_get_path(GamNode * node)
19 {
20 g_assert(node);
21Index: gamin-0.1.10/server/gam_node.h
22===================================================================
23--- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269 +0100
24+++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100
25@@ -58,7 +58,7 @@
26 void gam_node_set_is_dir (GamNode *node,
27 gboolean is_dir);
28
29-G_CONST_RETURN char *gam_node_get_path (GamNode *node);
30+const char *gam_node_get_path (GamNode *node);
31
32 GList *gam_node_get_subscriptions (GamNode *node);
33
34Index: gamin-0.1.10/server/gam_subscription.c
35===================================================================
36--- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12 15:25:40.497177525 +0100
37+++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304 +0100
38@@ -141,7 +141,7 @@
39 * @param sub the GamSubscription
40 * @returns The path being monitored. It should not be freed.
41 */
42-G_CONST_RETURN char *
43+const char *
44 gam_subscription_get_path(GamSubscription * sub)
45 {
46 if (sub == NULL)
47Index: gamin-0.1.10/server/gam_subscription.h
48===================================================================
49--- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12 15:25:28.507178266 +0100
50+++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285 +0100
51@@ -21,7 +21,7 @@
52
53 int gam_subscription_get_reqno (GamSubscription *sub);
54
55-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
56+const char *gam_subscription_get_path (GamSubscription *sub);
57
58 GamListener *gam_subscription_get_listener (GamSubscription *sub);
59
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"
8 8
9DEPENDS = "glib-2.0" 9DEPENDS = "glib-2.0"
10PROVIDES = "fam" 10PROVIDES = "fam"
11PR = "r3" 11PR = "r4"
12 12
13SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \ 13SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
14 file://no-abstract-sockets.patch" 14 file://no-abstract-sockets.patch \
15 file://noconst.patch"
15 16
16SRC_URI[md5sum] = "b4ec549e57da470c04edd5ec2876a028" 17SRC_URI[md5sum] = "b4ec549e57da470c04edd5ec2876a028"
17SRC_URI[sha256sum] = "28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1" 18SRC_URI[sha256sum] = "28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1"