patches for evolution-data-server

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

I found I needed the enclosed patches for mail/evolution-data-server
to avoid using symbols which were deprecated by glib 2.30.

Cheers,

Patrick

$NetBSD$

Replace deprecated g_atomic_int_exchange_and_add()
1886d3d0573388aa5c13af99f714687ba6a66ec6

--- addressbook/libedata-book/e-data-book.c.orig        2011-04-21 
19:35:36.000000000 +0000
+++ addressbook/libedata-book/e-data-book.c
@@ -632,7 +632,7 @@ construct_bookview_path (void)
 
        return g_strdup_printf 
("/org/gnome/evolution/dataserver/addressbook/BookView/%d/%d",
                                getpid (),
-                               g_atomic_int_exchange_and_add ((int*)&counter, 
1));
+                               g_atomic_int_add ((int*)&counter, 1));
 }
 
 static gboolean

$NetBSD$

Replace deprecated g_atomic_int_exchange_and_add()
1886d3d0573388aa5c13af99f714687ba6a66ec6

--- addressbook/libedata-book/e-data-book-factory.c.orig        2011-04-21 
19:36:35.000000000 +0000
+++ addressbook/libedata-book/e-data-book-factory.c
@@ -229,7 +229,7 @@ construct_book_factory_path (void)
 
        return g_strdup_printf (
                "/org/gnome/evolution/dataserver/addressbook/%d/%u",
-               getpid (), g_atomic_int_exchange_and_add (&counter, 1));
+               getpid (), g_atomic_int_add (&counter, 1));
 }
 
 static gboolean

$NetBSD$

Replace deprecated g_atomic_int_exchange_and_add()
1886d3d0573388aa5c13af99f714687ba6a66ec6

--- calendar/libedata-cal/e-data-cal-factory.c.orig     2011-04-21 
19:36:35.000000000 +0000
+++ calendar/libedata-cal/e-data-cal-factory.c
@@ -245,7 +245,7 @@ construct_cal_factory_path (void)
 
        return g_strdup_printf (
                "/org/gnome/evolution/dataserver/calendar/%d/%u",
-               getpid (), g_atomic_int_exchange_and_add (&counter, 1));
+               getpid (), g_atomic_int_add (&counter, 1));
 }
 
 static gboolean

$NetBSD$

In glib 2.30 G_UNICODE_COMBINING_MARK became known as
G_UNICODE_SPACING_MARK, and g_unicode_canonical_decomposition was
deprecated in favour of g_unichar_fully_decompose.

--- libedataserver/e-data-server-util.c.orig    2011-04-21 19:35:37.000000000 
+0000
+++ libedataserver/e-data-server-util.c
@@ -245,7 +245,7 @@ e_util_utf8_strstrcase (const gchar *hay
 static gunichar
 stripped_char (gunichar ch)
 {
-       gunichar *decomp, retval;
+       gunichar decomp[4], retval;
        GUnicodeType utype;
        gsize dlen;
 
@@ -255,14 +255,23 @@ stripped_char (gunichar ch)
        case G_UNICODE_CONTROL:
        case G_UNICODE_FORMAT:
        case G_UNICODE_UNASSIGNED:
+#ifdef G_UNICODE_COMBINING_MARK
        case G_UNICODE_COMBINING_MARK:
+#endif
+#ifdef G_UNICODE_SPACING_MARK
+       case G_UNICODE_SPACING_MARK:
+#endif
                /* Ignore those */
                return 0;
        default:
                /* Convert to lowercase, fall through */
                ch = g_unichar_tolower (ch);
        case G_UNICODE_LOWERCASE_LETTER:
+#ifdef G_UNICODE_COMBINING_MARK
                if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
+#else
+               if ((dlen = g_unichar_fully_decompose(ch, FALSE, decomp, 4))) {
+#endif
                        retval = decomp[0];
                        g_free (decomp);
                        return retval;