Update the (in)famous evolution to version 2.30.1.1.

This commit is contained in:
ajacoutot 2010-04-26 19:52:25 +00:00
parent f6c8db7f36
commit 2b17a5c9b7
5 changed files with 83 additions and 119 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.99 2010/04/25 08:33:00 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.100 2010/04/26 19:52:25 ajacoutot Exp $
COMMENT-main= integrated email and PIM software for GNOME
COMMENT-plugins= additionnal plugins for evolution
GNOME_PROJECT= evolution
GNOME_VERSION= 2.30.0.1
GNOME_VERSION= 2.30.1.1
# Only get the first x.y which is needed in the PLIST.
# NOTE: when major version changes, increment EVO_VERSION accordingly
@ -17,7 +17,7 @@ SUBST_VARS= R
# -plugins depends on the exact version of -main, so whenever -main is
# bumped, -plugins needs a bump too
PATCH_NUMBER= p0
#PATCH_NUMBER= p0
PKGNAME-main= ${DISTNAME}${PATCH_NUMBER}
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}${PATCH_NUMBER}
@ -102,7 +102,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
LIB_DEPENDS-plugins= ${LIB_DEPENDS} \
gstreamer-0.10::multimedia/gstreamer-0.10/core \
lib/evolution/${R}/emiscwidgets,lib/evolution/${R}/eutil:${PKGNAME-main}:mail/evolution,-main
lib/evolution/${R}/composer.>=6,lib/evolution/${R}/emformat,lib/evolution/${R}/eshell,lib/evolution/${R}/evolution-calendar,lib/evolution/${R}/evolution-mail,lib/evolution/${R}/emiscwidgets,lib/evolution/${R}/eutil:${PKGNAME-main}:mail/evolution,-main
# needed for the audio-inline plugin
RUN_DEPENDS-plugins= ::multimedia/gstreamer-0.10/plugins-good
@ -130,6 +130,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}/components:${TRUEPREFIX}/lib/evolution/${R}:${TRUEPREFIX}/lib" \
PTHREAD_LIB="-pthread"
FAKE_FLAGS= autostartdir=${PREFIX}/share/examples/evolution/xdg/autostart
# ltasneededhack in bsd.gnome.mk from FreeBSD ports
LIBTOOL= ${WRKDIR}/bin/libtool
post-patch:

View File

