- update evolution-data-server to 2.22.2

* support for google calendar
* faster spam filtering
* loads of bugs fixed

ok ajacoutot@
This commit is contained in:
jasper 2008-06-02 16:46:26 +00:00
parent 405682dc25
commit c0ebdf8547
8 changed files with 80 additions and 48 deletions

View File

@ -1,23 +1,24 @@
# $OpenBSD: Makefile,v 1.30 2008/06/02 14:10:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.31 2008/06/02 16:46:26 jasper Exp $
SHARED_ONLY= Yes
COMMENT= data backends for the Evolution mail/PIM suite
GNOME_PROJECT= evolution-data-server
GNOME_VERSION= 1.12.1
PKGNAME= ${DISTNAME}p7
GNOME_VERSION= 2.22.2
CATEGORIES= databases
SHARED_LIBS += edataserver-1.2 10.0 # .10.0
SHARED_LIBS += egroupwise-1.2 13.1 # .13.1
SHARED_LIBS += exchange-storage-1.2 3.0 # .3.0
SHARED_LIBS += camel-1.2 10.1 # .10.1
SHARED_LIBS += camel-provider-1.2 10.1 # .10.1
SHARED_LIBS += ebook-1.2 10.0 # .10.0
SHARED_LIBS += gdata-1.2 0.0 # .1.0
SHARED_LIBS += gdata-google-1.2 0.0 # .1.0
SHARED_LIBS += camel-1.2 11.0 # .11.0
SHARED_LIBS += camel-provider-1.2 11.0 # .11.0
SHARED_LIBS += ebook-1.2 10.1 # .10.1
SHARED_LIBS += edata-book-1.2 6.1 # .6.1
SHARED_LIBS += ecal-1.2 7.2 # .7.2
SHARED_LIBS += ecal-1.2 8.0 # .8.0
SHARED_LIBS += edata-cal-1.2 6.2 # .6.2
SHARED_LIBS += edataserverui-1.2 8.2 # .8.2
SHARED_LIBS += edataserverui-1.2 9.0 # .9.0
HOMEPAGE= http://www.gnome.org/projects/evolution/
@ -31,7 +32,7 @@ WANTLIB= ORBit-2 ORBitCosNaming-2 X11 Xau Xcomposite Xcursor \
Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \
asn1 atk-1.0 audiofile bonobo-2 bonobo-activation c \
cairo com_err crypto dbus-1 dbus-glib-1 esd expat fontconfig \
freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \
freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
glitz gmodule-2.0 gnomevfs-2 gobject-2.0 gssapi gthread-2.0 \
gtk-x11-2.0 krb5 m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pcre pixman-1 plc4 plds4 png popt pthread sasl2 ssl util xml2 z
@ -45,7 +46,7 @@ BUILD_DEPENDS= :bison-*:devel/bison \
LIB_DEPENDS= db:db-4.*:databases/db/v4 \
ldap,lber::databases/openldap \
glade-2.0::devel/libglade2 \
soup-2.2.>=0::devel/libsoup \
soup-2.4::devel/libsoup \
nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss \
gnome-2::x11/gnome/libgnome \
gnome-keyring.>=3::x11/gnome/keyring

View File

