head	1.3;
access;
symbols
	pkgsrc-2019Q3:1.2.0.62
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.60
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.58
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.56
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.54
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.52
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.50
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.48
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.46
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.42
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.40
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.38
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.36
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.34
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.32
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.30
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.28
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.26
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.24
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.22
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.20
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.18
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.16
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.14
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.12
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.8
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.4
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.2
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.1.0.2
	pkgsrc-2012Q1-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2019.10.30.17.26.50;	author nia;	state dead;
branches;
next	1.2;
commitid	DSHEjrLYlXqbOUIB;

1.2
date	2012.05.06.04.34.03;	author dholland;	state Exp;
branches;
next	1.1;

1.1
date	2012.02.06.10.44.44;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.3
log
@evolution: Update to 3.34.1

Switched to GTK3, etc.
@
text
@$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
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,12 @@@@ e_util_utf8_strstrcase (const gchar *hay
 static gunichar
 stripped_char (gunichar ch)
 {
-	gunichar *decomp, retval;
+#ifdef G_UNICODE_COMBINING_MARK
+	gunichar *decomp;
+#else
+	gunichar decomp[4];
+#endif
+	gunichar retval;
 	GUnicodeType utype;
 	gsize dlen;
 
@@@@ -255,16 +260,27 @@@@ 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];
+#ifdef G_UNICODE_COMBINING_MARK
 			g_free (decomp);
+#endif
 			return retval;
 		}
 		break;
@


1.2
log
@Fix build with the new glib2.
@
text
@d1 1
a1 1
$NetBSD: patch-e_data_server_util_c,v 1.1 2012/02/06 10:44:44 drochner Exp $
@


1.1
log
@fix build with glib-2.30, from Patrick Welche per pkgsrc-users
@
text
@d1 1
a1 1
$NetBSD$
d9 1
a9 1
@@@@ -245,7 +245,7 @@@@ e_util_utf8_strstrcase (const gchar *hay
d14 6
a19 1
+	gunichar decomp[4], retval;
d23 1
a23 1
@@@@ -255,14 +255,23 @@@@ stripped_char (gunichar ch)
d45 1
d47 1
d49 2
@