summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/eds/eds-dbus
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-12 13:22:15 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 12:18:06 (GMT)
commitbef801045c3ddb36504e7f20b7acd6165a62bb55 (patch)
tree42f1fdc76a6d637dc245fd469728fd560a30e53b /meta/recipes-sato/eds/eds-dbus
parenta74c33d157e4ac7a732524860786d76797ca0249 (diff)
downloadpoky-bef801045c3ddb36504e7f20b7acd6165a62bb55.tar.gz
eds: Update to work with glib-2.0
(From OE-Core rev: d8419d30add74c73cfb038c7e611187a651c24e6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/eds/eds-dbus')
-rw-r--r--meta/recipes-sato/eds/eds-dbus/depbuildfix.patch78
1 files changed, 78 insertions, 0 deletions
diff --git a/meta/recipes-sato/eds/eds-dbus/depbuildfix.patch b/meta/recipes-sato/eds/eds-dbus/depbuildfix.patch
new file mode 100644
index 0000000..0785a93
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/depbuildfix.patch
@@ -0,0 +1,78 @@
1G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
2build failures. Also resolve other deprecation issues.
3
4RP 2011/10/12
5
6Upstream-Status: Pending
7
8Index: git/libedataserver/e-data-server-util.c
9===================================================================
10--- git.orig/libedataserver/e-data-server-util.c 2011-10-12 01:42:40.622045788 +0100
11+++ git/libedataserver/e-data-server-util.c 2011-10-12 01:48:16.732045664 +0100
12@@ -165,7 +165,8 @@
13 static gunichar
14 stripped_char (gunichar ch)
15 {
16- gunichar *decomp, retval;
17+ gunichar decomp[4];
18+ gunichar retval;
19 GUnicodeType utype;
20 gsize dlen;
21
22@@ -175,7 +176,7 @@
23 case G_UNICODE_CONTROL:
24 case G_UNICODE_FORMAT:
25 case G_UNICODE_UNASSIGNED:
26- case G_UNICODE_COMBINING_MARK:
27+ case G_UNICODE_SPACING_MARK:
28 /* Ignore those */
29 return 0;
30 break;
31@@ -183,7 +184,7 @@
32 /* Convert to lowercase, fall through */
33 ch = g_unichar_tolower (ch);
34 case G_UNICODE_LOWERCASE_LETTER:
35- if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
36+ if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) {
37 retval = decomp[0];
38 g_free (decomp);
39 return retval;
40Index: git/addressbook/libedata-book/e-data-book-factory.c
41===================================================================
42--- git.orig/addressbook/libedata-book/e-data-book-factory.c 2011-10-12 01:52:25.692045500 +0100
43+++ git/addressbook/libedata-book/e-data-book-factory.c 2011-10-12 01:53:31.862045707 +0100
44@@ -238,7 +238,7 @@
45 return g_strdup_printf (
46 "/org/gnome/evolution/dataserver/addressbook/%d/%u",
47 getpid (),
48- g_atomic_int_exchange_and_add (&counter, 1));
49+ g_atomic_int_add (&counter, 1));
50 }
51
52 static void
53Index: git/addressbook/libedata-book/e-data-book.c
54===================================================================
55--- git.orig/addressbook/libedata-book/e-data-book.c 2011-10-12 01:54:40.752045465 +0100
56+++ git/addressbook/libedata-book/e-data-book.c 2011-10-12 01:55:16.012045897 +0100
57@@ -553,7 +553,7 @@
58
59 return g_strdup_printf ("/org/gnome/evolution/dataserver/addressbook/BookView/%d/%d",
60 getpid (),
61- g_atomic_int_exchange_and_add ((int*)&counter, 1));
62+ g_atomic_int_add ((int*)&counter, 1));
63 }
64
65 static void
66Index: git/calendar/libedata-cal/e-data-cal-factory.c
67===================================================================
68--- git.orig/calendar/libedata-cal/e-data-cal-factory.c 2011-10-12 01:57:56.612045081 +0100
69+++ git/calendar/libedata-cal/e-data-cal-factory.c 2011-10-12 01:57:58.832045211 +0100
70@@ -227,7 +227,7 @@
71 return g_strdup_printf (
72 "/org/gnome/evolution/dataserver/calendar/%d/%u",
73 getpid (),
74- g_atomic_int_exchange_and_add (&counter, 1));
75+ g_atomic_int_add (&counter, 1));
76 }
77
78 static void