From: Andrea Zagli <azagli@libero.it>
Date: Wed, 24 Jul 2019 08:40:32 +0000 (+0200)
Subject: Pkg evolution-data-server: icu64 e gweather3.22.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=7719671c2333b1ef20c166b469987ab3ca781963;p=msys2

Pkg evolution-data-server: icu64 e gweather3.22.
---

diff --git a/packages/mingw-w64-evolution-data-server/005-icu64.patch b/packages/mingw-w64-evolution-data-server/005-icu64.patch
new file mode 100644
index 0000000..915495d
--- /dev/null
+++ b/packages/mingw-w64-evolution-data-server/005-icu64.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_64::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_64::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_64::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_64::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_64::UnicodeString::fromUTF8 (sourceUTF8);
+ 	transliterator->priv->transliterate (transform);
+ 	targetUTF8 = transform.toUTF8String (targetUTF8);
+ 
diff --git a/packages/mingw-w64-evolution-data-server/007-gweather-3.22.patch b/packages/mingw-w64-evolution-data-server/007-gweather-3.22.patch
new file mode 100644
index 0000000..799e318
--- /dev/null
+++ b/packages/mingw-w64-evolution-data-server/007-gweather-3.22.patch
@@ -0,0 +1,12 @@
+--- ./calendar/backends/weather/e-weather-source.c
++++ ./calendar/backends/weather/e-weather-source.c
+@@ -185,8 +185,7 @@
+ 
+ 	if (source->priv->info == NULL) {
+ 		source->priv->info = gweather_info_new (
+-			source->priv->location,
+-			GWEATHER_FORECAST_LIST);
++			source->priv->location);
+ 		gweather_info_set_enabled_providers (source->priv->info, GWEATHER_PROVIDER_ALL);
+ 		g_signal_connect (
+ 			source->priv->info, "updated",
diff --git a/packages/mingw-w64-evolution-data-server/PKGBUILD b/packages/mingw-w64-evolution-data-server/PKGBUILD
index 035dd3d..64be428 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=3
+pkgrel=4
 arch=('any')
 pkgdesc="Evolution database backend server (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
@@ -34,14 +34,16 @@ source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:4}/${_rea
         001-win.patch
         003-install-gtkdoc.patch
         004-camel.patch
-        005-icu61.patch
-        006-ical3.patch)
+        005-icu64.patch
+        006-ical3.patch
+        007-gweather-3.22.patch)
 sha256sums=('43127fe1f190873c73e13a4cada6cfe47870f1cc962e540a682cca123d959203'
             '440994245ea2c9bb1260d348c3c756751d9f687dccb418ff7365fd2894546cfd'
             'aa573f3fc69ddcc877f7a33d4d31e667ca891fcdca4a38e0a16eaa8ec063db70'
             'c9cb06e86c31d5c08be098b64d8c64ee661271da2eb2c3cf79985f19e819b021'
-            '137a967655b2b2a6edea95455a9c9eeb2cc691566ecd46040ae25667b55e99fc'
-            '680c36cccb51dd52915fa56c2565022bb0eb413db75b7435f53ba325ccc5379a')
+            '5439bf1e86ec20065005f2e728fc2faf80997ee751124c61ffc3e3fdf7947e71'
+            '680c36cccb51dd52915fa56c2565022bb0eb413db75b7435f53ba325ccc5379a'
+            '526dbdf9285e88a5998ff2415b0982f37bf20c84816d6463d3d5fcf05aecd92b')
 
 prepare() {
   cd ${_realname}-${pkgver}
@@ -49,8 +51,9 @@ 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-icu61.patch
+  patch -p1 -i ${srcdir}/005-icu64.patch
   patch -p1 -i ${srcdir}/006-ical3.patch
+  patch -p1 -i ${srcdir}/007-gweather-3.22.patch
 
   autoreconf -fi
 }