From: Andrea Zagli <andrea.zagli@email.it>
Date: Thu, 19 Apr 2018 12:31:51 +0000 (+0200)
Subject: evolutions-data-server pkg: aggiornamento a nuovi icu e ical.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=02c932bc64e5381805029505bed94f5e9cc7a45c;p=msys2

evolutions-data-server pkg: aggiornamento a nuovi icu e ical.
---

diff --git a/packages/mingw-w64-evolution-data-server/005-icu61.patch b/packages/mingw-w64-evolution-data-server/005-icu61.patch
new file mode 100644
index 0000000..c4c3a55
--- /dev/null
+++ b/packages/mingw-w64-evolution-data-server/005-icu61.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_61::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_61::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_61::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_61::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_61::UnicodeString::fromUTF8 (sourceUTF8);
+ 	transliterator->priv->transliterate (transform);
+ 	targetUTF8 = transform.toUTF8String (targetUTF8);
+ 
diff --git a/packages/mingw-w64-evolution-data-server/006-ical3.patch b/packages/mingw-w64-evolution-data-server/006-ical3.patch
new file mode 100644
index 0000000..28453c3
--- /dev/null
+++ b/packages/mingw-w64-evolution-data-server/006-ical3.patch
@@ -0,0 +1,81 @@
+--- ./calendar/libecal/e-cal-component.c
++++ ./calendar/libecal/e-cal-component.c
+@@ -2521,7 +2521,7 @@
+ 	 * This makes the timezone code simpler. */
+ 	if (datetime->tzid_param)
+ 		dt->tzid = g_strdup (icalparameter_get_tzid (datetime->tzid_param));
+-	else if (dt->value && dt->value->is_utc)
++	else if (dt->value && icaltime_is_utc((const struct icaltimetype)*dt->value))
+ 		dt->tzid = g_strdup ("UTC");
+ 	else
+ 		dt->tzid = NULL;
+@@ -2558,9 +2558,9 @@
+ 
+ 	/* If the TZID is set to "UTC", we set the is_utc flag. */
+ 	if (dt->tzid && !strcmp (dt->tzid, "UTC"))
+-		dt->value->is_utc = 1;
++		dt->value->zone = icaltimezone_get_utc_timezone();
+ 	else
+-		dt->value->is_utc = 0;
++		dt->value->zone = NULL;
+ 
+ 	if (datetime->prop) {
+ 		/* make sure no VALUE property is left if not needed */
+--- ./calendar/libecal/e-cal-recur.c
++++ ./calendar/libecal/e-cal-recur.c
+@@ -197,7 +197,7 @@
+ 	   a different icalcomponent and cause use-after-free. */
+ 	tt->zone = NULL;
+ 
+-	if (tt->is_utc)
++	if (icaltime_is_utc((const struct icaltimetype)*tt))
+ 		return TRUE;
+ 
+ 	tt->zone = default_timezone;
+@@ -437,7 +437,7 @@
+ 				rrule.until.minute = 0;
+ 				rrule.until.second = 0;
+ 
+-				if (!rrule.until.zone && !rrule.until.is_utc)
++				if (!rrule.until.zone && !icaltime_is_utc(rrule.until))
+ 					rrule.until.zone = dtstart.zone;
+ 			}
+ 
+@@ -544,7 +544,7 @@
+ 				exrule.until.minute = 0;
+ 				exrule.until.second = 0;
+ 
+-				if (!exrule.until.zone && !exrule.until.is_utc)
++				if (!exrule.until.zone && !icaltime_is_utc(exrule.until))
+ 					exrule.until.zone = dtstart.zone;
+ 			}
+ 
+@@ -588,7 +588,7 @@
+ 			if (!success)
+ 				break;
+ 
+-			if (!exdate.zone && !exdate.is_utc)
++			if (!exdate.zone && !icaltime_is_utc(exdate))
+ 				exdate.zone = dtstart.zone;
+ 
+ 			if (intersects_interval (&exdate, NULL, duration_days, duration_seconds, &interval_start, &interval_end)) {
+--- ./calendar/libecal/e-cal-time-util.c
++++ ./calendar/libecal/e-cal-time-util.c
+@@ -765,7 +765,7 @@
+ 	itt.month = tm->tm_mon + 1;
+ 	itt.year = tm->tm_year+ 1900;
+ 
+-	itt.is_utc = 0;
++	itt.zone = NULL;
+ 	itt.is_date = is_date;
+ 
+ 	return itt;
+--- ./calendar/backends/contacts/e-cal-backend-contacts.c
++++ ./calendar/backends/contacts/e-cal-backend-contacts.c
+@@ -701,7 +701,6 @@
+ 	ret.month = cdate->month;
+ 	ret.day = cdate->day;
+ 	ret.is_date = TRUE;
+-	ret.is_utc = FALSE;
+ 	ret.zone = NULL;
+ 	ret.is_daylight = FALSE;
diff --git a/packages/mingw-w64-evolution-data-server/PKGBUILD b/packages/mingw-w64-evolution-data-server/PKGBUILD
index ce804de..035dd3d 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=2
+pkgrel=3
 arch=('any')
 pkgdesc="Evolution database backend server (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
@@ -33,18 +33,24 @@ install=${_realname}-${CARCH}.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:4}/${_realname}-${pkgver}.tar.xz
         001-win.patch
         003-install-gtkdoc.patch
-        004-camel.patch)
+        004-camel.patch
+        005-icu61.patch
+        006-ical3.patch)
 sha256sums=('43127fe1f190873c73e13a4cada6cfe47870f1cc962e540a682cca123d959203'
             '440994245ea2c9bb1260d348c3c756751d9f687dccb418ff7365fd2894546cfd'
             'aa573f3fc69ddcc877f7a33d4d31e667ca891fcdca4a38e0a16eaa8ec063db70'
-            'c9cb06e86c31d5c08be098b64d8c64ee661271da2eb2c3cf79985f19e819b021')
+            'c9cb06e86c31d5c08be098b64d8c64ee661271da2eb2c3cf79985f19e819b021'
+            '137a967655b2b2a6edea95455a9c9eeb2cc691566ecd46040ae25667b55e99fc'
+            '680c36cccb51dd52915fa56c2565022bb0eb413db75b7435f53ba325ccc5379a')
 
 prepare() {
   cd ${_realname}-${pkgver}
 
   patch -p1 -i ${srcdir}/001-win.patch
   patch -p1 -i ${srcdir}/003-install-gtkdoc.patch
-  patch -b -V simple -p1 -i ${srcdir}/004-camel.patch
+  patch -p1 -i ${srcdir}/004-camel.patch
+  patch -p1 -i ${srcdir}/005-icu61.patch
+  patch -p1 -i ${srcdir}/006-ical3.patch
 
   autoreconf -fi
 }