diff options
| author | dholland <dholland> | 2012-05-06 04:34:03 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2012-05-06 04:34:03 +0000 |
| commit | de1c559b83b40f4d5c023e111a6f460d068a5019 (patch) | |
| tree | a8505465d971ea0167abd8522c11279bd16a51de /mail | |
| parent | 6cefb46fd585af070412cd6cf5d76bb330bd5fd1 (diff) | |
| download | pkgsrc-de1c559b83b40f4d5c023e111a6f460d068a5019.tar.gz | |
Fix build with the new glib2.
Diffstat (limited to 'mail')
3 files changed, 30 insertions, 6 deletions
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo index 93572a913c6..0a106e7f0bb 100644 --- a/mail/evolution-data-server/distinfo +++ b/mail/evolution-data-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.80 2012/05/06 04:15:43 dholland Exp $ +$NetBSD: distinfo,v 1.81 2012/05/06 04:34:03 dholland Exp $ SHA1 (evolution-data-server-2.32.3.tar.bz2) = cbf32c3438c4f1650b35b87007a337ebc1c56cec RMD160 (evolution-data-server-2.32.3.tar.bz2) = adc8b07aef41a89d16fc426541c12190a3688b8f @@ -15,4 +15,5 @@ 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 +SHA1 (patch-e_data_server_util_c) = fb7d01a036883b22e51a11082ae15e3fe81d81f0 +SHA1 (patch-libedataserver_e-categories_c) = f4045926c8bfd7b6dd0f5905825dd4ece7c09ad1 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 index 554d90cbfab..a0b7b525af4 100644 --- a/mail/evolution-data-server/patches/patch-e_data_server_util_c +++ b/mail/evolution-data-server/patches/patch-e_data_server_util_c @@ -1,4 +1,4 @@ -$NetBSD: patch-e_data_server_util_c,v 1.1 2012/02/06 10:44:44 drochner Exp $ +$NetBSD: patch-e_data_server_util_c,v 1.2 2012/05/06 04:34:03 dholland Exp $ In glib 2.30 G_UNICODE_COMBINING_MARK became known as G_UNICODE_SPACING_MARK, and g_unicode_canonical_decomposition was @@ -6,16 +6,21 @@ 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 +@@ -245,7 +245,12 @@ e_util_utf8_strstrcase (const gchar *hay static gunichar stripped_char (gunichar ch) { - gunichar *decomp, retval; -+ gunichar decomp[4], retval; ++#ifdef G_UNICODE_COMBINING_MARK ++ gunichar *decomp; ++#else ++ gunichar decomp[4]; ++#endif ++ gunichar retval; GUnicodeType utype; gsize dlen; -@@ -255,14 +255,23 @@ stripped_char (gunichar ch) +@@ -255,16 +260,27 @@ stripped_char (gunichar ch) case G_UNICODE_CONTROL: case G_UNICODE_FORMAT: case G_UNICODE_UNASSIGNED: @@ -37,5 +42,9 @@ deprecated in favour of g_unichar_fully_decompose. + if ((dlen = g_unichar_fully_decompose(ch, FALSE, decomp, 4))) { +#endif retval = decomp[0]; ++#ifdef G_UNICODE_COMBINING_MARK g_free (decomp); ++#endif return retval; + } + break; diff --git a/mail/evolution-data-server/patches/patch-libedataserver_e-categories_c b/mail/evolution-data-server/patches/patch-libedataserver_e-categories_c new file mode 100644 index 00000000000..10d2e241220 --- /dev/null +++ b/mail/evolution-data-server/patches/patch-libedataserver_e-categories_c @@ -0,0 +1,14 @@ +$NetBSD: patch-libedataserver_e-categories_c,v 1.1 2012/05/06 04:34:03 dholland Exp $ + +Fix build with latest glib2. + +--- libedataserver/e-categories.c~ 2011-04-21 19:35:37.000000000 +0000 ++++ libedataserver/e-categories.c +@@ -20,6 +20,7 @@ + #include <config.h> + #include <string.h> + #include <libxml/parser.h> ++#include <glib.h> + #include <glib/gstdio.h> + #include <glib/gi18n-lib.h> + #include <gconf/gconf-client.h> |