cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to evolution-3.6.0.

Browse Source
This commit is contained in:
ajacoutot 2012-09-28 13:49:03 +00:00
parent 023e3c0709
commit 6f87fdcef1
8 changed files with 4296 additions and 4331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
mail/evolution/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.169 2012/09/01 14:36:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.170 2012/09/28 13:49:03 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,14 +6,11 @@ COMMENT-main= integrated email and PIM software for GNOME
COMMENT-plugins= additionnal plugins for evolution
GNOME_PROJECT= evolution
GNOME_VERSION= 3.4.4
GNOME_VERSION= 3.6.0
PKGNAME-main= ${DISTNAME}
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}
REVISION-main= 1
REVISION-plugins= 1
# NOTE: when R changes, increment EVO_VERSION accordingly and bump:
# mail/evolution-ews
# mail/evolution-exchange
@ -29,15 +26,15 @@ HOMEPAGE= http://www.gnome.org/projects/evolution/
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
Antoine Jacoutot <ajacoutot@openbsd.org>
SO_VERSION= 7.0
SO_VERSION= 8.0
.for _lib in \
gnomecanvas evolution-utils filter email-utils email-engine eutil \
evolution-a11y emiscwidgets etext etimezonedialog etable menus eshell \
essmime evolution-smime emformat eabutil \
evolution-addressbook-importers econtacteditor econtactlisteditor \
composer evolution-mail evolution-mail-importers \
evolution-calendar-importers evolution-calendar evolution-mail-settings
composer eabutil econtacteditor econtactlisteditor email-engine \
email-utils emformat emiscwidgets eshell essmime etable etext \
etimezonedialog eutil evolution-a11y evolution-addressbook-importers \
evolution-calendar-importers evolution-calendar \
evolution-mail-importers evolution-mail \
evolution-smime filter gnomecanvas menus
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor
@ -47,78 +44,67 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += atk-1.0 c cairo camel-1.2 canberra ebook-1.2 ecal-1.2
WANTLIB += camel-1.2 canberra ebook-1.2 ecal-1.2
WANTLIB += edataserver-1.2 edataserverui-3.0 gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 gtkhtml-4.0
WANTLIB += gtkhtml-editor-4.0 ical notify pango-1.0 pangocairo-1.0
WANTLIB += pthread xml2
WANTLIB += gtkhtml-editor-4.0 ical notify pthread xml2
WANTLIB-main += ${WANTLIB}
WANTLIB-main += ICE SM cairo-gobject canberra-gtk3 dbus-glib-1 ebackend-1.2
WANTLIB-main += atk-1.0 c cairo pango-1.0 pangocairo-1.0
WANTLIB-main += ICE SM cairo-gobject canberra-gtk3 ebackend-1.2
WANTLIB-main += gailutil-3 gdata gmodule-2.0 gnome-desktop-3 goa-1.0
WANTLIB-main += gweather-3 icalvcal ldap-2.4 m nspr4 nss3 plc4 smime3
WANTLIB-main += soup-2.4
#WANTLIB-main += lib/evolution/${R}/evolution-a11y
WANTLIB-main += soup-2.4 gstreamer-0.10 soup-gnome-2.4 webkitgtk-3.0
WANTLIB-plugins += ${WANTLIB}
WANTLIB-plugins += gstreamer-0.10 pst
WANTLIB-plugins += pst
WANTLIB-plugins += lib/evolution/${R}/composer
WANTLIB-plugins += lib/evolution/${R}/eabutil
WANTLIB-plugins += lib/evolution/${R}/email-engine
WANTLIB-plugins += lib/evolution/${R}/email-utils
WANTLIB-plugins += lib/evolution/${R}/emformat
WANTLIB-plugins += lib/evolution/${R}/emiscwidgets
WANTLIB-plugins += lib/evolution/${R}/eshell
WANTLIB-plugins += lib/evolution/${R}/etable
WANTLIB-plugins += lib/evolution/${R}/etext
WANTLIB-plugins += lib/evolution/${R}/eutil
WANTLIB-plugins += lib/evolution/${R}/evolution-calendar
WANTLIB-plugins += lib/evolution/${R}/evolution-mail
WANTLIB-plugins += lib/evolution/${R}/filter
WANTLIB-plugins += lib/evolution/${R}/gnomecanvas
WANTLIB-plugins += lib/evolution/${R}/menus
MULTI_PACKAGES= -main -plugins
MODULES= devel/gettext \
x11/gnome \
devel/gconf2 \
devel/dconf
BUILD_DEPENDS= devel/bison \
misc/shared-mime-info \
x11/gnome/icon-theme \
devel/iso-codes \
devel/gsettings-desktop-schemas
devel/gsettings-desktop-schemas>=3.6.0
LIB_DEPENDS= databases/evolution-data-server>=${GNOME_VERSION} \
devel/libnotify>=0.7.2 \
www/gtkhtml4>=4.1.91
devel/libnotify \
www/gtkhtml4>=3.6.0
LIB_DEPENDS-main= ${LIB_DEPENDS} \
security/nss \
x11/gnome/desktop \
x11/gnome/desktop>=3.6.0 \
databases/openldap \
audio/libcanberra,-gtk3
RUN_DEPENDS-main= ${RUN_DEPENDS} \
x11/gnome/icon-theme \
devel/gsettings-desktop-schemas
devel/gsettings-desktop-schemas>=3.6.0
# gstreamer1(-plugins-base) is needed for the audio-inline plugin
BUILD_DEPENDS += multimedia/gstreamer1/core
RUN_DEPENDS-plugins= multimedia/gstreamer1/plugins-base
LIB_DEPENDS-plugins= ${LIB_DEPENDS} \
mail/evolution,-main=${GNOME_VERSION} \
converters/libpst>=0.6.54 \
multimedia/gstreamer-0.10/core
# gstreamer-plugins-good is needed for the audio-inline plugin
RUN_DEPENDS-plugins= ${MODGCONF2_RUN_DEPENDS} \
multimedia/gstreamer-0.10/plugins-good
converters/libpst
LIBTOOL_FLAGS= --tag=disable-static
MODGNOME_TOOLS= yelp
MODGNOME_DESKTOP_FILE= Yes
MODGNOME_ICON_CACHE= Yes
MODGCONF2_SCHEMAS_DIR= evolution
YACC= bison
@ -131,11 +117,6 @@ MODGNOME_LDFLAGS= -L${X11BASE}/lib -Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}:$
-Wl,--as-needed
CONFIGURE_ARGS= --disable-static \
--enable-plugins=all \
--disable-nm \
--disable-connman \
--disable-mono \
--disable-python \
--with-openldap="${LOCALBASE}" \
--with-sub-version=" OpenBSD/Ports" \
--with-krb5=/usr \
@ -153,7 +134,7 @@ composer eabutil econtacteditor econtactlisteditor email-engine \
email-utils emformat emiscwidgets eshell essmime etable etext \
etimezonedialog eutil evolution-a11y evolution-addressbook-importers \
evolution-calendar-importers evolution-calendar \
evolution-mail-importers evolution-mail-settings evolution-mail \
evolution-mail-importers evolution-mail \
evolution-smime filter gnomecanvas menus
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor
@ -164,7 +145,6 @@ REVERT_BZ591436=a11y/Makefile.in \
addressbook/util/Makefile.in \
calendar/gui/Makefile.in \
calendar/importers/Makefile.in \
capplet/settings/Makefile.in \
composer/Makefile.in \
e-util/Makefile.in \
em-format/Makefile.in \
@ -192,8 +172,5 @@ pre-configure:
post-install:
rm ${PREFIX}/lib/evolution/${R}/{modules,plugins}/*.la
find ${PREFIX}/share/evolution/${R}/default -perm 444 -exec chmod 644 {} \;
# originally designed for MeeGo (https://bugzilla.gnome.org/show_bug.cgi?id=654525)
rm ${PREFIX}/bin/evolution-settings
rm ${PREFIX}/share/applications/evolution-settings.desktop
.include <bsd.port.mk>

4
mail/evolution/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (evolution-3.4.4.tar.xz) = flQdCJTB1IuJggtkZu2v5AIV+M20WxwOljXMFfSey5o=
SIZE (evolution-3.4.4.tar.xz) = 11899620
SHA256 (evolution-3.6.0.tar.xz) = YWPvVqIsp8YFqJ13SFHJmI14QKTcXHPFRjCOU4DP57Q=
SIZE (evolution-3.6.0.tar.xz) = 12021428

26
mail/evolution/patches/patch-mail_Makefile_in Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-mail_Makefile_in,v 1.1 2012/09/28 13:49:04 ajacoutot Exp $
XXX push upstream
--- mail/Makefile.in.orig Sat Sep 22 19:29:32 2012
+++ mail/Makefile.in Fri Sep 28 14:08:22 2012
@@ -727,8 +727,7 @@ libevolution_mail_la_LIBADD = \
$(GTKHTML_LIBS) \
$(E_WIDGETS_LIBS) \
$(SMIME_LIBS) \
- $(LIBSOUP_LIBS) \
- -lresolv
+ $(LIBSOUP_LIBS)
libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
@@ -744,8 +743,7 @@ test_mail_autoconfig_SOURCES = \
test_mail_autoconfig_LDADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
- $(GNOME_PLATFORM_LIBS) \
- -lresolv
+ $(GNOME_PLATFORM_LIBS)
# Misc data to install

10
mail/evolution/patches/patch-mail_em-utils_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mail_em-utils_h,v 1.6 2012/03/29 06:56:25 ajacoutot Exp $
--- mail/em-utils.h.orig Fri Mar 9 17:33:42 2012
+++ mail/em-utils.h Wed Mar 28 09:19:52 2012
$OpenBSD: patch-mail_em-utils_h,v 1.7 2012/09/28 13:49:04 ajacoutot Exp $
--- mail/em-utils.h.orig Sun Sep 16 17:05:50 2012
+++ mail/em-utils.h Fri Sep 28 12:27:26 2012
@@ -23,8 +23,8 @@
#ifndef __EM_UTILS_H__
#define __EM_UTILS_H__
@ -9,5 +9,5 @@ $OpenBSD: patch-mail_em-utils_h,v 1.6 2012/03/29 06:56:25 ajacoutot Exp $
#include <sys/types.h>
+#include <gtk/gtk.h>
#include <camel/camel.h>
#include <libedataserver/e-proxy.h>
#include <libedataserver/e-account.h>
#include <libemail-engine/e-mail-session.h>

8
mail/evolution/patches/patch-modules_bogofilter_evolution-bogofilter_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_bogofilter_evolution-bogofilter_c,v 1.2 2012/03/29 06:56:25 ajacoutot Exp $
--- modules/bogofilter/evolution-bogofilter.c.orig Fri Mar 9 17:33:42 2012
+++ modules/bogofilter/evolution-bogofilter.c Wed Mar 28 09:19:52 2012
@@ -33,7 +33,7 @@
$OpenBSD: patch-modules_bogofilter_evolution-bogofilter_c,v 1.3 2012/09/28 13:49:04 ajacoutot Exp $
--- modules/bogofilter/evolution-bogofilter.c.orig Sun Sep 16 17:05:50 2012
+++ modules/bogofilter/evolution-bogofilter.c Fri Sep 28 12:27:26 2012
@@ -37,7 +37,7 @@
((obj), E_TYPE_BOGOFILTER, EBogofilter))
#ifndef BOGOFILTER_BINARY

8
mail/evolution/patches/patch-modules_spamassassin_evolution-spamassassin_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_spamassassin_evolution-spamassassin_c,v 1.2 2012/03/29 06:56:25 ajacoutot Exp $
--- modules/spamassassin/evolution-spamassassin.c.orig Fri Mar 9 17:33:43 2012
+++ modules/spamassassin/evolution-spamassassin.c Wed Mar 28 09:19:52 2012
@@ -35,19 +35,19 @@
$OpenBSD: patch-modules_spamassassin_evolution-spamassassin_c,v 1.3 2012/09/28 13:49:04 ajacoutot Exp $
--- modules/spamassassin/evolution-spamassassin.c.orig Sun Sep 16 17:05:50 2012
+++ modules/spamassassin/evolution-spamassassin.c Fri Sep 28 12:27:26 2012
@@ -37,19 +37,19 @@
((obj), E_TYPE_SPAM_ASSASSIN, ESpamAssassin))
#ifndef SPAMASSASSIN_BINARY

8435
mail/evolution/pkg/PLIST-main
View File

File diff suppressed because it is too large Load Diff

61
mail/evolution/pkg/PLIST-plugins
View File

@ -1,52 +1,35 @@
@comment $OpenBSD: PLIST-plugins,v 1.11 2012/03/29 06:56:25 ajacoutot Exp $
@comment $OpenBSD: PLIST-plugins,v 1.12 2012/09/28 13:49:04 ajacoutot Exp $
@conflict evolution-<=3.2.2p0
lib/evolution/${R}/plugins/liborg-gnome-audio-inline.so
lib/evolution/${R}/plugins/liborg-gnome-backup-restore.so
lib/evolution/${R}/plugins/liborg-gnome-dbx-import.so
lib/evolution/${R}/plugins/liborg-gnome-email-custom-header.so
lib/evolution/${R}/plugins/liborg-gnome-evolution-attachment-reminder.so
lib/evolution/${R}/plugins/liborg-gnome-evolution-bbdb.so
lib/evolution/${R}/plugins/liborg-gnome-face.so
lib/evolution/${R}/plugins/liborg-gnome-mail-notification.so
lib/evolution/${R}/plugins/liborg-gnome-save-calendar.so
lib/evolution/${R}/plugins/liborg-gnome-mail-to-task.so
lib/evolution/${R}/plugins/liborg-gnome-mailing-list-actions.so
lib/evolution/${R}/plugins/liborg-gnome-prefer-plain.so
lib/evolution/${R}/plugins/liborg-gnome-pst-import.so
lib/evolution/${R}/plugins/liborg-gnome-save-calendar.so
lib/evolution/${R}/plugins/liborg-gnome-mail-notification.so
lib/evolution/${R}/plugins/liborg-gnome-evolution-attachment-reminder.so
lib/evolution/${R}/plugins/liborg-gnome-email-custom-header.so
lib/evolution/${R}/plugins/liborg-gnome-face.so
lib/evolution/${R}/plugins/liborg-gnome-templates.so
lib/evolution/${R}/plugins/liborg-gnome-vcard-inline.so
lib/evolution/${R}/plugins/org-gnome-audio-inline.eplug
lib/evolution/${R}/plugins/org-gnome-backup-restore.eplug
lib/evolution/${R}/plugins/org-gnome-dbx-import.eplug
lib/evolution/${R}/plugins/org-gnome-email-custom-header.eplug
lib/evolution/${R}/plugins/org-gnome-evolution-attachment-reminder.eplug
lib/evolution/${R}/plugins/liborg-gnome-dbx-import.so
lib/evolution/${R}/plugins/liborg-gnome-external-editor.so
lib/evolution/${R}/plugins/liborg-gnome-pst-import.so
lib/evolution/${R}/plugins/org-gnome-evolution-bbdb.eplug
lib/evolution/${R}/plugins/org-gnome-face.eplug
lib/evolution/${R}/plugins/org-gnome-mail-notification.eplug
lib/evolution/${R}/plugins/org-gnome-save-calendar.eplug
lib/evolution/${R}/plugins/org-gnome-mail-to-task.eplug
lib/evolution/${R}/plugins/org-gnome-mailing-list-actions.eplug
lib/evolution/${R}/plugins/org-gnome-prefer-plain.eplug
lib/evolution/${R}/plugins/org-gnome-pst-import.eplug
lib/evolution/${R}/plugins/org-gnome-save-calendar.eplug
lib/evolution/${R}/plugins/org-gnome-mail-notification.eplug
lib/evolution/${R}/plugins/org-gnome-evolution-attachment-reminder.eplug
lib/evolution/${R}/plugins/org-gnome-email-custom-header.eplug
lib/evolution/${R}/plugins/org-gnome-face.eplug
lib/evolution/${R}/plugins/org-gnome-templates.eplug
lib/evolution/${R}/plugins/org-gnome-vcard-inline.eplug
@bin libexec/evolution/${R}/evolution-backup
share/evolution/${R}/errors/org-gnome-attachment-reminder.error
share/evolution/${R}/errors/org-gnome-backup-restore.error
share/evolution/${R}/errors/org-gnome-face.error
lib/evolution/${R}/plugins/org-gnome-dbx-import.eplug
lib/evolution/${R}/plugins/org-gnome-external-editor.eplug
lib/evolution/${R}/plugins/org-gnome-pst-import.eplug
share/evolution/${R}/errors/org-gnome-mailing-list-actions.error
share/evolution/${R}/errors/org-gnome-attachment-reminder.error
share/evolution/${R}/errors/org-gnome-face.error
share/evolution/${R}/errors/org-gnome-external-editor.error
share/evolution/${R}/ui/org-gnome-email-custom-header.ui
share/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml
share/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml
share/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
share/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/apps-evolution-attachment-reminder.schemas
${SCHEMAS_INSTDIR}/apps-evolution-mail-notification.schemas
${SCHEMAS_INSTDIR}/apps-evolution-mail-prompts-checkdefault.schemas
${SCHEMAS_INSTDIR}/apps-evolution-template-placeholders.schemas
${SCHEMAS_INSTDIR}/apps_evolution_email_custom_header.schemas
${SCHEMAS_INSTDIR}/apps_evolution_eplugin_face.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
share/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
share/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null