Accepting request 48897 from GNOME:Factory

checked in (request 48897)

OBS-URL: https://build.opensuse.org/request/show/48897
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=79
This commit is contained in:
OBS User autobuild 2010-09-23 22:13:36 +00:00 committed by Git OBS Bridge
parent 5bba5a2c66
commit ac3b2cec8f
5 changed files with 16 additions and 60 deletions

View File

@ -1,7 +1,7 @@
Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c Index: evolution-data-server-2.31.5/calendar/libecal/e-cal-component.c
=================================================================== ===================================================================
--- evolution-data-server-2.31.92.orig/calendar/libecal/e-cal-component.c --- evolution-data-server-2.31.5.orig/calendar/libecal/e-cal-component.c
+++ evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c +++ evolution-data-server-2.31.5/calendar/libecal/e-cal-component.c
@@ -163,6 +163,8 @@ struct _ECalComponentPrivate { @@ -163,6 +163,8 @@ struct _ECalComponentPrivate {
* object over the wire. * object over the wire.
*/ */
@ -47,7 +47,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
} }
@@ -915,6 +928,9 @@ scan_icalcomponent (ECalComponent *comp) @@ -915,6 +928,9 @@ scan_icalcomponent (ECalComponent *comp)
g_return_if_fail (priv->icalcomp != NULL); g_assert (priv->icalcomp != NULL);
+ if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_VCALENDAR) + if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_VCALENDAR)
+ return; + return;
@ -64,7 +64,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
+ kind = ICAL_VCALENDAR_COMPONENT; + kind = ICAL_VCALENDAR_COMPONENT;
+ break; + break;
default: default:
g_warn_if_reached (); g_assert_not_reached ();
kind = ICAL_NO_COMPONENT; kind = ICAL_NO_COMPONENT;
@@ -1031,8 +1049,8 @@ e_cal_component_set_new_vtype (ECalCompo @@ -1031,8 +1049,8 @@ e_cal_component_set_new_vtype (ECalCompo
scan_icalcomponent (comp); scan_icalcomponent (comp);
@ -134,7 +134,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
+ +
default: default:
/* We should have been loaded with a supported type! */ /* We should have been loaded with a supported type! */
g_warn_if_reached (); g_assert_not_reached ();
@@ -2586,6 +2616,27 @@ e_cal_component_set_dtstart (ECalCompone @@ -2586,6 +2616,27 @@ e_cal_component_set_dtstart (ECalCompone
priv->need_sequence_inc = TRUE; priv->need_sequence_inc = TRUE;
} }
@ -163,7 +163,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
/** /**
* e_cal_component_get_due: * e_cal_component_get_due:
* @comp: A calendar component object. * @comp: A calendar component object.
@@ -4039,6 +4090,24 @@ e_cal_component_get_sequence (ECalCompon @@ -4040,6 +4091,24 @@ e_cal_component_get_sequence (ECalCompon
**sequence = icalproperty_get_sequence (priv->sequence); **sequence = icalproperty_get_sequence (priv->sequence);
} }
@ -188,7 +188,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
/** /**
* e_cal_component_set_sequence: * e_cal_component_set_sequence:
* @comp: A calendar component object. * @comp: A calendar component object.
@@ -5964,3 +6033,77 @@ e_cal_component_event_dates_match (ECalC @@ -6018,3 +6087,77 @@ e_cal_component_event_dates_match (ECalC
return retval; return retval;
} }
@ -266,10 +266,10 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
+ +
+ return -1; + return -1;
+} +}
Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.h Index: evolution-data-server-2.31.5/calendar/libecal/e-cal-component.h
=================================================================== ===================================================================
--- evolution-data-server-2.31.92.orig/calendar/libecal/e-cal-component.h --- evolution-data-server-2.31.5.orig/calendar/libecal/e-cal-component.h
+++ evolution-data-server-2.31.92/calendar/libecal/e-cal-component.h +++ evolution-data-server-2.31.5/calendar/libecal/e-cal-component.h
@@ -51,7 +51,8 @@ typedef enum { @@ -51,7 +51,8 @@ typedef enum {
E_CAL_COMPONENT_TODO, E_CAL_COMPONENT_TODO,
E_CAL_COMPONENT_JOURNAL, E_CAL_COMPONENT_JOURNAL,

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7dd73cd2d6fc89654189c81214d695eecafb601003548228202df3e9a767074
size 4257796

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:17313717afe5723e0cef8b128cedcb1edfdfc425cb4d9612a499b5b3e747e880
size 4261525

View File

@ -1,47 +1,3 @@
-------------------------------------------------------------------
Tue Sep 14 10:10:00 CEST 2010 - dimstar@opensuse.org
- Update to version 2.31.92.1:
+ bgo#629255: e-d-s FTBFS
-------------------------------------------------------------------
Mon Sep 13 14:08:42 CEST 2010 - dimstar@opensuse.org
- Update to version 2.31.92:
+ Use --disable-gtk3 in DISTCHECK_CONFIGURE_FLAGS.
+ Update API documentation.
+ Work around deprecation of gtk_dialog_set_has_separator()
+ Update the server utc time in the key file to avoid fetching
duplicates items again and again. This had been broken when
fetching modified items moved away from get_quick_messages to
get_items_request.
+ Fix comma insertion while selecting auto-completed emails.
+ Fix issue that made it impossible to send mails using
Evolution.
+ Don't use getline, implement a simple replacement. Some
systems don't have getline in their C library, so use a private
implementation released under LGPL v2+.
+ Ensure end date is generated for master recurrence event while
inserting into the interval tree
+ Avoid having backslashes in uri on windows
+ Handle error from camel_imapx_stream_token()
+ Fix attachments retrieval issue in groupwise. Add the prefix
file:// to the filename to form the uri
+ Find the timezone in libical first and then the backend or
cache while resolving tzids
+ Optimize eds calendar memory usage and speed.
+ Remove fatal assertions from libecal.
+ Various misc bug fixes.
+ Bugs fixed: bgo#507290, bgo#471079, bgo#627336, bgo#628426,
bgo#603044, bgo#611568, bgo#628977, bgo#628659, bgo#628658,
bgo#628657, bgo#628651, bgo#628426, bgo#624135, bgo#624229,
bgo#611539, bgo#627817, bgo#625110, bgo#624130, bgo#624228,
bgo#624705, bgo#624702, bgo#624318, bgo#569329, bgo#628485,
bgo#624027, bgo#628100, bgo#623912, bgo#627627, bgo#627871,
bgo#627609
+ Updated translations.
- Rebase dice-eds-changes.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 31 09:56:08 UTC 2010 - aj@suse.de Tue Aug 31 09:56:08 UTC 2010 - aj@suse.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package evolution-data-server (Version 2.31.92.1) # spec file for package evolution-data-server (Version 2.31.91)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -54,7 +54,7 @@ Obsoletes: evolution-data-server-64bit
Obsoletes: evolution-data-server-32bit Obsoletes: evolution-data-server-32bit
%endif %endif
Summary: Evolution Data Server Summary: Evolution Data Server
Version: 2.31.92.1 Version: 2.31.91
Release: 1 Release: 1
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2
Source99: baselibs.conf Source99: baselibs.conf