rpm/evolution-data-server
SHA256
1
0
Fork 0
forked from pool/evolution-data-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=3

Browse Source
This commit is contained in:
OBS User unknown
2007-03-23 00:49:46 +00:00
committed by Git OBS Bridge
parent 3503fe8daf
commit 43f91e5cd4
9 changed files with 56 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
bnc-167638.patch
View File

@@ -1,10 +1,7 @@
Index: camel/camel.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel.c,v
retrieving revision 1.56
diff -u -r1.56 camel/camel.c
--- camel/camel.c 6 Dec 2005 04:21:56 -0000 1.56
+++ camel/camel.c 20 Apr 2006 21:12:40 -0000
--- camel/camel.c.orig
+++ camel/camel.c
@@ -44,6 +44,8 @@
static int initialised = FALSE;
@@ -16,12 +13,9 @@ diff -u -r1.56 camel/camel.c
{
Index: camel/providers/imap/camel-imap-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-folder.c,v
retrieving revision 1.358
diff -u -r1.358 camel/camel-imap-folder.c
--- camel/providers/imap/camel-imap-folder.c 10 Jan 2006 07:56:47 -0000 1.358
+++ camel/providers/imap/camel-imap-folder.c 20 Apr 2006 21:12:40 -0000
@@ -607,6 +607,7 @@
--- camel/providers/imap/camel-imap-folder.c.orig
+++ camel/providers/imap/camel-imap-folder.c
@@ -605,6 +605,7 @@ imap_rescan (CamelFolder *folder, int ex
{
CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
@@ -29,19 +23,17 @@ diff -u -r1.358 camel/camel-imap-folder.c
struct {
char *uid;
guint32 flags;
@@ -619,7 +620,10 @@
GArray *removed;
@@ -618,6 +619,9 @@ imap_rescan (CamelFolder *folder, int ex
gboolean ok;
CamelFolderChangeInfo *changes = NULL;
-
+
+ if (camel_application_is_exiting)
+ return;
+
CAMEL_SERVICE_ASSERT_LOCKED (store, connect_lock);
+
imap_folder->need_rescan = FALSE;
@@ -2617,6 +2621,7 @@
summary_len = camel_folder_summary_count (folder->summary);
@@ -2634,6 +2638,7 @@ camel_imap_folder_changed (CamelFolder *
GArray *expunged, CamelException *ex)
{
CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
@@ -49,7 +41,7 @@ diff -u -r1.358 camel/camel-imap-folder.c
CamelFolderChangeInfo *changes;
CamelMessageInfo *info;
int len;
@@ -2646,7 +2651,7 @@
@@ -2661,7 +2666,7 @@ camel_imap_folder_changed (CamelFolder *
}
len = camel_folder_summary_count (folder->summary);
@@ -60,21 +52,18 @@ diff -u -r1.358 camel/camel-imap-folder.c
if (camel_folder_change_info_changed (changes))
Index: camel/providers/groupwise/camel-groupwise-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-folder.c,v
retrieving revision 1.130
diff -u -p -r1.130 camel-groupwise-folder.c
--- camel/providers/groupwise/camel-groupwise-folder.c 18 Apr 2006 15:15:30 -0000 1.130
+++ camel/providers/groupwise/camel-groupwise-folder.c 21 Apr 2006 11:18:22 -0000
@@ -59,7 +59,7 @@
--- camel/providers/groupwise/camel-groupwise-folder.c.orig
+++ camel/providers/groupwise/camel-groupwise-folder.c
@@ -60,7 +60,7 @@
#define ADD_JUNK_ENTRY 1
#define REMOVE_JUNK_ENTRY -1
#define JUNK_FOLDER "Junk Mail"
-#define READ_CURSOR_MAX_IDS 500
+#define READ_CURSOR_MAX_IDS 50
#define MAX_ATTACHMENT_SIZE 1*1024*1024 /*In bytes*/
#define GROUPWISE_BULK_DELETE_LIMIT 100
static CamelOfflineFolderClass *parent_class = NULL;
@@ -749,6 +749,9 @@ struct _folder_update_msg {
@@ -856,6 +856,9 @@ struct _folder_update_msg {
static void
update_update (CamelSession *session, CamelSessionThreadMsg *msg)
{
@@ -84,7 +73,7 @@ diff -u -p -r1.130 camel-groupwise-folder.c
struct _folder_update_msg *m = (struct _folder_update_msg *)msg;
EGwConnectionStatus status;
CamelException *ex = NULL;
@@ -767,7 +770,7 @@ update_update (CamelSession *session, Ca
@@ -874,7 +877,7 @@ update_update (CamelSession *session, Ca
done = FALSE;
m->slist = NULL;

20
bnc-183819-evo-crashed-closing-offline.patch
View File

@@ -1,6 +1,8 @@
--- camel/providers/groupwise/camel-groupwise-folder.c.orig 2006-06-16 01:25:47.000000000 +0530
+++ camel/providers/groupwise/camel-groupwise-folder.c 2006-06-16 10:52:22.000000000 +0530
@@ -795,16 +795,27 @@ update_update (CamelSession *session, Ca
Index: camel/providers/groupwise/camel-groupwise-folder.c
===================================================================
--- camel/providers/groupwise/camel-groupwise-folder.c.orig
+++ camel/providers/groupwise/camel-groupwise-folder.c
@@ -862,16 +862,27 @@ update_update (CamelSession *session, Ca
struct _folder_update_msg *m = (struct _folder_update_msg *)msg;
EGwConnectionStatus status;
CamelException *ex = NULL;
@@ -15,7 +17,7 @@
+ In case if user went offline, don't do anything.
+ m->cnc would have become invalid, as the store disconnect unrefs it.
+ */
+ CAMEL_SERVICE_LOCK (gw_store, connect_lock);
+ CAMEL_SERVICE_REC_LOCK (gw_store, connect_lock);
+ if (((CamelOfflineStore *) gw_store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL ||
+ ((CamelService *)gw_store)->status == CAMEL_SERVICE_DISCONNECTED) {
+ goto end1;
@@ -29,7 +31,7 @@
}
done = FALSE;
@@ -816,7 +827,7 @@ update_update (CamelSession *session, Ca
@@ -883,7 +894,7 @@ update_update (CamelSession *session, Ca
if (status != E_GW_CONNECTION_STATUS_OK) {
g_warning ("ERROR update update\n");
e_gw_connection_destroy_cursor (m->cnc, m->container_id, cursor);
@@ -38,22 +40,22 @@
}
if (!item_list || g_list_length (item_list) == 0)
@@ -839,6 +850,7 @@ update_update (CamelSession *session, Ca
@@ -906,6 +917,7 @@ update_update (CamelSession *session, Ca
}
e_gw_connection_destroy_cursor (m->cnc, m->container_id, cursor);
+ CAMEL_SERVICE_UNLOCK (gw_store, connect_lock);
+ CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock);
/* Take out only the first part in the list until the @ since it is guaranteed
to be unique only until that symbol */
@@ -860,6 +872,11 @@ update_update (CamelSession *session, Ca
@@ -927,6 +939,11 @@ update_update (CamelSession *session, Ca
g_print ("\nNumber of items in the folder: %d \n", g_list_length(items_full_list));
gw_update_all_items (m->folder, items_full_list, ex);
+
+ return;
+ end1:
+ CAMEL_SERVICE_UNLOCK (gw_store, connect_lock);
+ CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock);
+ return;
}

3
evolution-data-server-1.10.0.tar.bz2 Normal file
View File

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

3
evolution-data-server-1.9.91.tar.bz2
View File

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

46
evolution-data-server-decl.patch
View File

@@ -1,46 +1,8 @@
--- docs/reference/addressbook/libebook/libebook.types
+++ docs/reference/addressbook/libebook/libebook.types
@@ -1,4 +1,10 @@
#include <glib-object.h>
+#include <libebook/e-book.h>
+#include <libebook/e-book-view.h>
+#include <libebook/e-book-listener.h>
+#include <libebook/e-book-view-listener.h>
+#include <libebook/e-contact.h>
+#include <libebook/e-vcard.h>
e_book_listener_get_type
e_book_view_listener_get_type
e_book_view_get_type
--- docs/reference/calendar/libecal/libecal.types
+++ docs/reference/calendar/libecal/libecal.types
@@ -1,4 +1,9 @@
#include <glib-object.h>
+#include <libecal/e-cal.h>
+#include <libecal/e-cal-component.h>
+#include <libecal/e-cal-listener.h>
+#include <libecal/e-cal-view.h>
+#include <libecal/e-cal-view-listener.h>
e_cal_get_type
e_cal_view_get_type
e_cal_listener_get_type
--- docs/reference/calendar/libedata-cal/libedata-cal.types
+++ docs/reference/calendar/libedata-cal/libedata-cal.types
@@ -1,4 +1,12 @@
#include <glib-object.h>
+#include <libedata-cal/e-cal-backend-cache.h>
+#include <libedata-cal/e-cal-backend-factory.h>
+#include <libedata-cal/e-cal-backend-sexp.h>
+#include <libedata-cal/e-cal-backend-sync.h>
+#include <libedata-cal/e-cal-backend.h>
+#include <libedata-cal/e-data-cal-factory.h>
+#include <libedata-cal/e-data-cal-view.h>
+#include <libedata-cal/e-data-cal.h>
e_cal_backend_cache_get_type
e_cal_backend_factory_get_type
e_cal_backend_sexp_get_type
--- libedataserverui/e-name-selector-dialog.c
Index: libedataserverui/e-name-selector-dialog.c
===================================================================
--- libedataserverui/e-name-selector-dialog.c.orig
+++ libedataserverui/e-name-selector-dialog.c
@@ -30,6 +30,8 @@
@@ -31,6 +31,8 @@
#include <gtk/gtklabel.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkstock.h>

10
evolution-data-server.changes
View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Mar 22 11:21:56 CST 2007 - maw@suse.de
- Update to version 1.10.0
- Bug fixes, including bugzilla.gnome.org 413173, 400169,
and 356177
- Remove evolution-fix-function-declarations.patch and
implicit-declaration.diff
- Fix bnc-183819-evo-crashed-closing-offline.patch.
-------------------------------------------------------------------
Mon Mar 12 14:53:49 CST 2007 - maw@suse.de

17
evolution-data-server.spec
View File

@@ -1,5 +1,5 @@
#
# spec file for package evolution-data-server (Version 1.9.91)
# spec file for package evolution-data-server (Version 1.10.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@ License: GNU General Public License (GPL)
Group: Development/Libraries/GNOME
Autoreqprov: on
Summary: Evolution Data Server
Version: 1.9.91
Version: 1.10.0
Release: 1
Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.9/%{name}-%{version}.tar.bz2
#Patch3: evolution-data-server-gcc4.patch
@@ -24,7 +24,7 @@ Patch5: evolution-data-server-configure.patch
Patch6: nss-nspr.patch
Patch7: evolution-data-server-decl.patch
Patch8: eds-warnings.patch
Patch9: evolution-fix-function-declarations.patch
# Patch9: evolution-fix-function-declarations.patch
# FIXME: After upgrade, use patch# - 100
#Patch108: eds-1.5.5-warnings.patch
#Patch10: keyring-integration.patch
@@ -106,7 +106,6 @@ Patch84: cal-attachment-filename-handling.patch
Patch85: bnc-167330-default-GW-alarms.patch
Patch86: eds-compiler-warning.patch
Patch87: evolution-data-server-retval.patch
Patch88: implicit-declaration.diff
Patch89: bgo-369168-buffer-overrun.patch
# Change patch below if we move away from /opt/gnome
# It avoids a build dependency on libgnomeui to speed up bootstrap
@@ -162,7 +161,7 @@ documentation.
%patch7
#%patch108
%patch8
%patch9
# %patch9
#%patch10
#%patch11
#%patch12
@@ -238,7 +237,6 @@ documentation.
#%patch83
%patch86
%patch87
%patch88
#%patch89
%patch99 -p1
@@ -291,6 +289,13 @@ rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%{_datadir}/gtk-doc/html/*
%changelog
* Thu Mar 22 2007 - maw@suse.de
- Update to version 1.10.0
- Bug fixes, including bugzilla.gnome.org 413173, 400169,
and 356177
- Remove evolution-fix-function-declarations.patch and
implicit-declaration.diff
- Fix bnc-183819-evo-crashed-closing-offline.patch.
* Mon Mar 12 2007 - maw@suse.de
- Update to version 1.9.91
- Refresh serveral patches

16
evolution-fix-function-declarations.patch
View File

@@ -1,16 +0,0 @@
--- docs/reference/libedataserver/libedataserver.types
+++ docs/reference/libedataserver/libedataserver.types
@@ -1,4 +1,13 @@
#include <glib-object.h>
+#include <e-account.h>
+#include <e-component-listener.h>
+#include <e-file-cache.h>
+#include <e-iterator.h>
+#include <e-list-iterator.h>
+#include <e-list.h>
+#include <e-source-group.h>
+#include <e-source-list.h>
+#include <e-source.h>
e_account_get_type
e_component_listener_get_type
e_file_cache_get_type

10
implicit-declaration.diff
View File

@@ -1,10 +0,0 @@
--- docs/reference/addressbook/libebook/libebook.types
+++ docs/reference/addressbook/libebook/libebook.types
@@ -4,6 +4,7 @@
#include <libebook/e-book-listener.h>
#include <libebook/e-book-view-listener.h>
#include <libebook/e-contact.h>
+#include <libebook/e-destination.h>
#include <libebook/e-vcard.h>
e_book_listener_get_type
e_book_view_listener_get_type