- bugfix update evolution to 2.24.4

- explicitly depend on latest e-d-s (for CAMEL_STORE_IS_MIGRATING)
- resolve an XXX

ok ajacoutot@
This commit is contained in:
jasper 2009-01-31 08:32:35 +00:00
parent d494caf6cb
commit 16eaab8367
4 changed files with 17 additions and 30 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.56 2009/01/30 21:36:48 sturm Exp $
# $OpenBSD: Makefile,v 1.57 2009/01/31 08:32:35 jasper Exp $
COMMENT= integrated email and PIM software for GNOME
# NOTE: when major version changes, increment EVO_VERSION accordingly
# in mail/evolution-plugin-rss/Makefile (and bump).
GNOME_PROJECT= evolution
GNOME_VERSION= 2.24.3
PKGNAME= ${DISTNAME}p1
GNOME_VERSION= 2.24.4
CATEGORIES= mail
@ -49,10 +48,9 @@ BUILD_DEPENDS= ::devel/bison \
::textproc/rarian \
::x11/gnome/doc-utils \
::misc/shared-mime-info
RUN_DEPENDS= ::devel/desktop-file-utils \
::textproc/rarian \
RUN_DEPENDS= ::textproc/rarian \
::x11/hicolor-icon-theme
LIB_DEPENDS= camel-1.2,camel-provider-1.2,ebackend-1.2,ebook-1.2,ecal-1.2,edataserver-1.2,edataserverui-1.2,egroupwise-1.2,exchange-storage-1.2,gdata-1.2,gdata-google-1.2::databases/evolution-data-server \
LIB_DEPENDS= camel-1.2,camel-provider-1.2,ebackend-1.2,ebook-1.2,ecal-1.2,edataserver-1.2,edataserverui-1.2,egroupwise-1.2,exchange-storage-1.2,gdata-1.2,gdata-google-1.2:evolution-data-server->=2.24.3:databases/evolution-data-server \
lber.>=7,ldap.>=7::databases/openldap \
notify.>=2::devel/libnotify \
soup-2.4::devel/libsoup \
@ -80,9 +78,8 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib/evolution/${R}/components:${LOCALBASE}/lib/evolution/${R}:${LOCALBASE}/lib -Z"
# XXX
#R= ${GNOME_VERSION:R}
R= 2.24
# Only get the first x.y which is needed in the PLIST.
R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
SUBST_VARS= R
post-patch:

View File

@ -1,5 +1,5 @@
MD5 (evolution-2.24.3.tar.bz2) = ZnGy0x6ne6YZD628URhlZw==
RMD160 (evolution-2.24.3.tar.bz2) = B/hOw5xrCj+LVvhyFmCm4/GN0GE=
SHA1 (evolution-2.24.3.tar.bz2) = Mj19fdo+24/jChsSQNbNloF0+xQ=
SHA256 (evolution-2.24.3.tar.bz2) = /wQE7Kkg2nSsDTLr8yo7qt07MJ7sfFADgabLb9cRzT8=
SIZE (evolution-2.24.3.tar.bz2) = 32652280
MD5 (evolution-2.24.4.tar.bz2) = LUyxplIjsUHpdLUUUv6uAw==
RMD160 (evolution-2.24.4.tar.bz2) = 4T93sSlAJ2sa/Vb7AuNgTveO8KA=
SHA1 (evolution-2.24.4.tar.bz2) = mFX/bNRk4dk0eIfsprigDTWmqBM=
SHA256 (evolution-2.24.4.tar.bz2) = 1i68xADYb7UH90IfDDyB+7pylrGvOuqsXOsnEPc/5z4=
SIZE (evolution-2.24.4.tar.bz2) = 32661475

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mail_message-list_c,v 1.6 2009/01/12 16:13:42 jasper Exp $
--- mail/message-list.c.orig Mon Dec 15 07:50:24 2008
+++ mail/message-list.c Mon Jan 12 14:44:40 2009
@@ -2548,6 +2548,10 @@ clear_tree (MessageList *ml)
$OpenBSD: patch-mail_message-list_c,v 1.7 2009/01/31 08:32:35 jasper Exp $
--- mail/message-list.c.orig Fri Jan 30 05:55:03 2009
+++ mail/message-list.c Fri Jan 30 22:31:23 2009
@@ -2549,6 +2549,10 @@ clear_tree (MessageList *ml)
ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL);
@ -12,7 +12,7 @@ $OpenBSD: patch-mail_message-list_c,v 1.6 2009/01/12 16:13:42 jasper Exp $
#ifdef TIMEIT
gettimeofday(&end, NULL);
diff = end.tv_sec * 1000 + end.tv_usec/1000;
@@ -3151,6 +3155,9 @@ mail_folder_hide_by_flag (CamelFolder *folder, Message
@@ -3152,6 +3156,9 @@ mail_folder_hide_by_flag (CamelFolder *folder, Message
CamelFolderChangeInfo *newchanges, *oldchanges = *changes;
CamelMessageInfo *info;
int i;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.23 2009/01/12 16:13:42 jasper Exp $
@comment $OpenBSD: PLIST,v 1.24 2009/01/31 08:32:35 jasper Exp $
%%SHARED%%
@bin bin/evolution
include/evolution-${R}/
@ -2069,8 +2069,6 @@ share/idl/evolution-${R}/Evolution.idl
share/idl/evolution-${R}/evolution-calendar.idl
share/locale/am/LC_MESSAGES/evolution-${R}.mo
share/locale/ar/LC_MESSAGES/evolution-${R}.mo
share/locale/as/
share/locale/as/LC_MESSAGES/
share/locale/as/LC_MESSAGES/evolution-${R}.mo
share/locale/ast/
share/locale/ast/LC_MESSAGES/
@ -2126,8 +2124,6 @@ share/locale/nb/LC_MESSAGES/evolution-${R}.mo
share/locale/ne/LC_MESSAGES/evolution-${R}.mo
share/locale/nl/LC_MESSAGES/evolution-${R}.mo
share/locale/nn/LC_MESSAGES/evolution-${R}.mo
share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/evolution-${R}.mo
share/locale/or/LC_MESSAGES/evolution-${R}.mo
share/locale/pa/LC_MESSAGES/evolution-${R}.mo
@ -2140,20 +2136,14 @@ share/locale/pt_BR/LC_MESSAGES/evolution-${R}.mo
share/locale/ro/LC_MESSAGES/evolution-${R}.mo
share/locale/ru/LC_MESSAGES/evolution-${R}.mo
share/locale/rw/LC_MESSAGES/evolution-${R}.mo
share/locale/si/
share/locale/si/LC_MESSAGES/
share/locale/si/LC_MESSAGES/evolution-${R}.mo
share/locale/sk/LC_MESSAGES/evolution-${R}.mo
share/locale/sl/LC_MESSAGES/evolution-${R}.mo
share/locale/sq/LC_MESSAGES/evolution-${R}.mo
share/locale/sr/LC_MESSAGES/evolution-${R}.mo
share/locale/sr@latin/
share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/evolution-${R}.mo
share/locale/sv/LC_MESSAGES/evolution-${R}.mo
share/locale/ta/LC_MESSAGES/evolution-${R}.mo
share/locale/te/
share/locale/te/LC_MESSAGES/
share/locale/te/LC_MESSAGES/evolution-${R}.mo
share/locale/th/LC_MESSAGES/evolution-${R}.mo
share/locale/tr/LC_MESSAGES/evolution-${R}.mo