@ -1,5 +1,5 @@
MD5 (evolution-data-server-1.12.1.tar.bz2) = W02FXtHOqqt9sUtQEztSUg==
RMD160 (evolution-data-server-1.12.1.tar.bz2) = 6iTy46d+FtzNTDmNVYaIQYoGE7I=
SHA1 (evolution-data-server-1.12.1.tar.bz2) = PZHIfCV+4IC68PGC3UYHl1L0J+0=
SHA256 (evolution-data-server-1.12.1.tar.bz2) = GpMX2kRd0J1xCflrOzpqe/qWIRfdYy/5c1v39zD/AHk=
SIZE (evolution-data-server-1.12.1.tar.bz2) = 7465117
MD5 (evolution-data-server-2.22.2.tar.bz2) = TwDJL69fqF86FB68pAH8Ug==
RMD160 (evolution-data-server-2.22.2.tar.bz2) = kmdwRml7D0iyc60/s/v2VtrALls=
SHA1 (evolution-data-server-2.22.2.tar.bz2) = 0/wzgC/sUaFrAXq7dRb07XkxHfo=
SHA256 (evolution-data-server-2.22.2.tar.bz2) = 3Iaz9hzE+dsIAS3u5pJ3RWLPyTozEymFF/yoY5pus94=
SIZE (evolution-data-server-2.22.2.tar.bz2) = 7613774

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-calendar_libical_configure,v 1.1 2008/05/28 13:25:53 ajacoutot Exp $
--- calendar/libical/configure.orig Wed May 28 11:02:30 2008
+++ calendar/libical/configure Wed May 28 11:03:09 2008
@@ -20294,13 +20294,13 @@ _ACEOF
$OpenBSD: patch-calendar_libical_configure,v 1.2 2008/06/02 16:46:26 jasper Exp $
--- calendar/libical/configure.orig Fri Apr 4 13:21:47 2008
+++ calendar/libical/configure Sun Jun 1 00:55:23 2008
@@ -20285,13 +20285,13 @@ _ACEOF
PTHREAD_LIBS=-pthread;;
*)
@ -18,7 +18,7 @@ $OpenBSD: patch-calendar_libical_configure,v 1.1 2008/05/28 13:25:53 ajacoutot E
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20365,7 +20365,7 @@ cat >>confdefs.h <<\_ACEOF
@@ -20356,7 +20356,7 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_PTHREAD
_ACEOF

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-calendar_libical_src_libical_icaltz-util_c,v 1.2 2008/05/12 13:48:55 jasper Exp $
--- calendar/libical/src/libical/icaltz-util.c.orig Fri Oct 12 08:31:10 2007
+++ calendar/libical/src/libical/icaltz-util.c Tue May 6 18:10:02 2008
$OpenBSD: patch-calendar_libical_src_libical_icaltz-util_c,v 1.3 2008/06/02 16:46:26 jasper Exp $
--- calendar/libical/src/libical/icaltz-util.c.orig Fri Apr 4 11:05:52 2008
+++ calendar/libical/src/libical/icaltz-util.c Sun Jun 1 10:07:57 2008
@@ -23,6 +23,15 @@
#include <string.h>
#if defined(sun) && defined(__SVR4)
@ -15,18 +15,9 @@ $OpenBSD: patch-calendar_libical_src_libical_icaltz-util_c,v 1.2 2008/05/12 13:4
+#define bswap_32 swap32
+#define bswap_64 swap64
#else
#include <byteswap.h>
#include <endian.h>
@@ -148,7 +157,7 @@ find_transidx (time_t *transitions, ttinfo *types, int
idx = trans_idx [i];
types [idx].isdst ? (*dstidx = i) : (*stdidx = i);
- if (i >= num_trans)
+ if (i >= num_trans - 1)
i--;
else
i++;
@@ -328,7 +337,10 @@ icaltzutil_fetch_timezone (const char *location)
#ifdef _WIN32
#define BIG_ENDIAN 'B'
@@ -335,7 +344,10 @@ icaltzutil_fetch_timezone (const char *location)
icalprop = icalproperty_new_tzname (types [zidx].zname);
icalcomponent_add_property (std_comp, icalprop);
@ -38,7 +29,7 @@ $OpenBSD: patch-calendar_libical_src_libical_icaltz-util_c,v 1.2 2008/05/12 13:4
icaltime = icaltime_from_timet (trans, 0);
dtstart = icaltime;
dtstart.year = 1970;
@@ -369,7 +381,10 @@ icaltzutil_fetch_timezone (const char *location)
@@ -376,7 +388,10 @@ icaltzutil_fetch_timezone (const char *location)
icalprop = icalproperty_new_tzname (types [zidx].zname);
icalcomponent_add_property (dst_comp, icalprop);

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2008/05/28 13:25:53 ajacoutot Exp $
--- configure.orig Sun Oct 14 19:45:52 2007
+++ configure Wed May 28 11:01:52 2008
@@ -27390,7 +27390,7 @@ if test "x${with_krb5}" != "xno"; then
$OpenBSD: patch-configure,v 1.6 2008/06/02 16:46:26 jasper Exp $
--- configure.orig Sun May 25 12:42:26 2008
+++ configure Sun Jun 1 00:55:23 2008
@@ -27758,7 +27758,7 @@ if test "x${with_krb5}" != "xno"; then
LDFLAGS_save="$LDFLAGS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.5 2008/05/28 13:25:53 ajacoutot Exp $
sunlibs="-lkrb5 -lgss"
{ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; }
@@ -27409,8 +27409,7 @@ cat >>conftest.$ac_ext <<_ACEOF
@@ -27777,8 +27777,7 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
@ -20,7 +20,7 @@ $OpenBSD: patch-configure,v 1.5 2008/05/28 13:25:53 ajacoutot Exp $
return 0;
}
_ACEOF
@@ -29824,13 +29823,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
@@ -30195,13 +30194,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
PTHREAD_LIB=""
@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.5 2008/05/28 13:25:53 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29886,7 +29885,7 @@ fi
@@ -30257,7 +30256,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
if test $ac_cv_lib_pthread_pthread_create = yes; then

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-docs_reference_camel_Makefile_in,v 1.1 2008/06/02 16:46:26 jasper Exp $
--- docs/reference/camel/Makefile.in.orig Sun Jun 1 00:57:33 2008
+++ docs/reference/camel/Makefile.in Sun Jun 1 00:57:55 2008
@@ -689,8 +689,9 @@ install-data-local:
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
- which gtkdoc-rebase >/dev/null && \
+ if test "`whereis gtkdoc-rebase`" != ""; then \
gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+ fi \
fi
uninstall-local:

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libedataserver_e-dbhash_c,v 1.1 2007/11/21 16:10:24 jasper Exp $
--- libedataserver/e-dbhash.c.orig Sun Oct 28 11:37:41 2007
+++ libedataserver/e-dbhash.c Sun Oct 28 11:38:48 2007
$OpenBSD: patch-libedataserver_e-dbhash_c,v 1.2 2008/06/02 16:46:26 jasper Exp $
--- libedataserver/e-dbhash.c.orig Fri Apr 4 11:02:20 2008
+++ libedataserver/e-dbhash.c Sun Jun 1 00:55:23 2008
@@ -12,7 +12,7 @@
#include <string.h>
@ -9,4 +9,4 @@ $OpenBSD: patch-libedataserver_e-dbhash_c,v 1.1 2007/11/21 16:10:24 jasper Exp $
+#include <db4/db.h>
#include "md5-utils.h"
struct _EDbHashPrivate
struct _EDbHashPrivate

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2008/05/01 10:15:04 bernd Exp $
@comment $OpenBSD: PLIST,v 1.11 2008/06/02 16:46:26 jasper Exp $
include/evolution-data-server-${R}/
include/evolution-data-server-${R}/camel/
include/evolution-data-server-${R}/camel/broken-date-parser.h
@ -152,6 +152,13 @@ include/evolution-data-server-${R}/exchange/exchange-hierarchy.h
include/evolution-data-server-${R}/exchange/exchange-oof.h
include/evolution-data-server-${R}/exchange/exchange-types.h
include/evolution-data-server-${R}/exchange/mapi.h
include/evolution-data-server-${R}/google/
include/evolution-data-server-${R}/google/gdata/
include/evolution-data-server-${R}/google/gdata-google/
include/evolution-data-server-${R}/google/gdata-google/gdata-google-service.h
include/evolution-data-server-${R}/google/gdata/gdata-entry.h
include/evolution-data-server-${R}/google/gdata/gdata-feed.h
include/evolution-data-server-${R}/google/gdata/gdata-service-iface.h
include/evolution-data-server-${R}/groupwise/
include/evolution-data-server-${R}/groupwise/e-gw-connection.h
include/evolution-data-server-${R}/groupwise/e-gw-container.h
@ -161,6 +168,8 @@ include/evolution-data-server-${R}/groupwise/e-gw-message.h
include/evolution-data-server-${R}/groupwise/e-gw-proxy.h
include/evolution-data-server-${R}/groupwise/e-gw-recur-utils.h
include/evolution-data-server-${R}/groupwise/e-gw-sendoptions.h
include/evolution-data-server-${R}/groupwise/soup-soap-message.h
include/evolution-data-server-${R}/groupwise/soup-soap-response.h
include/evolution-data-server-${R}/libebook/
include/evolution-data-server-${R}/libebook/e-address-western.h
include/evolution-data-server-${R}/libebook/e-book-query.h
@ -235,6 +244,7 @@ include/evolution-data-server-${R}/libedataserver/md5-utils.h
include/evolution-data-server-${R}/libedataserverui/
include/evolution-data-server-${R}/libedataserverui/e-book-auth-util.h
include/evolution-data-server-${R}/libedataserverui/e-categories-dialog.h
include/evolution-data-server-${R}/libedataserverui/e-cell-renderer-color.h
include/evolution-data-server-${R}/libedataserverui/e-contact-store.h
include/evolution-data-server-${R}/libedataserverui/e-destination-store.h
include/evolution-data-server-${R}/libedataserverui/e-name-selector-dialog.h
@ -243,6 +253,7 @@ include/evolution-data-server-${R}/libedataserverui/e-name-selector-list.h
include/evolution-data-server-${R}/libedataserverui/e-name-selector-model.h
include/evolution-data-server-${R}/libedataserverui/e-name-selector.h
include/evolution-data-server-${R}/libedataserverui/e-passwords.h
include/evolution-data-server-${R}/libedataserverui/e-source-combo-box.h
include/evolution-data-server-${R}/libedataserverui/e-source-option-menu.h
include/evolution-data-server-${R}/libedataserverui/e-source-selector-dialog.h
include/evolution-data-server-${R}/libedataserverui/e-source-selector.h
@ -350,6 +361,9 @@ lib/evolution-data-server-1.2/extensions/libecalbackendcontacts.so
lib/evolution-data-server-1.2/extensions/libecalbackendfile.a
lib/evolution-data-server-1.2/extensions/libecalbackendfile.la
lib/evolution-data-server-1.2/extensions/libecalbackendfile.so
lib/evolution-data-server-1.2/extensions/libecalbackendgoogle.a
lib/evolution-data-server-1.2/extensions/libecalbackendgoogle.la
lib/evolution-data-server-1.2/extensions/libecalbackendgoogle.so
lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.a
lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.la
lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.so
@ -389,6 +403,12 @@ lib/libegroupwise-1.2.la
lib/libexchange-storage-1.2.a
lib/libexchange-storage-1.2.la
@lib lib/libexchange-storage-1.2.so.${LIBexchange-storage-1.2_VERSION}
lib/libgdata-1.2.a
lib/libgdata-1.2.la
@lib lib/libgdata-1.2.so.${LIBgdata-1.2_VERSION}
lib/libgdata-google-1.2.a
lib/libgdata-google-1.2.la
@lib lib/libgdata-google-1.2.so.${LIBgdata-google-1.2_VERSION}
lib/pkgconfig/camel-1.2.pc
lib/pkgconfig/camel-provider-1.2.pc
lib/pkgconfig/evolution-data-server-1.2.pc
@ -400,6 +420,8 @@ lib/pkgconfig/libedataserver-1.2.pc
lib/pkgconfig/libedataserverui-1.2.pc
lib/pkgconfig/libegroupwise-1.2.pc
lib/pkgconfig/libexchange-storage-1.2.pc
lib/pkgconfig/libgdata-1.2.pc
lib/pkgconfig/libgdata-google-1.2.pc
libexec/camel-index-control-1.2
@mode 4555
libexec/camel-lock-helper-1.2
@ -633,6 +655,7 @@ share/gtk-doc/html/libedataserverui/ENameSelectorDialog.html
share/gtk-doc/html/libedataserverui/ENameSelectorEntry.html
share/gtk-doc/html/libedataserverui/ENameSelectorList.html
share/gtk-doc/html/libedataserverui/ENameSelectorModel.html
share/gtk-doc/html/libedataserverui/ESourceComboBox.html
share/gtk-doc/html/libedataserverui/ESourceOptionMenu.html
share/gtk-doc/html/libedataserverui/ESourceSelector.html
share/gtk-doc/html/libedataserverui/ESourceSelectorDialog.html
@ -643,6 +666,7 @@ share/gtk-doc/html/libedataserverui/index.html
share/gtk-doc/html/libedataserverui/index.sgml
share/gtk-doc/html/libedataserverui/ix01.html
share/gtk-doc/html/libedataserverui/left.png
share/gtk-doc/html/libedataserverui/libedataserverui-ECellRendererColor.html
share/gtk-doc/html/libedataserverui/libedataserverui-e-book-auth-util.html
share/gtk-doc/html/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
share/gtk-doc/html/libedataserverui/libedataserverui-e-passwords.html
@ -694,6 +718,7 @@ share/locale/is/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/it/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/ja/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/ka/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/kn/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/ko/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/ku/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/lt/LC_MESSAGES/evolution-data-server-${R}.mo
@ -716,6 +741,7 @@ share/locale/pt_BR/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/ro/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/ru/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/rw/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/si/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/sk/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/sl/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/sq/LC_MESSAGES/evolution-data-server-${R}.mo