evolution-data-server: rebuild e patch.

diff --git a/packages/mingw-w64-evolution-data-server/005-icu73.patch b/packages/mingw-w64-evolution-data-server/005-icu73.patch
deleted file mode 100644 (file)
index 608bfd2..0000000
--- a/packages/mingw-w64-evolution-data-server/005-icu73.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- ./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/005-icu74.patch b/packages/mingw-w64-evolution-data-server/005-icu74.patch
new file mode 100644 (file)
index 0000000..2b14de4
--- /dev/null
+++ b/packages/mingw-w64-evolution-data-server/005-icu74.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_74::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_74::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_74::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_74::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_74::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 6e2873d332775748e8d856ab2074535808c3c8d9..8fb42395763a13821c5bb296adc6a2166d883080 100644 (file)
--- 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=5
+pkgrel=6
 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-icu73.patch
+        005-icu74.patch
         006-ical3.patch
         007-gweather-3.22.patch)
 sha256sums=('43127fe1f190873c73e13a4cada6cfe47870f1cc962e540a682cca123d959203'
             '440994245ea2c9bb1260d348c3c756751d9f687dccb418ff7365fd2894546cfd'
             'aa573f3fc69ddcc877f7a33d4d31e667ca891fcdca4a38e0a16eaa8ec063db70'
             'c9cb06e86c31d5c08be098b64d8c64ee661271da2eb2c3cf79985f19e819b021'
-                       '5ac97c39a4fc4dfd32620c389794d7e33e511a612606db2cc7818def03f690bc'
+                       '92369e5cdb2e1668d63739b31625968a3a774fa6ba55ffedf5db40f3534d3bab'
             '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-icu73.patch
+  patch -p1 -i ${srcdir}/005-icu74.patch
   patch -p1 -i ${srcdir}/006-ical3.patch
   patch -p1 -i ${srcdir}/007-gweather-3.22.patch