@ -1,5 +1,5 @@
MD5 (evolution-2.30.0.1.tar.bz2) = WXRv0xTe7S/qf8XafZL/Fw==
RMD160 (evolution-2.30.0.1.tar.bz2) = QHNA9YfYRm4B/5j1xKXRKamEijU=
SHA1 (evolution-2.30.0.1.tar.bz2) = PaZkuF+rMISvXxuDWNf1okgzyA0=
SHA256 (evolution-2.30.0.1.tar.bz2) = TgaDVmUta/Hb4qzI6e7V350oPqcd402BtEHSuyrEcAk=
SIZE (evolution-2.30.0.1.tar.bz2) = 30346757
MD5 (evolution-2.30.1.1.tar.bz2) = tfFVLSPkbcBDsiYuQsae6g==
RMD160 (evolution-2.30.1.1.tar.bz2) = BuM+QZfGLSfhg6RlUV0jaVn1XlQ=
SHA1 (evolution-2.30.1.1.tar.bz2) = QFfKg0Aa35EZlCJsZ0wbwphsX3E=
SHA256 (evolution-2.30.1.1.tar.bz2) = mM7bl+j7040oEUCgGwNX+VDnNDHqRA85MhNOknkABPk=
SIZE (evolution-2.30.1.1.tar.bz2) = 30619565

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.14 2010/04/22 16:30:02 jasper Exp $
--- configure.orig Tue Mar 30 13:25:24 2010
+++ configure Thu Apr 22 13:11:06 2010
@@ -4353,8 +4353,6 @@ $as_echo "$as_me: WARNING: unsupported compiler flags:
$OpenBSD: patch-configure,v 1.15 2010/04/26 19:52:25 ajacoutot Exp $
--- configure.orig Mon Apr 26 05:22:50 2010
+++ configure Mon Apr 26 14:13:37 2010
@@ -4456,8 +4456,6 @@ $as_echo "$as_me: WARNING: unsupported compiler flags:
AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
@ -9,23 +9,23 @@ $OpenBSD: patch-configure,v 1.14 2010/04/22 16:30:02 jasper Exp $
-
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
{ { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@@ -18863,9 +18861,6 @@ LIBS=$ac_check_lib_save_LIBS
as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -16033,9 +16031,6 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_query" >&5
$as_echo "$ac_cv_lib_resolv_res_query" >&6; }
-if test "x$ac_cv_lib_resolv_res_query" = x""yes; then
-if test "x$ac_cv_lib_resolv_res_query" = x""yes; then :
- LDAP_LIBS="-lresolv"
-fi
{ $as_echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5
$as_echo_n "checking for bind in -lsocket... " >&6; }
@@ -21066,7 +21061,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; }
@@ -16815,7 +16810,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; }
LIBS_save="$LIBS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
sunlibs="-lkrb5 -lgss"
if test "${ac_cv_lib_kerberos5+set}" = set; then
if test "${ac_cv_lib_kerberos5+set}" = set; then :
$as_echo_n "(cached) " >&6

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mail_message-list_c,v 1.9 2010/04/22 16:30:02 jasper Exp $
--- mail/message-list.c.orig Wed Mar 17 12:14:53 2010
+++ mail/message-list.c Thu Apr 22 12:53:49 2010
@@ -2844,6 +2844,11 @@ clear_tree (MessageList *ml, gboolean tfree)
$OpenBSD: patch-mail_message-list_c,v 1.10 2010/04/26 19:52:25 ajacoutot Exp $
--- mail/message-list.c.orig Thu Apr 8 16:17:42 2010
+++ mail/message-list.c Mon Apr 26 09:09:25 2010
@@ -2835,6 +2835,11 @@ clear_tree (MessageList *ml, gboolean tfree)
ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL);
if (tfree)
e_tree_model_rebuilt (E_TREE_MODEL(etm));
@ -13,7 +13,7 @@ $OpenBSD: patch-mail_message-list_c,v 1.9 2010/04/22 16:30:02 jasper Exp $
#ifdef TIMEIT
gettimeofday(&end, NULL);
diff = end.tv_sec * 1000 + end.tv_usec/1000;
@@ -3445,6 +3450,10 @@ mail_folder_hide_by_flag (CamelFolder *folder, Message
@@ -3453,6 +3458,10 @@ mail_folder_hide_by_flag (CamelFolder *folder, Message
CamelFolderChangeInfo *newchanges, *oldchanges = *changes;
CamelMessageInfo *info;
gint i;

View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.12 2010/04/25 08:33:00 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.13 2010/04/26 19:52:25 ajacoutot Exp $
@pkgpath mail/evolution
%%SHARED%%
@bin bin/evolution
@bin bin/evolution-alarm-notify
@bin bin/evolution-settings
@bin bin/evolution
include/evolution-${R}/
include/evolution-${R}/addressbook/
include/evolution-${R}/addressbook/gui/
@ -114,6 +114,8 @@ include/evolution-${R}/e-util/e-datetime-format.h
include/evolution-${R}/e-util/e-dialog-utils.h
include/evolution-${R}/e-util/e-dialog-widgets.h
include/evolution-${R}/e-util/e-event.h
include/evolution-${R}/e-util/e-extensible.h
include/evolution-${R}/e-util/e-extension.h
include/evolution-${R}/e-util/e-file-utils.h
include/evolution-${R}/e-util/e-folder-map.h
include/evolution-${R}/e-util/e-html-utils.h
@ -477,18 +479,18 @@ lib/evolution/${R}/plugins/
@comment lib/evolution/${R}/plugins/liborg-gnome-imap-features.la
@comment lib/evolution/${R}/plugins/liborg-gnome-itip-formatter.a
@comment lib/evolution/${R}/plugins/liborg-gnome-itip-formatter.la
@comment liblib/evolution/${R}/plugins/liborg-gnome-mark-all-read.a
@comment liblib/evolution/${R}/plugins/liborg-gnome-mark-all-read.la
@comment liblib/evolution/${R}/plugins/liborg-gnome-plugin-manager.a
@comment liblib/evolution/${R}/plugins/liborg-gnome-plugin-manager.la
@comment liblib/evolution/${R}/plugins/liborg-gnome-pst-import.a
@comment liblib/evolution/${R}/plugins/liborg-gnome-pst-import.la
@comment liblib/evolution/${R}/plugins/liborg-gnome-publish-calendar.a
@comment liblib/evolution/${R}/plugins/liborg-gnome-publish-calendar.la
@comment liblib/evolution/${R}/plugins/liborg-gnome-sa-junk-plugin.a
@comment liblib/evolution/${R}/plugins/liborg-gnome-sa-junk-plugin.la
@comment liblib/evolution/${R}/plugins/liborg-gnome-vcard-inline.a
@comment liblib/evolution/${R}/plugins/liborg-gnome-vcard-inline.la
@comment lib/evolution/${R}/plugins/liborg-gnome-mark-all-read.a
@comment lib/evolution/${R}/plugins/liborg-gnome-mark-all-read.la
@comment lib/evolution/${R}/plugins/liborg-gnome-plugin-manager.a
@comment lib/evolution/${R}/plugins/liborg-gnome-plugin-manager.la
@comment lib/evolution/${R}/plugins/liborg-gnome-pst-import.a
@comment lib/evolution/${R}/plugins/liborg-gnome-pst-import.la
@comment lib/evolution/${R}/plugins/liborg-gnome-publish-calendar.a
@comment lib/evolution/${R}/plugins/liborg-gnome-publish-calendar.la
@comment lib/evolution/${R}/plugins/liborg-gnome-sa-junk-plugin.a
@comment lib/evolution/${R}/plugins/liborg-gnome-sa-junk-plugin.la
@comment lib/evolution/${R}/plugins/liborg-gnome-vcard-inline.a
@comment lib/evolution/${R}/plugins/liborg-gnome-vcard-inline.la
lib/evolution/${R}/plugins/org-gnome-addressbook-file.eplug
lib/evolution/${R}/plugins/org-gnome-bogo-junk-plugin.eplug
lib/evolution/${R}/plugins/org-gnome-calendar-file.eplug
@ -664,86 +666,6 @@ share/evolution/${R}/help/quickref/sq/quickref.pdf
share/evolution/${R}/help/quickref/sv/
share/evolution/${R}/help/quickref/sv/quickref.pdf
share/evolution/${R}/icons/
share/evolution/${R}/icons/gnome/
share/evolution/${R}/icons/gnome/16x16/
share/evolution/${R}/icons/gnome/16x16/stock/
share/evolution/${R}/icons/gnome/16x16/stock/data/
share/evolution/${R}/icons/gnome/16x16/stock/data/stock_signature-bad.png
share/evolution/${R}/icons/gnome/16x16/stock/data/stock_signature-ok.png
share/evolution/${R}/icons/gnome/16x16/stock/data/stock_signature.png
share/evolution/${R}/icons/gnome/16x16/stock/document/
share/evolution/${R}/icons/gnome/16x16/stock/document/stock_task-assigned-to.png
share/evolution/${R}/icons/gnome/16x16/stock/document/stock_task-assigned.png
share/evolution/${R}/icons/gnome/16x16/stock/document/stock_task-recurring.png
share/evolution/${R}/icons/gnome/16x16/stock/document/stock_task.png
share/evolution/${R}/icons/gnome/16x16/stock/document/stock_todo.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_bell.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_check-filled.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_new-meeting.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-high.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-higher.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-highest.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-low.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-lower.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-lowest.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-normal.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_show-all.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_timezone.png
share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_view-details.png
share/evolution/${R}/icons/gnome/16x16/stock/net/
share/evolution/${R}/icons/gnome/16x16/stock/net/stock_contact-list.png
share/evolution/${R}/icons/gnome/16x16/stock/net/stock_mail-filters-apply.png
share/evolution/${R}/icons/gnome/16x16/stock/net/stock_mail-flag-for-followup-done.png
share/evolution/${R}/icons/gnome/16x16/stock/net/stock_mail-flag-for-followup.png
share/evolution/${R}/icons/gnome/16x16/stock/net/stock_mail-open-multiple.png
share/evolution/${R}/icons/gnome/16x16/stock/net/stock_mail-unread-multiple.png
share/evolution/${R}/icons/gnome/16x16/stock/net/stock_shared-by-me.png
share/evolution/${R}/icons/gnome/16x16/stock/net/stock_shared-to-me.png
share/evolution/${R}/icons/gnome/16x16/stock/net/stock_video-conferencing.png
share/evolution/${R}/icons/gnome/16x16/stock/object/
share/evolution/${R}/icons/gnome/16x16/stock/object/stock_insert-note.png
share/evolution/${R}/icons/gnome/24x24/
share/evolution/${R}/icons/gnome/24x24/stock/
share/evolution/${R}/icons/gnome/24x24/stock/data/
share/evolution/${R}/icons/gnome/24x24/stock/data/stock_signature-bad.png
share/evolution/${R}/icons/gnome/24x24/stock/data/stock_signature-ok.png
share/evolution/${R}/icons/gnome/24x24/stock/data/stock_signature.png
share/evolution/${R}/icons/gnome/24x24/stock/document/
share/evolution/${R}/icons/gnome/24x24/stock/document/stock_task-assigned-to.png
share/evolution/${R}/icons/gnome/24x24/stock/document/stock_task-assigned.png
share/evolution/${R}/icons/gnome/24x24/stock/document/stock_task-recurring.png
share/evolution/${R}/icons/gnome/24x24/stock/document/stock_task.png
share/evolution/${R}/icons/gnome/24x24/stock/document/stock_todo.png
share/evolution/${R}/icons/gnome/24x24/stock/generic/
share/evolution/${R}/icons/gnome/24x24/stock/generic/stock_new-meeting.png
share/evolution/${R}/icons/gnome/24x24/stock/generic/stock_show-all.png
share/evolution/${R}/icons/gnome/24x24/stock/generic/stock_timezone.png
share/evolution/${R}/icons/gnome/24x24/stock/net/
share/evolution/${R}/icons/gnome/24x24/stock/net/stock_contact-list.png
share/evolution/${R}/icons/gnome/24x24/stock/net/stock_mail-filters-apply.png
share/evolution/${R}/icons/gnome/24x24/stock/net/stock_mail-open-multiple.png
share/evolution/${R}/icons/gnome/24x24/stock/net/stock_mail-unread-multiple.png
share/evolution/${R}/icons/gnome/24x24/stock/net/stock_shared-by-me.png
share/evolution/${R}/icons/gnome/24x24/stock/net/stock_shared-to-me.png
share/evolution/${R}/icons/gnome/24x24/stock/net/stock_video-conferencing.png
share/evolution/${R}/icons/gnome/24x24/stock/object/
share/evolution/${R}/icons/gnome/24x24/stock/object/stock_insert-note.png
share/evolution/${R}/icons/gnome/48x48/
share/evolution/${R}/icons/gnome/48x48/stock/
share/evolution/${R}/icons/gnome/48x48/stock/data/
share/evolution/${R}/icons/gnome/48x48/stock/data/stock_signature-bad.png
share/evolution/${R}/icons/gnome/48x48/stock/data/stock_signature-ok.png
share/evolution/${R}/icons/gnome/48x48/stock/data/stock_signature.png
share/evolution/${R}/icons/gnome/48x48/stock/document/
share/evolution/${R}/icons/gnome/48x48/stock/document/stock_todo.png
share/evolution/${R}/icons/gnome/48x48/stock/generic/
share/evolution/${R}/icons/gnome/48x48/stock/generic/stock_alarm.png
share/evolution/${R}/icons/gnome/48x48/stock/generic/stock_new-meeting.png
share/evolution/${R}/icons/gnome/48x48/stock/generic/stock_timezone.png
share/evolution/${R}/icons/gnome/48x48/stock/net/
share/evolution/${R}/icons/gnome/48x48/stock/net/stock_mail-flag-for-followup-done.png
share/evolution/${R}/icons/gnome/48x48/stock/net/stock_mail-flag-for-followup.png
share/evolution/${R}/icons/hicolor/
share/evolution/${R}/icons/hicolor/16x16/
share/evolution/${R}/icons/hicolor/16x16/actions/
@ -752,6 +674,29 @@ share/evolution/${R}/icons/hicolor/16x16/actions/folder-move.png
share/evolution/${R}/icons/hicolor/16x16/actions/go-today.png
share/evolution/${R}/icons/hicolor/16x16/actions/mail-copy.png
share/evolution/${R}/icons/hicolor/16x16/actions/mail-move.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_bell.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_contact-list.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_insert-note.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_mail-filters-apply.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_mail-flag-for-followup-done.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_mail-flag-for-followup.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_mail-open-multiple.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_mail-unread-multiple.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_new-24h-appointment.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_new-meeting.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_notes.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_people.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_shared-by-me.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_shared-to-me.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_show-all.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_task-assigned-to.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_task-assigned.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_task-recurring.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_task.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_timezone.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_todo.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_video-conferencing.png
share/evolution/${R}/icons/hicolor/16x16/actions/stock_view-details.png
share/evolution/${R}/icons/hicolor/16x16/actions/view-calendar-day.png
share/evolution/${R}/icons/hicolor/16x16/actions/view-calendar-list.png
share/evolution/${R}/icons/hicolor/16x16/actions/view-calendar-month.png
@ -783,6 +728,15 @@ share/evolution/${R}/icons/hicolor/24x24/
share/evolution/${R}/icons/hicolor/24x24/actions/
share/evolution/${R}/icons/hicolor/24x24/actions/go-today.png
share/evolution/${R}/icons/hicolor/24x24/actions/query-free-busy.png
share/evolution/${R}/icons/hicolor/24x24/actions/stock_contact-list.png
share/evolution/${R}/icons/hicolor/24x24/actions/stock_insert-note.png
share/evolution/${R}/icons/hicolor/24x24/actions/stock_mail-filters-apply.png
share/evolution/${R}/icons/hicolor/24x24/actions/stock_mail-open-multiple.png
share/evolution/${R}/icons/hicolor/24x24/actions/stock_mail-unread-multiple.png
share/evolution/${R}/icons/hicolor/24x24/actions/stock_new-24h-appointment.png
share/evolution/${R}/icons/hicolor/24x24/actions/stock_new-meeting.png
share/evolution/${R}/icons/hicolor/24x24/actions/stock_notes.png
share/evolution/${R}/icons/hicolor/24x24/actions/stock_people.png
share/evolution/${R}/icons/hicolor/24x24/actions/view-calendar-day.png
share/evolution/${R}/icons/hicolor/24x24/actions/view-calendar-list.png
share/evolution/${R}/icons/hicolor/24x24/actions/view-calendar-month.png
@ -907,6 +861,13 @@ share/evolution/${R}/views/tasks/Tasks.galview
share/evolution/${R}/views/tasks/With_DueDate.galview
share/evolution/${R}/views/tasks/With_Status.galview
share/evolution/${R}/views/tasks/galview.xml
share/examples/evolution/
share/examples/evolution/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/evolution/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/evolution/xdg/autostart/evolution-alarm-notify.desktop
@sample ${SYSCONFDIR}/xdg/autostart/evolution-alarm-notify.desktop
share/gnome/help/evolution/
share/gnome/help/evolution/C/
share/gnome/help/evolution/C/evolution.xml
@ -1817,6 +1778,7 @@ share/locale/bn_IN/LC_MESSAGES/evolution-${R}.mo
share/locale/br/LC_MESSAGES/evolution-${R}.mo
share/locale/bs/LC_MESSAGES/evolution-${R}.mo
share/locale/ca/LC_MESSAGES/evolution-${R}.mo
share/locale/ca@valencia/LC_MESSAGES/evolution-${R}.mo
share/locale/cs/LC_MESSAGES/evolution-${R}.mo
share/locale/cy/LC_MESSAGES/evolution-${R}.mo
share/locale/da/LC_MESSAGES/evolution-${R}.mo