diff options
Diffstat (limited to 'editors/openoffice-3-devel/files')
| -rw-r--r-- | editors/openoffice-3-devel/files/Makefile.knobs | 11 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/openoffice.org-wrapper | 2 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-i71039 | 34 |
3 files changed, 12 insertions, 35 deletions
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs index 85ab949146a4..9ce1258cdf1c 100644 --- a/editors/openoffice-3-devel/files/Makefile.knobs +++ b/editors/openoffice-3-devel/files/Makefile.knobs @@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --disable-gnome-vfs USE_GNOME+= gnomevfs2 .endif +.if defined(WITH_EVOLUTION2) +CONFIGURE_ARGS+= --enable-evolution2=yes +.else +USE_GNOME+= glib20 +.endif + .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL .else @@ -121,6 +127,11 @@ pre-fetch: @${ECHO} "You can compile OOo with gpc instead of libart by" @${ECHO} "make -DWITH_GPC" .endif +.if !defined(WITH_EVOLUTION2) + @${ECHO} + @${ECHO} "You can compile OOo with evolution2 support by" + @${ECHO} "make -DWITH_EVOLUTION2" +.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} diff --git a/editors/openoffice-3-devel/files/openoffice.org-wrapper b/editors/openoffice-3-devel/files/openoffice.org-wrapper index a5149e8e21d5..8c741007682a 100644 --- a/editors/openoffice-3-devel/files/openoffice.org-wrapper +++ b/editors/openoffice-3-devel/files/openoffice.org-wrapper @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` diff --git a/editors/openoffice-3-devel/files/patch-i71039 b/editors/openoffice-3-devel/files/patch-i71039 deleted file mode 100644 index 8f0897bc862b..000000000000 --- a/editors/openoffice-3-devel/files/patch-i71039 +++ /dev/null @@ -1,34 +0,0 @@ ---- binfilter/inc/bf_svx/svdobj.hxx.orig Mon Oct 23 13:47:55 2006 -+++ binfilter/inc/bf_svx/svdobj.hxx Mon Oct 23 13:48:08 2006 -@@ -265,7 +265,7 @@ - {} - virtual ~SdrObjUserData(); - -- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; -+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } - virtual void WriteData(SvStream& rOut); - ---- svx/inc/svdobj.hxx.orig Mon Oct 23 12:56:33 2006 -+++ svx/inc/svdobj.hxx Mon Oct 23 12:56:50 2006 -@@ -323,7 +323,7 @@ - {} - virtual ~SdrObjUserData(); - -- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; -+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } - //BFS01virtual void WriteData(SvStream& rOut); ---- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005 -+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006 -@@ -444,7 +444,7 @@ - - protected: - /** Derived classes create a new accessible object here. */ -- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL; -+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0; - }; - - |