diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-11-12 22:11:35 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-11-12 22:11:35 +0000 |
| commit | 3633c37e95d59551772f1651e71f11f9087449ee (patch) | |
| tree | 36b99eefcddcb6efc2559f9ec1379a00e133870c /editors/openoffice.org-vcltesttool/files | |
| parent | Depreciate. (diff) | |
* Add evolution2 support [1]
* Fix typo [2]
* Fix installation [3]
PR: 105400 [2]
Suggested by: Vizo Allman <vizoster@gmail.com> [1], Jack L. <xxjack12xx@gmail.
com> [3]
Submitted by: Alexey Shuvaev [2]
Notes
Notes:
svn path=/head/; revision=177141
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files')
4 files changed, 13 insertions, 36 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs index 85ab949146a4..9ce1258cdf1c 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs +++ b/editors/openoffice.org-vcltesttool/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.org-vcltesttool/files/generate.pl b/editors/openoffice.org-vcltesttool/files/generate.pl index bfde49b32475..8e400c20d4fe 100644 --- a/editors/openoffice.org-vcltesttool/files/generate.pl +++ b/editors/openoffice.org-vcltesttool/files/generate.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # generate full build shell script for OpenOffice.org # Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/generate.pl,v 1.8 2005-11-25 23:22:20 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/generate.pl,v 1.9 2006-11-12 22:11:34 maho Exp $ print "#!/bin/csh\n"; print "make deinstall clean\n"; diff --git a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper b/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper index 382488f39adc..45c88c77163a 100644 --- a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper +++ b/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/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.org-vcltesttool/files/patch-i71039 b/editors/openoffice.org-vcltesttool/files/patch-i71039 deleted file mode 100644 index 8f0897bc862b..000000000000 --- a/editors/openoffice.org-vcltesttool/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; - }; - - |