diff --git a/bnc-164140-eds-crash-evolution--offline.patch b/bnc-164140-eds-crash-evolution--offline.patch deleted file mode 100644 index e221a8e..0000000 --- a/bnc-164140-eds-crash-evolution--offline.patch +++ /dev/null @@ -1,14 +0,0 @@ -=== modified file 'addressbook/backends/file/e-book-backend-file.c' ---- addressbook/backends/file/e-book-backend-file.c 2007-12-18 16:36:30 +0000 -+++ addressbook/backends/file/e-book-backend-file.c 2007-12-18 16:42:54 +0000 -@@ -666,6 +666,9 @@ - FileBackendSearchClosure *closure = get_closure (book_view); - gboolean need_join; - -+ if (!closure) -+ return; -+ - d(printf ("stopping query\n")); - need_join = e_flag_is_set (closure->running); - e_flag_clear (closure->running); - diff --git a/bnc-167638.patch b/bnc-167638.patch deleted file mode 100644 index d3092b4..0000000 --- a/bnc-167638.patch +++ /dev/null @@ -1,84 +0,0 @@ -=== modified file 'camel/camel.c' ---- camel/camel.c 2007-12-18 16:36:30 +0000 -+++ camel/camel.c 2007-12-18 16:43:25 +0000 -@@ -46,6 +46,8 @@ - - static int initialised = FALSE; - -+int camel_application_is_exiting = FALSE; -+ - static void - camel_shutdown (void) - { - -=== modified file 'camel/providers/groupwise/camel-groupwise-folder.c' ---- camel/providers/groupwise/camel-groupwise-folder.c 2007-12-18 16:41:03 +0000 -+++ camel/providers/groupwise/camel-groupwise-folder.c 2007-12-18 16:43:25 +0000 -@@ -66,7 +66,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 - -@@ -867,6 +867,9 @@ - static void - update_update (CamelSession *session, CamelSessionThreadMsg *msg) - { -+ -+ extern int camel_application_is_exiting; -+ - struct _folder_update_msg *m = (struct _folder_update_msg *)msg; - EGwConnectionStatus status; - CamelException *ex = NULL; -@@ -885,7 +888,7 @@ - done = FALSE; - m->slist = NULL; - -- while (!done) { -+ while (!done && !camel_application_is_exiting) { - item_list = NULL; - status = e_gw_connection_get_all_mail_uids (m->cnc, m->container_id, cursor, FALSE, READ_CURSOR_MAX_IDS, position, &item_list); - if (status != E_GW_CONNECTION_STATUS_OK) { - -=== modified file 'camel/providers/imap/camel-imap-folder.c' ---- camel/providers/imap/camel-imap-folder.c 2007-12-18 16:36:30 +0000 -+++ camel/providers/imap/camel-imap-folder.c 2007-12-18 16:43:25 +0000 -@@ -652,6 +652,7 @@ - { - CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder); - CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store); -+ extern int camel_application_is_exiting; - struct { - char *uid; - guint32 flags; -@@ -665,6 +666,9 @@ - gboolean ok; - CamelFolderChangeInfo *changes = NULL; - -+ if (camel_application_is_exiting) -+ return; -+ - imap_folder->need_rescan = FALSE; - - summary_len = camel_folder_summary_count (folder->summary); -@@ -2738,6 +2742,7 @@ - GArray *expunged, CamelException *ex) - { - CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder); -+ extern int camel_application_is_exiting; - CamelFolderChangeInfo *changes; - CamelMessageInfo *info; - int len; -@@ -2765,7 +2770,7 @@ - } - - len = camel_folder_summary_count (folder->summary); -- if (exists > len) -+ if (exists > len && !camel_application_is_exiting) - imap_update_summary (folder, exists, changes, ex); - - if (camel_folder_change_info_changed (changes)) - diff --git a/bnc-183819-evo-crashed-closing-offline.patch b/bnc-183819-evo-crashed-closing-offline.patch deleted file mode 100644 index 70a7083..0000000 --- a/bnc-183819-evo-crashed-closing-offline.patch +++ /dev/null @@ -1,62 +0,0 @@ -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; -+ CamelGroupwiseStore *gw_store = CAMEL_GROUPWISE_STORE (m->folder->parent_store); - - GList *item_list, *items_full_list = NULL, *last_element=NULL; - int cursor = 0; - const char *position = E_GW_CURSOR_POSITION_END; - gboolean done; - -+ /* Hold the connect_lock. -+ In case if user went offline, don't do anything. -+ m->cnc would have become invalid, as the store disconnect unrefs it. -+ */ -+ 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; -+ } -+ - status = e_gw_connection_create_cursor (m->cnc, m->container_id, "id", NULL, &cursor); - if (status != E_GW_CONNECTION_STATUS_OK) { - g_warning ("ERROR update update\n"); -- return ; -+ goto end1; - } - - done = FALSE; -@@ -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); -- return; -+ goto end1; - } - - if (!item_list || g_list_length (item_list) == 0) -@@ -906,6 +917,7 @@ update_update (CamelSession *session, Ca - } - e_gw_connection_destroy_cursor (m->cnc, m->container_id, cursor); - -+ 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 */ - -@@ -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_REC_UNLOCK (gw_store, connect_lock); -+ return; - } - - static void diff --git a/eds-warnings.patch b/eds-warnings.patch deleted file mode 100644 index 2580d20..0000000 --- a/eds-warnings.patch +++ /dev/null @@ -1,120 +0,0 @@ -=== modified file 'calendar/backends/contacts/e-cal-backend-contacts.c' ---- calendar/backends/contacts/e-cal-backend-contacts.c 2007-12-18 16:36:30 +0000 -+++ calendar/backends/contacts/e-cal-backend-contacts.c 2007-12-18 16:41:03 +0000 -@@ -389,7 +389,7 @@ - static struct icaltimetype - cdate_to_icaltime (EContactDate *cdate) - { -- struct icaltimetype ret; -+ struct icaltimetype ret = icaltime_null_time(); - - ret.year = cdate->year; - ret.month = cdate->month; - -=== modified file 'calendar/backends/groupwise/e-cal-backend-groupwise-utils.h' ---- calendar/backends/groupwise/e-cal-backend-groupwise-utils.h 2007-12-18 16:36:30 +0000 -+++ calendar/backends/groupwise/e-cal-backend-groupwise-utils.h 2007-12-18 16:41:03 +0000 -@@ -44,6 +44,7 @@ - * Items management - */ - EGwItem *e_gw_item_new_from_cal_component (const char *container, ECalBackendGroupwise *cbgw, ECalComponent *comp); -+EGwItem *e_gw_item_new_for_delegate_from_cal (ECalBackendGroupwise *cbgw, ECalComponent *comp); - ECalComponent *e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw); - void e_gw_item_set_changes (EGwItem *item, EGwItem *cached_item); - - -=== modified file 'camel/providers/groupwise/camel-groupwise-folder.c' ---- camel/providers/groupwise/camel-groupwise-folder.c 2007-12-18 16:36:30 +0000 -+++ camel/providers/groupwise/camel-groupwise-folder.c 2007-12-18 16:41:03 +0000 -@@ -2072,7 +2072,7 @@ - CamelGroupwiseStore *gw_store= CAMEL_GROUPWISE_STORE(source->parent_store); - CamelOfflineStore *offline = (CamelOfflineStore *) destination->parent_store; - CamelGroupwiseStorePrivate *priv = gw_store->priv; -- EGwConnectionStatus status; -+ EGwConnectionStatus status = E_GW_CONNECTION_STATUS_OK; - EGwConnection *cnc; - CamelFolderChangeInfo *changes = NULL; - - -=== modified file 'camel/providers/imap/camel-imap-store.c' ---- camel/providers/imap/camel-imap-store.c 2007-12-18 16:36:30 +0000 -+++ camel/providers/imap/camel-imap-store.c 2007-12-18 16:41:03 +0000 -@@ -702,6 +702,9 @@ - } - - #ifdef HAVE_SSL -+ /* as soon as we send a STARTTLS command, all hope is lost of a clean QUIT if problems arise */ -+ clean_quit = FALSE; -+ - if (!(store->capabilities & IMAP_CAPABILITY_STARTTLS)) { - camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, - _("Failed to connect to IMAP server %s in secure mode: %s"), -@@ -710,9 +713,6 @@ - goto exception; - } - -- /* as soon as we send a STARTTLS command, all hope is lost of a clean QUIT if problems arise */ -- clean_quit = FALSE; -- - response = camel_imap_command (store, NULL, ex, "STARTTLS"); - if (!response) { - camel_object_unref (store->istream); - -=== modified file 'camel/providers/pop3/camel-pop3-store.c' ---- camel/providers/pop3/camel-pop3-store.c 2007-12-18 16:36:30 +0000 -+++ camel/providers/pop3/camel-pop3-store.c 2007-12-18 16:41:03 +0000 -@@ -219,6 +219,9 @@ - } - - #ifdef HAVE_SSL -+ /* as soon as we send a STLS command, all hope is lost of a clean QUIT if problems arise */ -+ clean_quit = FALSE; -+ - if (!(store->engine->capa & CAMEL_POP3_CAP_STLS)) { - camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, - _("Failed to connect to POP server %s in secure mode: %s"), -@@ -226,9 +229,6 @@ - goto stls_exception; - } - -- /* as soon as we send a STLS command, all hope is lost of a clean QUIT if problems arise */ -- clean_quit = FALSE; -- - pc = camel_pop3_engine_command_new (store->engine, 0, NULL, NULL, "STLS\r\n"); - while (camel_pop3_engine_iterate (store->engine, NULL) > 0) - ; - -=== modified file 'libdb/dbm/dbm.c' ---- libdb/dbm/dbm.c 2007-12-18 16:36:30 +0000 -+++ libdb/dbm/dbm.c 2007-12-18 16:41:03 +0000 -@@ -128,7 +128,8 @@ - - if (__cur_db == NULL) { - __db_no_open(); -- item.dptr = 0; -+ item.dptr = NULL; -+ item.dsize = 0; - return (item); - } - return (dbm_fetch(__cur_db, key)); -@@ -141,7 +142,8 @@ - - if (__cur_db == NULL) { - __db_no_open(); -- item.dptr = 0; -+ item.dptr = NULL; -+ item.dsize = 0; - return (item); - } - return (dbm_firstkey(__cur_db)); -@@ -157,7 +159,8 @@ - - if (__cur_db == NULL) { - __db_no_open(); -- item.dptr = 0; -+ item.dptr = NULL; -+ item.dsize = 0; - return (item); - } - return (dbm_nextkey(__cur_db)); - diff --git a/evolution-data-server-2.21.91.tar.bz2 b/evolution-data-server-2.21.91.tar.bz2 deleted file mode 100644 index 62cb30f..0000000 --- a/evolution-data-server-2.21.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55f39234082c9728fcea8b9920c2fa3be777cda7578fe6f7f8ecf8556be47c80 -size 7487457 diff --git a/evolution-data-server-2.21.92.tar.bz2 b/evolution-data-server-2.21.92.tar.bz2 new file mode 100644 index 0000000..0f5c00b --- /dev/null +++ b/evolution-data-server-2.21.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:834a82c98f9b05af9690d4d3a464c8e37ce07d403fc51ada489afc4b19133709 +size 7567259 diff --git a/evolution-data-server-decl.patch b/evolution-data-server-decl.patch deleted file mode 100644 index c024219..0000000 --- a/evolution-data-server-decl.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'libedataserverui/e-name-selector-dialog.c' ---- libedataserverui/e-name-selector-dialog.c 2007-12-18 16:36:30 +0000 -+++ libedataserverui/e-name-selector-dialog.c 2007-12-18 16:37:45 +0000 -@@ -31,6 +31,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include - diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 631dc11..6424c69 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Mar 4 19:30:40 CET 2008 - maw@suse.de + +- Update to version 2.21.92: + + Bugs fixed: bnc#163982, bnc#164140, bgo#167638, bnc#183819, + bgo#445489, bgo#459468, bgo#469119, bgo#489043, bgo#489810, + bgo#510949, bgo#514836, bgo#516074, bgo#516408, bgo#516474, + bgo#517190, and bgo#517885 + + Fix some compilation warnings + + Updated translations +- Drop evolution-data-server-decl.patch, eds-warnings.patch, + bnc-164140-eds-crash-evolution--offline.patch, bnc-167638.patch, + and bnc-183819-evo-crashed-closing-offline.patch. + ------------------------------------------------------------------- Tue Feb 19 20:21:30 CET 2008 - maw@suse.de diff --git a/evolution-data-server.spec b/evolution-data-server.spec index d9ee6cd..3844bfe 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution-data-server (Version 2.21.91) +# spec file for package evolution-data-server (Version 2.21.92) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,20 +17,16 @@ License: GPL v2 or later Group: Development/Libraries/GNOME AutoReqProv: on Summary: Evolution Data Server -Version: 2.21.91 +Version: 2.21.92 Release: 1 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.21/%{name}-%{version}.tar.bz2 Patch0: evolution-data-server-configure.patch -Patch1: evolution-data-server-decl.patch -Patch2: eds-warnings.patch Patch3: bnc-164367-gw-attachments-appts-throw-error.patch +# PATCH-NEEDS-REBASE: bnc-163982-system-hang-with-126-error-popups.patch Patch4: bnc-163982-system-hang-with-126-error-popups.patch Patch5: bnc-152070-eds-crash.patch -Patch6: bnc-164140-eds-crash-evolution--offline.patch -Patch7: bnc-167638.patch # PATCH-NEEDS-REBASE: bnc-174255-honour-system-proxy-settings.patch Patch8: bnc-174255-honour-system-proxy-settings.patch -Patch9: bnc-183819-evo-crashed-closing-offline.patch Patch10: eds-compiler-warning.patch # PATCH-NEEDS-REBASE: evolution-data-server-1.11.5-cert-auth-complete.patch Patch11: evolution-data-server-1.11.5-cert-auth-complete.patch @@ -96,15 +92,10 @@ documentation. %prep %setup -q %patch0 -%patch1 -%patch2 %patch3 -%patch4 +#%patch4 %patch5 -%patch6 -%patch7 ###%patch8 -%patch9 %patch10 ###%patch11 ###%patch12 @@ -168,6 +159,17 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Tue Mar 04 2008 maw@suse.de +- Update to version 2.21.92: + + Bugs fixed: bnc#163982, bnc#164140, bgo#167638, bnc#183819, + bgo#445489, bgo#459468, bgo#469119, bgo#489043, bgo#489810, + bgo#510949, bgo#514836, bgo#516074, bgo#516408, bgo#516474, + bgo#517190, and bgo#517885 + + Fix some compilation warnings + + Updated translations +- Drop evolution-data-server-decl.patch, eds-warnings.patch, + bnc-164140-eds-crash-evolution--offline.patch, bnc-167638.patch, + and bnc-183819-evo-crashed-closing-offline.patch. * Tue Feb 19 2008 maw@suse.de - Update to version 2.21.91: + Bugs fixed: bnc#211353, bnc#324804, bnc#395939, bnc#505806,