diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-05-12 20:30:20 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-05-12 20:30:20 +0000 |
| commit | d2759267c93b06e05f22a109f81d1b8b8f5433f2 (patch) | |
| tree | b43ffdfbce78d7176afedf4342f1992f0e38d0ca /dev-lang | |
| parent | stable x86, bug 266986 (diff) | |
| download | gentoo-2-d2759267c93b06e05f22a109f81d1b8b8f5433f2.tar.gz gentoo-2-d2759267c93b06e05f22a109f81d1b8b8f5433f2.tar.bz2 gentoo-2-d2759267c93b06e05f22a109f81d1b8b8f5433f2.zip | |
Revbump with fix for bug 257313, OOM bug when compiling openoffice.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/mono/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/mono/files/mono-2.4-openoffice.patch | 40 | ||||
| -rw-r--r-- | dev-lang/mono/mono-2.4-r2.ebuild (renamed from dev-lang/mono/mono-2.4-r1.ebuild) | 3 |
3 files changed, 49 insertions, 2 deletions
diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog index 2572e05e6495..41e0d6352613 100644 --- a/dev-lang/mono/ChangeLog +++ b/dev-lang/mono/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/mono # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.168 2009/05/09 00:16:48 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.169 2009/05/12 20:30:20 loki_val Exp $ + +*mono-2.4-r2 (12 May 2009) + + 12 May 2009; Peter Alfredsen <loki_val@gentoo.org> -mono-2.4-r1.ebuild, + +mono-2.4-r2.ebuild, +files/mono-2.4-openoffice.patch: + Revbump with fix for bug 257313, OOM bug when compiling openoffice. 09 May 2009; Peter Alfredsen <loki_val@gentoo.org> mono-2.4.9999.ebuild: Switch back to 2-4 branch diff --git a/dev-lang/mono/files/mono-2.4-openoffice.patch b/dev-lang/mono/files/mono-2.4-openoffice.patch new file mode 100644 index 000000000000..1b09dec88795 --- /dev/null +++ b/dev-lang/mono/files/mono-2.4-openoffice.patch @@ -0,0 +1,40 @@ +--- trunk/mcs/mcs/class.cs 2009/04/28 17:00:23 132860 ++++ trunk/mcs/mcs/class.cs 2009/04/28 17:02:37 132861 +@@ -2905,6 +2905,9 @@ + } + + public sealed class Struct : ClassOrStruct { ++ ++ bool is_unmanaged, has_unmanaged_check_done; ++ + // <summary> + // Modifiers allowed in a struct declaration + // </summary> +@@ -2964,6 +2967,11 @@ + if (requires_delayed_unmanagedtype_check) + return true; + ++ if (has_unmanaged_check_done) ++ return is_unmanaged; ++ ++ has_unmanaged_check_done = true; ++ + foreach (FieldBase f in fields) { + if ((f.ModFlags & Modifiers.STATIC) != 0) + continue; +@@ -2972,6 +2980,7 @@ + // struct S { S* s; } + Type mt = f.MemberType; + if (mt == null) { ++ has_unmanaged_check_done = false; + requires_delayed_unmanagedtype_check = true; + return true; + } +@@ -2988,6 +2997,7 @@ + return false; + } + ++ is_unmanaged = true; + return true; + } + diff --git a/dev-lang/mono/mono-2.4-r1.ebuild b/dev-lang/mono/mono-2.4-r2.ebuild index d46c1997f378..a680cfd7b228 100644 --- a/dev-lang/mono/mono-2.4-r1.ebuild +++ b/dev-lang/mono/mono-2.4-r2.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/dev-lang/mono/mono-2.4-r1.ebuild,v 1.1 2009/05/08 09:44:19 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.4-r2.ebuild,v 1.1 2009/05/12 20:30:20 loki_val Exp $ EAPI=2 @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}/mono-2.2-ppc-threading.patch" "${FILESDIR}/mono-2.2-uselibdir.patch" "${FILESDIR}/mono-2.4-ppcbuild-fix.patch" + "${FILESDIR}/mono-2.4-openoffice.patch" ) pkg_setup() { |