diff --git a/.cvsignore b/.cvsignore index 776d012..f9a43b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-data-server-1.11.5.tar.bz2 +evolution-data-server-1.11.6.tar.bz2 diff --git a/evolution-data-server-1.11.5-version-checks.patch b/evolution-data-server-1.11.5-version-checks.patch deleted file mode 100644 index 189172e..0000000 --- a/evolution-data-server-1.11.5-version-checks.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- evolution-data-server-1.11.5/configure.in.version-checks 2007-07-27 09:16:57.000000000 -0400 -+++ evolution-data-server-1.11.5/configure.in 2007-07-27 09:31:27.000000000 -0400 -@@ -12,6 +12,16 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PAC - - AM_CONFIG_HEADER(config.h) - -+# Required Package Versions -+m4_define([gtk_minimum_version], [2.10.0]) -+m4_define([ORBit_minimum_version], [2.9.8]) -+m4_define([gnome_vfs_minimum_version], [2.4.0]) -+m4_define([libbonobo_minimum_version], [2.4.2]) -+m4_define([gconf_minimum_version], [2.0.0]) # XXX Just a Guess -+m4_define([libglade_minimum_version], [2.0.0]) # XXX Just a Guess -+m4_define([libgnome_minimum_version], [2.0.0]) # XXX Just a Guess -+m4_define([libxml_minimum_version], [2.0.0]) # XXX Just a Guess -+ - dnl ************************************************************************************************* - dnl Base Version - dnl -@@ -180,6 +190,17 @@ AC_CHECK_FUNCS(fsync strptime strtok_r) - dnl alloca() - AC_CHECK_HEADERS(alloca.h) - -+# Check for base dependencies early. -+PKG_CHECK_MODULES(GNOME_PLATFORM, -+ [gtk+-2.0 >= gtk_minimum_version -+ ORBit-2.0 >= ORBit_minimum_version -+ gnome-vfs-2.0 >= gnome_vfs_minimum_version -+ libbonobo-2.0 >= libbonobo_minimum_version -+ gconf-2.0 >= gconf_minimum_version -+ libglade-2.0 >= libglade_minimum_version -+ libgnome-2.0 >= libgnome_minimum_version -+ libxml-2.0 >= libxml_minimum_version]) -+ - dnl ************************************************** - dnl * regex checking - dnl ************************************************** -@@ -1264,12 +1285,10 @@ msg_no_ntlm="no" - msg_exchange="yes" - fi # Win32 - --GLIB_REQUIRED="2.10.0" --LIBBONOBO_REQUIRED="2.4.2" --ORBIT_REQUIRED="2.9.8" -- --AC_SUBST(GLIB_REQUIRED) -+LIBBONOBO_REQUIRED=libbonobo_minimum_version - AC_SUBST(LIBBONOBO_REQUIRED) -+ -+ORBIT_REQUIRED=ORBit_minimum_version - AC_SUBST(ORBIT_REQUIRED) - - dnl ******************* -@@ -1318,7 +1337,7 @@ case $CFLAGS in - ;; - esac - --PKG_CHECK_MODULES(ORBIT, ORBit-2.0 >= 2.9.8) -+PKG_CHECK_MODULES(ORBIT, ORBit-2.0 >= ORBit_minimum_version) - ORBIT_IDL=`$PKG_CONFIG --variable=orbit_idl ORBit-2.0` - AC_SUBST(ORBIT_CFLAGS) - AC_SUBST(ORBIT_LIBS) -@@ -1348,13 +1367,13 @@ dnl ************************************ - - dnl --- libedataserver and libedataserverui flags - --E_DATA_SERVER_DEPS="libxml-2.0 gobject-2.0 >= $GLIB_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED gconf-2.0 $mozilla_nspr" -+E_DATA_SERVER_DEPS="libxml-2.0 libbonobo-2.0 gconf-2.0 $mozilla_nspr" - - EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) - AC_SUBST(E_DATA_SERVER_CFLAGS) - AC_SUBST(E_DATA_SERVER_LIBS) - --E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0 gnome-vfs-2.0 $GNOME_KEYRING_REQUIREMENT" -+E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 libgnome-2.0 gnome-vfs-2.0 $GNOME_KEYRING_REQUIREMENT" - - EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS) - AC_SUBST(E_DATA_SERVER_UI_CFLAGS) -@@ -1362,7 +1381,7 @@ AC_SUBST(E_DATA_SERVER_UI_LIBS) - - dnl --- evolution-addressbook flags - --EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0" -+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 libgnome-2.0 gnome-vfs-2.0" - - EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) - AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) -@@ -1370,7 +1389,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) - - dnl --- evolution-calendar flags - if test "x${enable_calendar}" = "xyes"; then -- EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0" -+ EVOLUTION_CALENDAR_DEPS="libxml-2.0 libgnome-2.0 gnome-vfs-2.0" - - EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS) - AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) -@@ -1379,7 +1398,7 @@ fi - - dnl --- factory flags - --E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED gconf-2.0 gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr" -+E_FACTORY_DEPS="gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr" - - EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) - AC_SUBST(E_FACTORY_CFLAGS) -@@ -1430,7 +1449,7 @@ AC_CACHE_CHECK([if large files (>2 GB) a - ]) - ]) - --EVO_SET_COMPILE_FLAGS(CAMEL, gthread-2.0 gmodule-2.0 gobject-2.0 $mozilla_nss gnome-vfs-2.0, -+EVO_SET_COMPILE_FLAGS(CAMEL, $mozilla_nss gnome-vfs-2.0, - $THREADS_CFLAGS $KRB4_CFLAGS $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, - -lz $THREADS_LIBS $KRB4_LDFLAGS $KRB5_LDFLAGS $MANUAL_NSS_LIBS) - AC_SUBST(CAMEL_CFLAGS) diff --git a/evolution-data-server-1.11.6-implicit-function-declaration.patch b/evolution-data-server-1.11.6-implicit-function-declaration.patch new file mode 100644 index 0000000..8bb0a32 --- /dev/null +++ b/evolution-data-server-1.11.6-implicit-function-declaration.patch @@ -0,0 +1,10 @@ +--- evolution-data-server-1.11.6/calendar/libical/src/libical/icaltimezone.c.implicit-function-declaration 2007-07-31 07:19:20.000000000 -0400 ++++ evolution-data-server-1.11.6/calendar/libical/src/libical/icaltimezone.c 2007-07-31 07:19:41.000000000 -0400 +@@ -30,6 +30,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include diff --git a/evolution-data-server-1.8.0-no-gnome-common.patch b/evolution-data-server-1.8.0-no-gnome-common.patch index c9ab621..edb557f 100644 --- a/evolution-data-server-1.8.0-no-gnome-common.patch +++ b/evolution-data-server-1.8.0-no-gnome-common.patch @@ -1,160 +1,3 @@ ---- evolution-data-server-1.10.1/configure.no-gnome-common 2007-04-09 12:15:42.000000000 -0400 -+++ evolution-data-server-1.10.1/configure 2007-04-09 12:16:10.000000000 -0400 -@@ -32298,154 +32298,6 @@ - - - -- # Check whether --enable-compile-warnings was given. --if test "${enable_compile_warnings+set}" = set; then -- enableval=$enable_compile_warnings; --else -- enable_compile_warnings="yes" --fi -- -- -- warnCFLAGS= -- if test "x$GCC" != xyes; then -- enable_compile_warnings=no -- fi -- -- warning_flags= -- realsave_CFLAGS="$CFLAGS" -- -- case "$enable_compile_warnings" in -- no) -- warning_flags= -- ;; -- minimum) -- warning_flags="-Wall" -- ;; -- yes) -- warning_flags="-Wall -Wmissing-prototypes" -- ;; -- maximum|error) -- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" -- CFLAGS="$warning_flags $CFLAGS" -- for option in -Wno-sign-compare; do -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 --echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- has_option=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- has_option=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$SAVE_CFLAGS" -- { echo "$as_me:$LINENO: result: $has_option" >&5 --echo "${ECHO_T}$has_option" >&6; } -- if test $has_option = yes; then -- warning_flags="$warning_flags $option" -- fi -- unset has_option -- unset SAVE_CFLAGS -- done -- unset option -- if test "$enable_compile_warnings" = "error" ; then -- warning_flags="$warning_flags -Werror" -- fi -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 --echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- esac -- CFLAGS="$realsave_CFLAGS" -- { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } -- { echo "$as_me:$LINENO: result: $warning_flags" >&5 --echo "${ECHO_T}$warning_flags" >&6; } -- -- # Check whether --enable-iso-c was given. --if test "${enable_iso_c+set}" = set; then -- enableval=$enable_iso_c; --else -- enable_iso_c=no --fi -- -- -- { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } -- complCFLAGS= -- if test "x$enable_iso_c" != "xno"; then -- if test "x$GCC" = "xyes"; then -- case " $CFLAGS " in -- *\ \ -ansi\ \ *) ;; -- *) complCFLAGS="$complCFLAGS -ansi" ;; -- esac -- case " $CFLAGS " in -- *\ \ -pedantic\ \ *) ;; -- *) complCFLAGS="$complCFLAGS -pedantic" ;; -- esac -- fi -- fi -- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 --echo "${ECHO_T}$complCFLAGS" >&6; } -- -- WARN_CFLAGS="$warning_flags $complCFLAGS" -- -- --CFLAGS="$CFLAGS $WARN_CFLAGS" - case $CFLAGS in - *-Wall*) - # Turn off the annoying "comparison between signed and unsigned" --- evolution-data-server-1.10.1/configure.in.no-gnome-common 2007-04-09 08:44:46.000000000 -0400 +++ evolution-data-server-1.10.1/configure.in 2007-04-09 12:15:42.000000000 -0400 @@ -1209,8 +1209,6 @@ 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 deleted file mode 100644 index 694b257..0000000 --- a/evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- 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.spec b/evolution-data-server.spec index 9137711..ce5ef12 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -25,8 +25,8 @@ ### Abstract ### Name: evolution-data-server -Version: 1.11.5 -Release: 3%{?dist} +Version: 1.11.6 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -66,8 +66,8 @@ Patch20: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch # RH bug #243296 Patch21: evolution-data-server-1.11.5-fix-64bit-acinclude.patch -# GNOME bug #380534 -Patch22: evolution-data-server-1.11.5-version-checks.patch +# Implicit Function Declarations +Patch22: evolution-data-server-1.11.6-implicit-function-declaration.patch ### Dependencies ### @@ -158,7 +158,7 @@ evolution-data-server. %patch19 -p1 -b .camel-folder-symmary-crash %patch20 -p1 -b .camel-certdb-nss-cert-get %patch21 -p1 -b .fix-64bit-acinclude -%patch22 -p1 -b .version-checks +%patch22 -p1 -b .implicit-function-declaration mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -253,7 +253,7 @@ CFLAGS="$CFLAGS \ -Werror-implicit-function-declaration" %endif -# Regenerate configure to pick up acinclude.m4 changes. +# Regenerate configure to pick up configure.in and acinclude.m4 changes. aclocal autoheader automake @@ -391,6 +391,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Tue Jul 31 2007 Matthew Barnes - 1.11.6-1.fc8 +- Update to 1.11.6 +- Remove patch for GNOME bug #380534 (fixed upstream). + * Fri Jul 27 2007 Matthew Barnes - 1.11.5-3.fc8 - Add patch for GNOME bug #380534 (clarify version requirements). diff --git a/sources b/sources index bd88319..ab1bd43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dee29c721dd45f5782562c5f764965f3 evolution-data-server-1.11.5.tar.bz2 +d8449061c942acecb7facd049d248c37 evolution-data-server-1.11.6.tar.bz2