diff --git a/.gitignore b/.gitignore index 47a1f50..94aa31e 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ /evolution-ews-3.28.1.tar.xz /evolution-ews-3.28.2.tar.xz /evolution-ews-3.28.3.tar.xz +/evolution-ews-3.28.4.tar.xz diff --git a/evolution-ews-3.28.3-gn796297-rsvp.patch b/evolution-ews-3.28.3-gn796297-rsvp.patch deleted file mode 100644 index 47e9c4f..0000000 --- a/evolution-ews-3.28.3-gn796297-rsvp.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c -index fc733edf..1bfe71f3 100644 ---- a/src/calendar/e-cal-backend-ews-utils.c -+++ b/src/calendar/e-cal-backend-ews-utils.c -@@ -1644,7 +1644,7 @@ convert_vevent_component_to_updatexml (ESoapMessage *msg, - - e_ews_collect_attendees (icalcomp, &required, &optional, &resource, &rsvp_requested); - -- e_ews_message_write_string_parameter (msg, "IsResponseRequested", NULL, rsvp_requested ? "true" : "false"); -+ convert_vevent_property_to_updatexml (msg, "IsResponseRequested", rsvp_requested ? "true" : "false", "calendar", NULL, NULL); - - if (required != NULL) { - e_ews_message_start_set_item_field (msg, "RequiredAttendees", "calendar", "CalendarItem"); -diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c -index c7d0b61c..02f88e71 100644 ---- a/src/calendar/e-cal-backend-ews.c -+++ b/src/calendar/e-cal-backend-ews.c -@@ -87,6 +87,7 @@ struct _ECalBackendEwsPrivate { - " calendar:Resources" \ - " calendar:ModifiedOccurrences" \ - " calendar:IsMeeting" \ -+ " calendar:IsResponseRequested" \ - " calendar:MyResponseType" \ - " calendar:RequiredAttendees" \ - " calendar:OptionalAttendees" -@@ -738,6 +739,7 @@ ecb_ews_item_to_component_sync (ECalBackendEws *cbews, - item_id = e_ews_item_get_id (item); - - if (e_ews_item_get_is_meeting (item)) { -+ gboolean is_response_requested = e_ews_item_get_is_response_requested (item); - gchar *user_email; - - user_email = camel_ews_settings_dup_email (ews_settings); -@@ -777,6 +779,11 @@ ecb_ews_item_to_component_sync (ECalBackendEws *cbews, - icalproperty_add_parameter (icalprop, cu_type); - icalproperty_add_parameter (icalprop, param); - -+ if (is_response_requested) { -+ param = icalparameter_new_rsvp (ICAL_RSVP_TRUE); -+ icalproperty_add_parameter (icalprop, param); -+ } -+ - if (user_email && (email || attendee->mailbox->email) && e_ews_item_get_my_response_type (item) && - g_ascii_strcasecmp (email ? email : attendee->mailbox->email, user_email) == 0) { - param = ecb_ews_responsetype_to_partstat (e_ews_item_get_my_response_type (item)); -diff --git a/src/server/e-ews-item.c b/src/server/e-ews-item.c -index 5b322780..b0ac50b7 100644 ---- a/src/server/e-ews-item.c -+++ b/src/server/e-ews-item.c -@@ -140,6 +140,7 @@ struct _EEwsItemPrivate { - EwsMailbox *sender; - - gboolean is_meeting; -+ gboolean is_response_requested; - GSList *modified_occurrences; - GSList *attachments_ids; - gchar *my_response_type; -@@ -288,6 +289,7 @@ e_ews_item_init (EEwsItem *item) - - item->priv->item_type = E_EWS_ITEM_TYPE_UNKNOWN; - item->priv->is_meeting = FALSE; -+ item->priv->is_response_requested = FALSE; - - item->priv->mapi_extended_tags = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free); - item->priv->mapi_extended_sets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_hash_table_destroy); -@@ -1629,6 +1631,10 @@ e_ews_item_set_from_soap_parameter (EEwsItem *item, - value = e_soap_parameter_get_string_value (subparam); - priv->is_meeting = (!g_ascii_strcasecmp (value, "true")); - g_free (value); -+ } else if (!g_ascii_strcasecmp (name, "IsResponseRequested")) { -+ value = e_soap_parameter_get_string_value (subparam); -+ priv->is_response_requested = (!g_ascii_strcasecmp (value, "true")); -+ g_free (value); - } else if (!g_ascii_strcasecmp (name, "MyResponseType")) { - g_free (priv->my_response_type); - priv->my_response_type = e_soap_parameter_get_string_value (subparam); -@@ -1894,6 +1900,14 @@ e_ews_item_get_is_meeting (EEwsItem *item) - return item->priv->is_meeting; - } - -+gboolean -+e_ews_item_get_is_response_requested (EEwsItem *item) -+{ -+ g_return_val_if_fail (E_IS_EWS_ITEM (item), FALSE); -+ -+ return item->priv->is_response_requested; -+} -+ - gboolean - e_ews_item_is_forwarded (EEwsItem *item, - gboolean *forwarded) -diff --git a/src/server/e-ews-item.h b/src/server/e-ews-item.h -index 8c4b126a..d5487918 100644 ---- a/src/server/e-ews-item.h -+++ b/src/server/e-ews-item.h -@@ -311,6 +311,8 @@ EwsMailbox * - void e_ews_mailbox_free (EwsMailbox *mailbox); - - gboolean e_ews_item_get_is_meeting (EEwsItem *item); -+gboolean e_ews_item_get_is_response_requested -+ (EEwsItem *item); - const GSList * e_ews_item_get_modified_occurrences - (EEwsItem *item); - gchar * e_ews_embed_attachment_id_in_uri (const gchar *olduri, const gchar *attach_id); diff --git a/evolution-ews.spec b/evolution-ews.spec index ed5616c..e5fe0ac 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -1,8 +1,8 @@ %global libmspack_version 0.4 Name: evolution-ews -Version: 3.28.3 -Release: 2%{?dist} +Version: 3.28.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Evolution extension for Exchange Web Services License: LGPLv2 @@ -11,8 +11,6 @@ Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz %global eds_evo_version %{version} -Patch01: evolution-ews-3.28.3-gn796297-rsvp.patch - Requires: evolution >= %{eds_evo_version} Requires: evolution-data-server >= %{eds_evo_version} Requires: %{name}-langpacks = %{version}-%{release} @@ -51,7 +49,6 @@ This package contains translations for %{name}. %prep %setup -q -%patch01 -p1 -b .gn796297-rsvp %build @@ -92,6 +89,10 @@ make install DESTDIR=$RPM_BUILD_ROOT %files langpacks -f _build/%{name}.lang %changelog +* Mon Jul 16 2018 Milan Crha - 3.28.4-1 +- Update to 3.28.4 +- Remove patch for GNOME bug #796297 (Fixed upstream) + * Mon Jun 25 2018 Milan Crha - 3.28.3-2 - Add patch for GNOME bug #796297 (Cannot modify existing meeting after fix for this bug) diff --git a/sources b/sources index 8d5a377..b109847 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-ews-3.28.3.tar.xz) = 651058a81c41d6c170df22a994ab0b8d5e7cee08fff58b93a485c3e095c336c5b44fecd42c9fbfab9d73303836eb30e9e5d575a00e482def0e55628c6138dd97 +SHA512 (evolution-ews-3.28.4.tar.xz) = b43df4998ae1394fcc314e08c717d37cdfa337a33ea223e5e9cd44a54d2fc68b0150ab8c33cca73e6ef529e49117b18f99ac160d257c26710c9542a546620ca0