From 002b45d5afc80a08eb8127eb4097596e3dcad801 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Mon, 16 Oct 2023 12:10:14 +0200
Subject: [PATCH] evolution-data-server: rebuild.

---
 .../005-icu73.patch                           | 53 +++++++++++++++++++
 .../mingw-w64-evolution-data-server/PKGBUILD  | 10 ++--
 2 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 packages/mingw-w64-evolution-data-server/005-icu73.patch

diff --git a/packages/mingw-w64-evolution-data-server/005-icu73.patch b/packages/mingw-w64-evolution-data-server/005-icu73.patch
new file mode 100644
index 0000000..608bfd2
--- /dev/null
+++ b/packages/mingw-w64-evolution-data-server/005-icu73.patch
@@ -0,0 +1,53 @@
+--- ./libedataserver/e-alphabet-index-private.cpp
++++ ./libedataserver/e-alphabet-index-private.cpp
+@@ -78,7 +78,7 @@
+ 				 const gchar     *word)
+ {
+ 	UErrorCode status = U_ZERO_ERROR;
+-	UnicodeString string;
++	icu_73::UnicodeString string;
+ 	gint index;
+ 
+ 	g_return_val_if_fail (alphabet_index != NULL, -1);
+@@ -131,7 +131,7 @@
+ 
+ 	for (i = 0; alphabet_index->priv->nextBucket (status); i++) {
+ 		UAlphabeticIndexLabelType label_type;
+-		UnicodeString ustring;
++		icu_73::UnicodeString ustring;
+ 		std::string string;
+ 
+ 		label_type = alphabet_index->priv->getBucketLabelType ();
+--- ./libedataserver/e-alphabet-index-private.cpp
++++ ./libedataserver/e-alphabet-index-private.cpp
+@@ -84,7 +84,7 @@
+ 	g_return_val_if_fail (alphabet_index != NULL, -1);
+ 	g_return_val_if_fail (word != NULL, -1);
+ 
+-	string = icu::UnicodeString::fromUTF8 (word);
++	string = icu_73::UnicodeString::fromUTF8 (word);
+ 	index = alphabet_index->priv->getBucketIndex (string, status);
+ 
+ 	return index;
+--- ./libedataserver/e-transliterator-private.cpp
++++ ./libedataserver/e-transliterator-private.cpp
+@@ -76,7 +76,7 @@
+ _e_transliterator_cxx_transliterate (ETransliterator  *transliterator,
+ 				     const gchar      *str)
+ {
+-	UnicodeString transform;
++	icu_73::UnicodeString transform;
+ 	std::string sourceUTF8;
+ 	std::string targetUTF8;
+ 
+--- ./libedataserver/e-transliterator-private.cpp
++++ ./libedataserver/e-transliterator-private.cpp
+@@ -84,7 +84,7 @@
+ 	g_return_val_if_fail (str != NULL, NULL);
+ 
+ 	sourceUTF8 = str;
+-	transform = icu::UnicodeString::fromUTF8 (sourceUTF8);
++	transform = icu_73::UnicodeString::fromUTF8 (sourceUTF8);
+ 	transliterator->priv->transliterate (transform);
+ 	targetUTF8 = transform.toUTF8String (targetUTF8);
+ 
diff --git a/packages/mingw-w64-evolution-data-server/PKGBUILD b/packages/mingw-w64-evolution-data-server/PKGBUILD
index 64be428..6e2873d 100644
--- a/packages/mingw-w64-evolution-data-server/PKGBUILD
+++ b/packages/mingw-w64-evolution-data-server/PKGBUILD
@@ -4,7 +4,7 @@ _realname=evolution-data-server
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.22.7
-pkgrel=4
+pkgrel=5
 arch=('any')
 pkgdesc="Evolution database backend server (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
@@ -34,14 +34,14 @@ source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:4}/${_rea
         001-win.patch
         003-install-gtkdoc.patch
         004-camel.patch
-        005-icu64.patch
+        005-icu73.patch
         006-ical3.patch
         007-gweather-3.22.patch)
 sha256sums=('43127fe1f190873c73e13a4cada6cfe47870f1cc962e540a682cca123d959203'
             '440994245ea2c9bb1260d348c3c756751d9f687dccb418ff7365fd2894546cfd'
             'aa573f3fc69ddcc877f7a33d4d31e667ca891fcdca4a38e0a16eaa8ec063db70'
             'c9cb06e86c31d5c08be098b64d8c64ee661271da2eb2c3cf79985f19e819b021'
-            '5439bf1e86ec20065005f2e728fc2faf80997ee751124c61ffc3e3fdf7947e71'
+			'5ac97c39a4fc4dfd32620c389794d7e33e511a612606db2cc7818def03f690bc'
             '680c36cccb51dd52915fa56c2565022bb0eb413db75b7435f53ba325ccc5379a'
             '526dbdf9285e88a5998ff2415b0982f37bf20c84816d6463d3d5fcf05aecd92b')
 
@@ -51,7 +51,7 @@ prepare() {
   patch -p1 -i ${srcdir}/001-win.patch
   patch -p1 -i ${srcdir}/003-install-gtkdoc.patch
   patch -p1 -i ${srcdir}/004-camel.patch
-  patch -p1 -i ${srcdir}/005-icu64.patch
+  patch -p1 -i ${srcdir}/005-icu73.patch
   patch -p1 -i ${srcdir}/006-ical3.patch
   patch -p1 -i ${srcdir}/007-gweather-3.22.patch
 
@@ -68,6 +68,8 @@ build() {
   mkdir -p docs/reference/eds/html
   cp -rf ../${_realname}-${pkgver}/docs/reference/eds/html/* docs/reference/eds/html
 
+  export lt_cv_deplibs_check_method='pass_all'
+
   ../${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \
-- 
2.49.0