Bring us closer to uptream and revert the revert... i.e. use unversioned
solibs. While here, fix RUN_DEPENDS-main.
This commit is contained in:
ajacoutot
parent
80a5664d73
commit
cac93f489e
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.180 2012/10/18 13:55:27 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.181 2012/10/28 11:24:40 ajacoutot Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -11,8 +11,8 @@ GNOME_VERSION= 3.6.1
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}
|
||||
|
||||
REVISION-main= 1
|
||||
REVISION-plugins= 1
|
||||
REVISION-main= 2
|
||||
REVISION-plugins= 2
|
||||
|
||||
# NOTE: when R changes, increment EVO_VERSION accordingly and bump:
|
||||
# mail/evolution-ews
|
||||
@ -31,12 +31,11 @@ MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
|
||||
SO_VERSION= 8.0
|
||||
|
||||
.for _lib in \
|
||||
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
|
||||
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
|
||||
SHARED_LIBS+= ${_lib} ${SO_VERSION}
|
||||
.endfor
|
||||
|
||||
@ -60,14 +59,6 @@ WANTLIB-main += soup-2.4 gstreamer-0.10 soup-gnome-2.4 webkitgtk-3.0
|
||||
|
||||
WANTLIB-plugins += ${WANTLIB}
|
||||
WANTLIB-plugins += pst
|
||||
WANTLIB-plugins += lib/evolution/${R}/composer
|
||||
WANTLIB-plugins += lib/evolution/${R}/email-engine
|
||||
WANTLIB-plugins += lib/evolution/${R}/email-utils
|
||||
WANTLIB-plugins += lib/evolution/${R}/emiscwidgets
|
||||
WANTLIB-plugins += lib/evolution/${R}/eshell
|
||||
WANTLIB-plugins += lib/evolution/${R}/eutil
|
||||
WANTLIB-plugins += lib/evolution/${R}/evolution-calendar
|
||||
WANTLIB-plugins += lib/evolution/${R}/evolution-mail
|
||||
|
||||
MULTI_PACKAGES= -main -plugins
|
||||
|
||||
@ -97,12 +88,15 @@ RUN_DEPENDS-main= ${RUN_DEPENDS} \
|
||||
|
||||
# gstreamer1(-plugins-base) is needed for the audio-inline plugin
|
||||
BUILD_DEPENDS += multimedia/gstreamer1/core
|
||||
RUN_DEPENDS-main= multimedia/gstreamer1/plugins-base
|
||||
RUN_DEPENDS-main += multimedia/gstreamer1/plugins-base
|
||||
|
||||
LIB_DEPENDS-plugins= ${LIB_DEPENDS} \
|
||||
mail/evolution,-main=${GNOME_VERSION} \
|
||||
converters/libpst
|
||||
|
||||
# XXX should be a LIB_DEPENDS+WANTLIB but check-lib-depends(1) does not
|
||||
# work with unversioned solibs (LOCALBASE/lib/evolution/*/*.so).
|
||||
RUN_DEPENDS-plugins += mail/evolution,-main=${GNOME_VERSION}
|
||||
|
||||
MODGNOME_TOOLS= yelp
|
||||
MODGNOME_DESKTOP_FILE= Yes
|
||||
MODGNOME_ICON_CACHE= Yes
|
||||
@ -125,39 +119,7 @@ CONFIGURE_ARGS= --disable-static \
|
||||
|
||||
FAKE_FLAGS= autostartdir=${PREFIX}/share/examples/evolution/xdg/autostart
|
||||
|
||||
# Revert 160006402248075b95c98e9e34d4538670ba7480
|
||||
# (Add -avoid-version to LDFLAGS)
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=591436
|
||||
# This is needed because OpenBSD cannot link to unversioned SOLIBS
|
||||
# (evolution-rss needs to link to eutil, eshell, email-engine...).
|
||||
REVERT_BZ591436=a11y/Makefile.in \
|
||||
addressbook/gui/contact-editor/Makefile.in \
|
||||
addressbook/gui/contact-list-editor/Makefile.in \
|
||||
addressbook/importers/Makefile.in \
|
||||
addressbook/util/Makefile.in \
|
||||
calendar/gui/Makefile.in \
|
||||
calendar/importers/Makefile.in \
|
||||
composer/Makefile.in \
|
||||
e-util/Makefile.in \
|
||||
em-format/Makefile.in \
|
||||
filter/Makefile.in \
|
||||
libemail-engine/Makefile.in \
|
||||
libemail-utils/Makefile.in \
|
||||
libgnomecanvas/Makefile.in \
|
||||
mail/Makefile.in \
|
||||
mail/importers/Makefile.in \
|
||||
shell/Makefile.in \
|
||||
smclient/Makefile.in \
|
||||
smime/gui/Makefile.in \
|
||||
smime/lib/Makefile.in \
|
||||
widgets/e-timezone-dialog/Makefile.in \
|
||||
widgets/menus/Makefile.in \
|
||||
widgets/misc/Makefile.in \
|
||||
widgets/table/Makefile.in \
|
||||
widgets/text/Makefile.in
|
||||
|
||||
pre-configure:
|
||||
for i in ${REVERT_BZ591436}; do perl -pi -e 's,-avoid-version,,g' ${WRKSRC}/$${i}; done
|
||||
${SUBST_CMD} ${WRKSRC}/modules/spamassassin/evolution-spamassassin.c \
|
||||
${WRKSRC}/modules/bogofilter/evolution-bogofilter.c
|
||||
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
$OpenBSD: patch-mail_em-utils_h,v 1.7 2012/09/28 13:49:04 ajacoutot Exp $
|
||||
$OpenBSD: patch-mail_em-utils_h,v 1.8 2012/10/28 11:24:40 ajacoutot Exp $
|
||||
|
||||
XXX push upstream
|
||||
|
||||
--- 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 @@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.33 2012/09/28 13:49:04 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.34 2012/10/28 11:24:40 ajacoutot Exp $
|
||||
@conflict evolution-plugins-<=3.2.2p0
|
||||
@pkgpath mail/evolution
|
||||
@bin bin/evolution
|
||||
@ -459,55 +459,55 @@ include/evolution-${R}/text/gal-a11y-e-text.h
|
||||
lib/evolution/
|
||||
lib/evolution/${R}/
|
||||
lib/evolution/${R}/libcomposer.la
|
||||
@lib lib/evolution/${R}/libcomposer.so.${LIBcomposer_VERSION}
|
||||
lib/evolution/${R}/libcomposer.so
|
||||
lib/evolution/${R}/libeabutil.la
|
||||
@lib lib/evolution/${R}/libeabutil.so.${LIBeabutil_VERSION}
|
||||
lib/evolution/${R}/libeabutil.so
|
||||
lib/evolution/${R}/libecontacteditor.la
|
||||
@lib lib/evolution/${R}/libecontacteditor.so.${LIBecontacteditor_VERSION}
|
||||
lib/evolution/${R}/libecontacteditor.so
|
||||
lib/evolution/${R}/libecontactlisteditor.la
|
||||
@lib lib/evolution/${R}/libecontactlisteditor.so.${LIBecontactlisteditor_VERSION}
|
||||
lib/evolution/${R}/libecontactlisteditor.so
|
||||
lib/evolution/${R}/libemail-engine.la
|
||||
@lib lib/evolution/${R}/libemail-engine.so.${LIBemail-engine_VERSION}
|
||||
lib/evolution/${R}/libemail-engine.so
|
||||
lib/evolution/${R}/libemail-utils.la
|
||||
@lib lib/evolution/${R}/libemail-utils.so.${LIBemail-utils_VERSION}
|
||||
lib/evolution/${R}/libemail-utils.so
|
||||
lib/evolution/${R}/libemformat.la
|
||||
@lib lib/evolution/${R}/libemformat.so.${LIBemformat_VERSION}
|
||||
lib/evolution/${R}/libemformat.so
|
||||
lib/evolution/${R}/libemiscwidgets.la
|
||||
@lib lib/evolution/${R}/libemiscwidgets.so.${LIBemiscwidgets_VERSION}
|
||||
lib/evolution/${R}/libemiscwidgets.so
|
||||
lib/evolution/${R}/libeshell.la
|
||||
@lib lib/evolution/${R}/libeshell.so.${LIBeshell_VERSION}
|
||||
lib/evolution/${R}/libeshell.so
|
||||
lib/evolution/${R}/libessmime.la
|
||||
@lib lib/evolution/${R}/libessmime.so.${LIBessmime_VERSION}
|
||||
lib/evolution/${R}/libessmime.so
|
||||
lib/evolution/${R}/libetable.la
|
||||
@lib lib/evolution/${R}/libetable.so.${LIBetable_VERSION}
|
||||
lib/evolution/${R}/libetable.so
|
||||
lib/evolution/${R}/libetext.la
|
||||
@lib lib/evolution/${R}/libetext.so.${LIBetext_VERSION}
|
||||
lib/evolution/${R}/libetext.so
|
||||
lib/evolution/${R}/libetimezonedialog.la
|
||||
@lib lib/evolution/${R}/libetimezonedialog.so.${LIBetimezonedialog_VERSION}
|
||||
lib/evolution/${R}/libetimezonedialog.so
|
||||
lib/evolution/${R}/libeutil.la
|
||||
@lib lib/evolution/${R}/libeutil.so.${LIBeutil_VERSION}
|
||||
lib/evolution/${R}/libeutil.so
|
||||
lib/evolution/${R}/libevolution-a11y.la
|
||||
@lib lib/evolution/${R}/libevolution-a11y.so.${LIBevolution-a11y_VERSION}
|
||||
lib/evolution/${R}/libevolution-a11y.so
|
||||
lib/evolution/${R}/libevolution-addressbook-importers.la
|
||||
@lib lib/evolution/${R}/libevolution-addressbook-importers.so.${LIBevolution-addressbook-importers_VERSION}
|
||||
lib/evolution/${R}/libevolution-addressbook-importers.so
|
||||
lib/evolution/${R}/libevolution-calendar-importers.la
|
||||
@lib lib/evolution/${R}/libevolution-calendar-importers.so.${LIBevolution-calendar-importers_VERSION}
|
||||
lib/evolution/${R}/libevolution-calendar-importers.so
|
||||
lib/evolution/${R}/libevolution-calendar.la
|
||||
@lib lib/evolution/${R}/libevolution-calendar.so.${LIBevolution-calendar_VERSION}
|
||||
lib/evolution/${R}/libevolution-calendar.so
|
||||
lib/evolution/${R}/libevolution-mail-importers.la
|
||||
@lib lib/evolution/${R}/libevolution-mail-importers.so.${LIBevolution-mail-importers_VERSION}
|
||||
lib/evolution/${R}/libevolution-mail-importers.so
|
||||
lib/evolution/${R}/libevolution-mail.la
|
||||
@lib lib/evolution/${R}/libevolution-mail.so.${LIBevolution-mail_VERSION}
|
||||
lib/evolution/${R}/libevolution-mail.so
|
||||
lib/evolution/${R}/libevolution-smime.la
|
||||
@lib lib/evolution/${R}/libevolution-smime.so.${LIBevolution-smime_VERSION}
|
||||
lib/evolution/${R}/libevolution-smime.so
|
||||
lib/evolution/${R}/libevolution-utils.la
|
||||
lib/evolution/${R}/libevolution-utils.so
|
||||
lib/evolution/${R}/libfilter.la
|
||||
@lib lib/evolution/${R}/libfilter.so.${LIBfilter_VERSION}
|
||||
lib/evolution/${R}/libfilter.so
|
||||
lib/evolution/${R}/libgnomecanvas.la
|
||||
@lib lib/evolution/${R}/libgnomecanvas.so.${LIBgnomecanvas_VERSION}
|
||||
lib/evolution/${R}/libgnomecanvas.so
|
||||
lib/evolution/${R}/libmenus.la
|
||||
@lib lib/evolution/${R}/libmenus.so.${LIBmenus_VERSION}
|
||||
lib/evolution/${R}/libmenus.so
|
||||
lib/evolution/${R}/modules/
|
||||
lib/evolution/${R}/modules/module-addressbook.so
|
||||
lib/evolution/${R}/modules/module-audio-inline.so
|
||||
|
||||
Loading…
Reference in New Issue
Block a user