From e85c913a73f13e1c6a64876f44af4491872c197d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Oct 16 2006 18:58:11 +0000 Subject: - Update to 1.8.1 - Use stricter build settings. - Add patch for Gnome.org bug #360240 ("unused variable" warnings). - Add patch for Gnome.org bug #360619 ("incompatible pointer type" warnings). - Add patch for Gnome.org bug #362638 (deprecate EThread). - Remove patch for RH bug #198935 (fixed upstream). - Remove patch for RH bug #205187 (fixed upstream). - Remove patch for Gnome.org bug #353478 (fixed upstream). - Remove patch for Gnome.org bug #356828 (fixed upstream). - Remove patch for Gnome.org bug #357666 (fixed upstream). --- diff --git a/.cvsignore b/.cvsignore index 3070258..c2af9b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-data-server-1.8.0.tar.bz2 +evolution-data-server-1.8.1.tar.bz2 diff --git a/evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch b/evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch new file mode 100644 index 0000000..694b257 --- /dev/null +++ b/evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch @@ -0,0 +1,94 @@ +--- evolution-data-server-1.8.1/libedataserverui/e-name-selector-dialog.c.warn-incompatible-pointer-type 2006-08-19 07:11:53.000000000 -0400 ++++ evolution-data-server-1.8.1/libedataserverui/e-name-selector-dialog.c 2006-10-08 22:10:10.000000000 -0400 +@@ -541,7 +541,7 @@ + section.remove_button = GTK_BUTTON (gtk_button_new()); + section.destination_view = GTK_TREE_VIEW (gtk_tree_view_new ()); + +- gtk_label_set_mnemonic_widget (GTK_LABEL (section.label), section.destination_view); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (section.label), GTK_WIDGET (section.destination_view)); + + if (pango_parse_markup (pretty_name, -1, '_', NULL, + &text, NULL, NULL)) { +--- evolution-data-server-1.8.1/libedataserver/e-data-server-module.c.warn-incompatible-pointer-type 2006-05-10 00:36:46.000000000 -0400 ++++ evolution-data-server-1.8.1/libedataserver/e-data-server-module.c 2006-10-08 22:10:10.000000000 -0400 +@@ -270,5 +270,5 @@ + void + e_data_server_module_remove_unused (void) + { +- g_list_foreach (module_objects, g_object_unref, NULL); ++ g_list_foreach (module_objects, (GFunc) g_object_unref, NULL); + } +--- evolution-data-server-1.8.1/camel/providers/nntp/camel-nntp-store-summary.c.warn-incompatible-pointer-type 2006-04-20 04:52:55.000000000 -0400 ++++ evolution-data-server-1.8.1/camel/providers/nntp/camel-nntp-store-summary.c 2006-10-08 22:10:10.000000000 -0400 +@@ -249,7 +249,7 @@ + } else { + if (c == '/') + c = dir_sep; +- camel_utf8_putc(&f, c); ++ camel_utf8_putc((unsigned char **) &f, c); + } + break; + case 1: +@@ -259,11 +259,11 @@ + case 2: + state = 0; + v |= hexnib (c); +- camel_utf8_putc (&f, v); ++ camel_utf8_putc ((unsigned char **) &f, v); + break; + } + } +- camel_utf8_putc (&f, c); ++ camel_utf8_putc ((unsigned char **) &f, c); + + /* merge old path part if required */ + f = camel_utf8_utf7 (full); +--- evolution-data-server-1.8.1/camel/providers/imap/camel-imap-store-summary.c.warn-incompatible-pointer-type 2006-04-20 04:52:54.000000000 -0400 ++++ evolution-data-server-1.8.1/camel/providers/imap/camel-imap-store-summary.c 2006-10-08 22:10:10.000000000 -0400 +@@ -256,7 +256,7 @@ + else { + if (c == '/') + c = dir_sep; +- camel_utf8_putc(&f, c); ++ camel_utf8_putc((unsigned char **) &f, c); + } + break; + case 1: +@@ -266,11 +266,11 @@ + case 2: + state = 0; + v |= hexnib(c); +- camel_utf8_putc(&f, v); ++ camel_utf8_putc((unsigned char **) &f, v); + break; + } + } +- camel_utf8_putc(&f, c); ++ camel_utf8_putc((unsigned char **) &f, c); + + /* merge old path part if required */ + f = g_strdup(full); +--- evolution-data-server-1.8.1/camel/providers/groupwise/camel-groupwise-utils.c.warn-incompatible-pointer-type 2006-07-22 06:58:51.000000000 -0400 ++++ evolution-data-server-1.8.1/camel/providers/groupwise/camel-groupwise-utils.c 2006-10-08 22:10:10.000000000 -0400 +@@ -442,8 +442,8 @@ + + charset = camel_content_type_param (type, "charset"); + if (charset && g_ascii_strcasecmp (charset, "US-ASCII") && g_ascii_strcasecmp (charset, "UTF-8")) { +- filter = camel_mime_filter_charset_new_convert (charset, "UTF-8"); +- filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) content); ++ filter = (CamelMimeFilter *) camel_mime_filter_charset_new_convert (charset, "UTF-8"); ++ filtered_stream = (CamelStream *) camel_stream_filter_new_with_stream ((CamelStream *) content); + camel_stream_filter_add ((CamelStreamFilter *) filtered_stream, filter); + camel_object_unref (filter); + } else { +@@ -665,8 +665,8 @@ + + charset = camel_content_type_param (type, "charset"); + if (charset && g_ascii_strcasecmp (charset, "US-ASCII") && g_ascii_strcasecmp (charset, "UTF-8")) { +- filter = camel_mime_filter_charset_new_convert (charset, "UTF-8"); +- filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) content); ++ filter = (CamelMimeFilter *) camel_mime_filter_charset_new_convert (charset, "UTF-8"); ++ filtered_stream = (CamelStream *) camel_stream_filter_new_with_stream ((CamelStream *) content); + camel_stream_filter_add ((CamelStreamFilter *) filtered_stream, filter); + camel_object_unref (filter); + } else { diff --git a/evolution-data-server-1.8.1-warn-unused-variable.patch b/evolution-data-server-1.8.1-warn-unused-variable.patch new file mode 100644 index 0000000..98293ba --- /dev/null +++ b/evolution-data-server-1.8.1-warn-unused-variable.patch @@ -0,0 +1,28 @@ +--- evolution-data-server-1.8.1/camel/providers/groupwise/camel-groupwise-folder.c.warn-unused-variable 2006-09-02 02:36:55.000000000 -0400 ++++ evolution-data-server-1.8.1/camel/providers/groupwise/camel-groupwise-folder.c 2006-10-08 22:09:18.000000000 -0400 +@@ -1137,7 +1137,6 @@ + CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER(folder); + CamelGroupwiseStorePrivate *priv = gw_store->priv; + EGwConnection *cnc = cnc_lookup (priv); +- GSList *attach_list = NULL; + guint32 item_status, status_flags = 0; + CamelFolderChangeInfo *changes = NULL; + gboolean exists = FALSE; +@@ -1369,7 +1368,6 @@ + { + CamelGroupwiseMessageInfo *mi = NULL; + CamelGroupwiseStore *gw_store = CAMEL_GROUPWISE_STORE (folder->parent_store); +- GSList *attach_list = NULL; + guint32 item_status, status_flags = 0; + CamelFolderChangeInfo *changes = NULL; + gboolean exists = FALSE; +--- evolution-data-server-1.8.1/camel/camel-stream-vfs.c.warn-unused-variable 2006-09-02 02:36:54.000000000 -0400 ++++ evolution-data-server-1.8.1/camel/camel-stream-vfs.c 2006-10-08 22:09:18.000000000 -0400 +@@ -121,7 +121,6 @@ + { + CamelStreamVFS *stream_vfs; + off_t offset; +- GnomeVFSResult result; + + if (!handle) + return NULL; diff --git a/evolution-data-server.spec b/evolution-data-server.spec index caaf0fd..18b7bc3 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -24,8 +24,8 @@ ### Abstract ### Name: evolution-data-server -Version: 1.8.0 -Release: 11%{?dist} +Version: 1.8.1 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -48,26 +48,20 @@ Patch14: evolution-data-server-1.8.0-no-gnome-common.patch # RH bug #202309 Patch15: evolution-data-server-1.7.91-maybe-fix-crash.patch -# RH bug #198935 / Gnome.org bug #350907 -Patch16: evolution-data-server-1.7.92-fix-fd-leak.patch - -# Gnome.org bug #353478 -Patch17: evolution-data-server-1.7.92-chain-finalize.patch - # RH bug #198935 / Gnome.org bug #348888 -Patch18: evolution-data-server-1.8.0-emsgport.patch +Patch16: evolution-data-server-1.8.0-emsgport.patch -# RH bug #205187 / Gnome.org bug #356927 -Patch19: evolution-data-server-1.8.0-fix-ecal-crash.patch +# RH bug #203915 +Patch17: evolution-data-server-1.8.0-fix-camel-malloc.patch -# Gnome.org bug #356828 -Patch20: evolution-data-server-1.8.0-uninstall.patch +# Gnome.org bug #360240 +Patch18: evolution-data-server-1.8.1-warn-unused-variable.patch -# Gnome.org bug #357666 -Patch21: evolution-data-server-1.8.0-deprecated-glib.patch +# Gnome.org bug #360619 +Patch19: evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch -# RH bug #203915 -Patch22: evolution-data-server-1.8.0-fix-camel-malloc.patch +# Gnome.org bug #362638 +Patch20: evolution-data-server-1.8.1-ethread.patch ### Dependencies ### @@ -153,13 +147,11 @@ cp %{SOURCE2} calendar/libical/zoneinfo/Asia %patch13 -p1 -b .fix-implicit-function-declarations %patch14 -p1 -b .no-gnome-common %patch15 -p1 -b .maybe-fix-crash -%patch16 -p1 -b .fix-fd-leak -%patch17 -p1 -b .chain-finalize -%patch18 -p1 -b .emsgport -%patch19 -p1 -b .fix-ecal-crash -%patch20 -p1 -b .uninstall -%patch21 -p1 -b .deprecated-glib -%patch22 -p1 -b .fix-camel-malloc +%patch16 -p1 -b .emsgport +%patch17 -p1 -b .fix-camel-malloc +%patch18 -p1 -b .warn-unused-variable +%patch19 -p1 -b .warn-incompatible-pointer-type +%patch20 -p1 -b .ethread mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -377,6 +369,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Mon Oct 16 2006 Matthew Barnes - 1.8.1-1.fc7 +- Update to 1.8.1 +- Use stricter build settings. +- Add patch for Gnome.org bug #360240 ("unused variable" warnings). +- Add patch for Gnome.org bug #360619 ("incompatible pointer type" warnings). +- Add patch for Gnome.org bug #362638 (deprecate EThread). +- Remove patch for RH bug #198935 (fixed upstream). +- Remove patch for RH bug #205187 (fixed upstream). +- Remove patch for Gnome.org bug #353478 (fixed upstream). +- Remove patch for Gnome.org bug #356828 (fixed upstream). +- Remove patch for Gnome.org bug #357666 (fixed upstream). + * Tue Sep 26 2006 Matthew Barnes - 1.8.0-11.fc6 - Add patch for RH bug #203915 (fix dangerous mallocs in camel). diff --git a/sources b/sources index dfa198a..d57ece9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53f0885731440cb9cf0ca0601dd2105f evolution-data-server-1.8.0.tar.bz2 +8c2fe35bcdc457e09728ed213e915d01 evolution-data-server-1.8.1.tar.bz2