diff options
author | drochner <drochner@pkgsrc.org> | 2012-02-06 10:44:43 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2012-02-06 10:44:43 +0000 |
commit | 1c6bc8e73186f1a659c2d502c1ae995736dfc189 (patch) | |
tree | 494b9a3109d0f2b3ea1a4b7eeb179d94ef75d1af /mail | |
parent | afb228e0b29984d772c2d14556b010574b5da5cc (diff) | |
download | pkgsrc-1c6bc8e73186f1a659c2d502c1ae995736dfc189.tar.gz |
fix build with glib-2.30, from Patrick Welche per pkgsrc-users
Diffstat (limited to 'mail')
5 files changed, 94 insertions, 1 deletions
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo index cac36dfa587..57bf30cf602 100644 --- a/mail/evolution-data-server/distinfo +++ b/mail/evolution-data-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.77 2011/08/02 06:16:09 shattered Exp $ +$NetBSD: distinfo,v 1.78 2012/02/06 10:44:43 drochner Exp $ SHA1 (evolution-data-server-2.32.3.tar.bz2) = cbf32c3438c4f1650b35b87007a337ebc1c56cec RMD160 (evolution-data-server-2.32.3.tar.bz2) = adc8b07aef41a89d16fc426541c12190a3688b8f @@ -11,3 +11,7 @@ SHA1 (patch-cc) = a59bbc664a96f467888cae89cb00eb9a9033a925 SHA1 (patch-cd) = 6e366e65e68cd0c5a8eafa67c7f9152c6521de12 SHA1 (patch-ce) = 1da2a3773ff89319bc79bbb7375e8259f0be89e4 SHA1 (patch-cg) = ef8059123df8b774b75549e0cbb46d2976ed6aff +SHA1 (patch-e_data_book_c) = b52f6f50cc19794b2acb9df401bc34eaf8ea7ec7 +SHA1 (patch-e_data_book_factory_c) = 889cc05bb7fb1656b7f770ce8caee2a6f14c061c +SHA1 (patch-e_data_cal_factory_c) = 73d811a3a1b4881e0391ff2b81ad11f916ca1b8e +SHA1 (patch-e_data_server_util_c) = 99b79c1a306f7b5abfc6cff0e84da50ef46d5ecd diff --git a/mail/evolution-data-server/patches/patch-e_data_book_c b/mail/evolution-data-server/patches/patch-e_data_book_c new file mode 100644 index 00000000000..7c1d28ad046 --- /dev/null +++ b/mail/evolution-data-server/patches/patch-e_data_book_c @@ -0,0 +1,16 @@ +$NetBSD: patch-e_data_book_c,v 1.1 2012/02/06 10:44:43 drochner Exp $ + +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 diff --git a/mail/evolution-data-server/patches/patch-e_data_book_factory_c b/mail/evolution-data-server/patches/patch-e_data_book_factory_c new file mode 100644 index 00000000000..4748fe8ecbc --- /dev/null +++ b/mail/evolution-data-server/patches/patch-e_data_book_factory_c @@ -0,0 +1,16 @@ +$NetBSD: patch-e_data_book_factory_c,v 1.1 2012/02/06 10:44:43 drochner Exp $ + +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 diff --git a/mail/evolution-data-server/patches/patch-e_data_cal_factory_c b/mail/evolution-data-server/patches/patch-e_data_cal_factory_c new file mode 100644 index 00000000000..690c1963da0 --- /dev/null +++ b/mail/evolution-data-server/patches/patch-e_data_cal_factory_c @@ -0,0 +1,16 @@ +$NetBSD: patch-e_data_cal_factory_c,v 1.1 2012/02/06 10:44:44 drochner Exp $ + +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 diff --git a/mail/evolution-data-server/patches/patch-e_data_server_util_c b/mail/evolution-data-server/patches/patch-e_data_server_util_c new file mode 100644 index 00000000000..554d90cbfab --- /dev/null +++ b/mail/evolution-data-server/patches/patch-e_data_server_util_c @@ -0,0 +1,41 @@ +$NetBSD: patch-e_data_server_util_c,v 1.1 2012/02/06 10:44:44 drochner Exp $ + +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; |