diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2009-01-27 15:04:39 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2009-01-27 15:04:39 +0000 |
| commit | d54bd773ca73654beb3c74971a54ce5d50cdf24e (patch) | |
| tree | 1d79414b587014ee562bccc7b56ac2b8b09ec0be /app-office | |
| parent | Bump to new soprano-2.2 (diff) | |
| download | gentoo-2-d54bd773ca73654beb3c74971a54ce5d50cdf24e.tar.gz gentoo-2-d54bd773ca73654beb3c74971a54ce5d50cdf24e.tar.bz2 gentoo-2-d54bd773ca73654beb3c74971a54ce5d50cdf24e.zip | |
Fix build problems with Mono 2.2, see bug #255845
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/files/buildfix-mono-2-2.diff | 12 | ||||
| -rw-r--r-- | app-office/openoffice/files/gentoo-3.0.1_rc2.diff | 10 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.0.1_rc2.ebuild | 3 |
4 files changed, 30 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index df13e2f3d6ec..c918a3a56f23 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.443 2009/01/18 19:12:40 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.444 2009/01/27 15:04:39 suka Exp $ + + 27 Jan 2009; Andreas Proschofsky <suka@gentoo.org> + +files/buildfix-mono-2-2.diff, files/gentoo-3.0.1_rc2.diff, + openoffice-3.0.1_rc2.ebuild: + Fix build problems with Mono 2.2, see bug #255845 *openoffice-3.0.1_rc2 (18 Jan 2009) diff --git a/app-office/openoffice/files/buildfix-mono-2-2.diff b/app-office/openoffice/files/buildfix-mono-2-2.diff new file mode 100644 index 000000000000..69ca27cb5743 --- /dev/null +++ b/app-office/openoffice/files/buildfix-mono-2-2.diff @@ -0,0 +1,12 @@ +--- cli_ure/source/climaker/makefile.mk ++++ cli_ure/source/climaker/makefile.mk +@@ -62,7 +62,7 @@ + + $(BIN)$/climaker : climaker_csharp.cs + gmcs -debug -unsafe climaker_csharp.cs -reference:$(BIN)/cli_basetypes.dll -out:$(BIN)$/climaker.exe +- mkbundle2 --static -L $(OUT)/lib --deps -o $(BIN)$/climaker $(BIN)$/climaker.exe $(BIN)/cli_basetypes.dll ++ mkbundle2 -L $(OUT)/lib --deps -o $(BIN)$/climaker $(BIN)$/climaker.exe $(BIN)/cli_basetypes.dll + + .INCLUDE : target.mk + .ENDIF # "$(ENABLE_MONO_CLIMAKER)" != "YES" + diff --git a/app-office/openoffice/files/gentoo-3.0.1_rc2.diff b/app-office/openoffice/files/gentoo-3.0.1_rc2.diff index 9617f4f35fa8..6e7423f882b4 100644 --- a/app-office/openoffice/files/gentoo-3.0.1_rc2.diff +++ b/app-office/openoffice/files/gentoo-3.0.1_rc2.diff @@ -21,4 +21,14 @@ # Allow build to proceed with PaX enabled gentoo-pax-fix.diff, aprosky # support server-only versions of 64bit JDKs +@@ -1527,6 +1527,9 @@ + mono-climaker-config.diff + mono-climaker-bridgetest.diff + ++# Buildfix with Mono 2.2, aprosky ++buildfix-mono-2-2.diff ++ + [ VBAObjects ] + SectionOwner => noelpwer + diff --git a/app-office/openoffice/openoffice-3.0.1_rc2.ebuild b/app-office/openoffice/openoffice-3.0.1_rc2.ebuild index e22ef7447190..d60f0a5dc7ce 100644 --- a/app-office/openoffice/openoffice-3.0.1_rc2.ebuild +++ b/app-office/openoffice/openoffice-3.0.1_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1_rc2.ebuild,v 1.1 2009/01/18 19:12:40 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1_rc2.ebuild,v 1.2 2009/01/27 15:04:39 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -242,6 +242,7 @@ src_unpack() { epatch "${FILESDIR}/ooo-env_log.diff" cp -f "${FILESDIR}/nojavanostax.diff" "${S}/patches/dev300" || die cp -f "${FILESDIR}/hunspell-one-dir-nocrash.diff" "${S}/patches/dev300" || die + cp -f "${FILESDIR}/buildfix-mono-2-2.diff" "${S}/patches/dev300" || die #Use flag checks if use java ; then |