testing/evolution-data-server: clean up patches

add missing and remove unused

3 files changed, 13 insertions, 102 deletions

diff --git a/testing/evolution-data-server/g_atomic_int_exchange_and_add.patch b/testing/evolution-data-server/g_atomic_int_exchange_and_add.patch
deleted file mode 100644
index 59c114134..000000000
--- a/testing/evolution-data-server/g_atomic_int_exchange_and_add.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1886d3d0573388aa5c13af99f714687ba6a66ec6 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 01 Jun 2011 05:22:14 +0000
-Subject: Replace deprecated g_atomic_int_exchange_and_add()
-
----
-(limited to 'addressbook/libedata-book/e-data-book.c')
-
-diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
-index 9e17703..1a29e4b 100644
---- a/addressbook/libedata-book/e-data-book.c
-+++ b/addressbook/libedata-book/e-data-book.c
-@@ -117,7 +117,7 @@ construct_bookview_path (void)
- 
- 	return g_strdup_printf ("/org/gnome/evolution/dataserver/AddressBookView/%d/%d",
- 				getpid (),
--				g_atomic_int_exchange_and_add ((int*)&counter, 1));
-+				g_atomic_int_add ((int*)&counter, 1));
- }
- 
- static void
---
-cgit v0.9.0.2
---- ./addressbook/libedata-book/e-data-book-factory.c.orig
-+++ ./addressbook/libedata-book/e-data-book-factory.c
-@@ -229,7 +229,7 @@
- 
- 	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
---- ./calendar/libedata-cal/e-data-cal-factory.c.orig
-+++ ./calendar/libedata-cal/e-data-cal-factory.c
-@@ -245,7 +245,7 @@
- 
- 	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/testing/evolution-data-server/g_unicode_canonical_decomposition.patch b/testing/evolution-data-server/g_unicode_canonical_decomposition.patch
deleted file mode 100644
index d00a06ddc..000000000
--- a/testing/evolution-data-server/g_unicode_canonical_decomposition.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f1c9292caa3b26c890d628e99677dd05d62eba99 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Tue, 06 Sep 2011 14:43:04 +0000
-Subject: Bug #655837 - Avoid use of deprecated g_unicode_canonical_decomposition
-
----
-(limited to 'libedataserver/e-data-server-util.c')
-
-diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
-index 4c0310a..3f2ff02 100644
---- a/libedataserver/e-data-server-util.c
-+++ b/libedataserver/e-data-server-util.c
-@@ -251,7 +251,12 @@ e_util_utf8_strstrcase (const gchar *haystack,
- static gunichar
- stripped_char (gunichar ch)
- {
--	gunichar *decomp, retval;
-+#if GLIB_CHECK_VERSION(2,29,12)
-+	gunichar decomp[4];
-+#else
-+	gunichar *decomp;
-+#endif
-+	gunichar retval;
- 	GUnicodeType utype;
- 	gsize dlen;
- 
-@@ -268,11 +273,18 @@ stripped_char (gunichar ch)
- 		/* Convert to lowercase, fall through */
- 		ch = g_unichar_tolower (ch);
- 	case G_UNICODE_LOWERCASE_LETTER:
-+#if GLIB_CHECK_VERSION(2,29,12)
-+		if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) {
-+			retval = decomp[0];
-+			return retval;
-+		}
-+#else
- 		if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
- 			retval = decomp[0];
- 			g_free (decomp);
- 			return retval;
- 		}
-+#endif
- 		break;
- 	}
- 
---
-cgit v0.9.0.2
---- ./libedataserver/e-data-server-util.c.orig
-+++ ./libedataserver/e-data-server-util.c
-@@ -260,7 +260,6 @@
- 	case G_UNICODE_CONTROL:
- 	case G_UNICODE_FORMAT:
- 	case G_UNICODE_UNASSIGNED:
--	case G_UNICODE_COMBINING_MARK:
- 		/* Ignore those */
- 		return 0;
- 	default:
diff --git a/testing/evolution-data-server/iconv-10646.patch b/testing/evolution-data-server/iconv-10646.patch
new file mode 100644
index 000000000..d3fee764f
--- /dev/null
+++ b/testing/evolution-data-server/iconv-10646.patch
@@ -0,0 +1,13 @@
+--- ./camel/camel-iconv.c.orig
++++ ./camel/camel-iconv.c
+@@ -38,6 +38,10 @@
+ #include "camel-iconv.h"
+ #include "iconv-detect.h"
+ 
++#ifndef ICONV_10646
++#define ICONV_10646 "iso-10646"
++#endif /*ICONV_10646*/
++
+ #define cd(x)
+ 
+ G_LOCK_DEFINE_STATIC (iconv);