summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johanson <latexer@gentoo.org>2006-01-15 07:08:22 +0000
committerPeter Johanson <latexer@gentoo.org>2006-01-15 07:08:22 +0000
commit0089584d9988602549c03b33172addcbda760de3 (patch)
tree689c3408a3780810d60146d65e7d0e4edfb84112 /dev-lang/mono/files
parentBump. (diff)
downloadgentoo-2-0089584d9988602549c03b33172addcbda760de3.tar.gz
gentoo-2-0089584d9988602549c03b33172addcbda760de3.tar.bz2
gentoo-2-0089584d9988602549c03b33172addcbda760de3.zip
Bump to new release, revision bump older release to include fix for problem with boo, and remove some older releases.
(Portage version: 2.0.53)
Diffstat (limited to 'dev-lang/mono/files')
-rw-r--r--dev-lang/mono/files/digest-mono-1.1.101
-rw-r--r--dev-lang/mono/files/digest-mono-1.1.121
-rw-r--r--dev-lang/mono/files/digest-mono-1.1.12.1-r1 (renamed from dev-lang/mono/files/digest-mono-1.1.12.1)0
-rw-r--r--dev-lang/mono/files/digest-mono-1.1.13.11
-rw-r--r--dev-lang/mono/files/mono-1.1.13-pathfix.diff12
-rw-r--r--dev-lang/mono/files/mono-1.1.13-resource-manager.diff147
6 files changed, 160 insertions, 2 deletions
diff --git a/dev-lang/mono/files/digest-mono-1.1.10 b/dev-lang/mono/files/digest-mono-1.1.10
deleted file mode 100644
index 18bc91935f6c..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dd04088e82b7cf69a417fd06bddd9148 mono-1.1.10.tar.gz 17083925
diff --git a/dev-lang/mono/files/digest-mono-1.1.12 b/dev-lang/mono/files/digest-mono-1.1.12
deleted file mode 100644
index eeb86db94a87..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9015dedfe5982285797b3ddab0ebd9b4 mono-1.1.12.tar.gz 17808263
diff --git a/dev-lang/mono/files/digest-mono-1.1.12.1 b/dev-lang/mono/files/digest-mono-1.1.12.1-r1
index 330e4dbbbf1f..330e4dbbbf1f 100644
--- a/dev-lang/mono/files/digest-mono-1.1.12.1
+++ b/dev-lang/mono/files/digest-mono-1.1.12.1-r1
diff --git a/dev-lang/mono/files/digest-mono-1.1.13.1 b/dev-lang/mono/files/digest-mono-1.1.13.1
new file mode 100644
index 000000000000..baae124626b5
--- /dev/null
+++ b/dev-lang/mono/files/digest-mono-1.1.13.1
@@ -0,0 +1 @@
+MD5 b019e29082aa49267320c3993efcc385 mono-1.1.13.1.tar.gz 17989571
diff --git a/dev-lang/mono/files/mono-1.1.13-pathfix.diff b/dev-lang/mono/files/mono-1.1.13-pathfix.diff
new file mode 100644
index 000000000000..f4296381bfd5
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.13-pathfix.diff
@@ -0,0 +1,12 @@
+diff -aur mono-1.1.13-orig/mcs/class/corlib/System.IO/Path.cs mono-1.1.13/mcs/class/corlib/System.IO/Path.cs
+--- mono-1.1.13-orig/mcs/class/corlib/System.IO/Path.cs 2005-12-21 17:54:10.000000000 -0800
++++ mono-1.1.13/mcs/class/corlib/System.IO/Path.cs 2006-01-10 21:31:05.000000000 -0800
+@@ -519,7 +519,7 @@
+ //if (root == path) return path;
+
+ // STEP 3: split the directories, this gets rid of consecutative "/"'s
+- string[] dirs = path.Split (Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
++ string[] dirs = path.Split (Path.DirectorySeparatorChar);
+ // STEP 4: Get rid of directories containing . and ..
+ int target = 0;
+
diff --git a/dev-lang/mono/files/mono-1.1.13-resource-manager.diff b/dev-lang/mono/files/mono-1.1.13-resource-manager.diff
new file mode 100644
index 000000000000..32720825ed0f
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.13-resource-manager.diff
@@ -0,0 +1,147 @@
+diff -aur mono-1.1.13-orig/mcs/class/corlib/corlib_test.dll.sources mono-1.1.13/mcs/class/corlib/corlib_test.dll.sources
+--- mono-1.1.13-orig/mcs/class/corlib/corlib_test.dll.sources 2005-12-15 09:53:24.000000000 -0800
++++ mono-1.1.13/mcs/class/corlib/corlib_test.dll.sources 2006-01-13 14:34:40.000000000 -0800
+@@ -120,6 +120,7 @@
+ System.Reflection/StrongNameKeyPairTest.cs
+ System/ResolveEventArgsTest.cs
+ System.Resources/ResourceReaderTest.cs
++System.Resources/ResourceManagerTest.cs
+ System.Runtime.CompilerServices/RuntimeHelpersTest.cs
+ System.Runtime.InteropServices/GCHandleTest.cs
+ System.Runtime.InteropServices/MarshalTest.cs
+diff -aur mono-1.1.13-orig/mcs/class/corlib/System.Resources/ResourceManager.cs mono-1.1.13/mcs/class/corlib/System.Resources/ResourceManager.cs
+--- mono-1.1.13-orig/mcs/class/corlib/System.Resources/ResourceManager.cs 2005-06-23 16:11:11.000000000 -0700
++++ mono-1.1.13/mcs/class/corlib/System.Resources/ResourceManager.cs 2006-01-13 14:34:40.000000000 -0800
+@@ -9,7 +9,7 @@
+ //
+
+ //
+-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
++// Copyright (C) 2004, 2005 Novell, Inc (http://www.novell.com)
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the
+@@ -161,44 +161,37 @@
+ return(GetObject(name, null));
+ }
+
+- public virtual object GetObject(string name, CultureInfo culture)
++ public virtual object GetObject (string name, CultureInfo culture)
+ {
+- if(name==null) {
+- throw new ArgumentNullException("name is null");
++ if (name == null) {
++ throw new ArgumentNullException("name");
+ }
+
+- if(culture==null) {
+- culture=CultureInfo.CurrentUICulture;
++ if (culture == null) {
++ culture = CultureInfo.CurrentUICulture;
+ }
+
+- lock(this) {
+- ResourceSet set=InternalGetResourceSet(culture, true, true);
+- object obj=null;
++ lock (this) {
++ while (true) {
++
++ ResourceSet set = InternalGetResourceSet (culture, true, true);
+
+- if(set != null) {
+- obj=set.GetObject(name, ignoreCase);
+- if(obj != null) {
+- return(obj);
++ if (set != null) {
++ object obj = set.GetObject(name, ignoreCase);
++ if (obj != null) {
++ return obj;
++ }
+ }
+- }
+-
+- /* Try parent cultures */
+
+- do {
+- culture=culture.Parent;
++ if (culture == neutral_culture ||
++ culture == CultureInfo.InvariantCulture)
++ break;
+
+- set=InternalGetResourceSet(culture, true, true);
+- if(set!=null) {
+- obj=set.GetObject(name, ignoreCase);
+- if(obj != null) {
+- return(obj);
+- }
+- }
+- } while(!culture.Equals(neutral_culture) &&
+- !culture.Equals(CultureInfo.InvariantCulture));
++ culture = culture.Parent;
++ }
+ }
+
+- return(null);
++ return null;
+ }
+
+
+@@ -223,41 +216,33 @@
+ public virtual string GetString (string name, CultureInfo culture)
+ {
+ if (name == null) {
+- throw new ArgumentNullException ("Name is null.");
++ throw new ArgumentNullException ("name");
+ }
+
+- if(culture==null) {
+- culture=CultureInfo.CurrentUICulture;
++ if(culture == null) {
++ culture = CultureInfo.CurrentUICulture;
+ }
+
+- lock(this) {
+- ResourceSet set=InternalGetResourceSet(culture, true, true);
+- string str=null;
++ lock (this) {
++ while (true) {
++ ResourceSet set = InternalGetResourceSet (culture, true, true);
+
+- if(set!=null) {
+- str=set.GetString(name, ignoreCase);
+- if(str!=null) {
+- return(str);
++ if (set != null) {
++ string str = set.GetString (name, ignoreCase);
++ if (str != null) {
++ return str;
++ }
+ }
+- }
+-
+- /* Try parent cultures */
+
+- do {
+- culture=culture.Parent;
++ if (culture == neutral_culture ||
++ culture == CultureInfo.InvariantCulture)
++ break;
+
+- set=InternalGetResourceSet(culture, true, true);
+- if(set!=null) {
+- str=set.GetString(name, ignoreCase);
+- if(str!=null) {
+- return(str);
+- }
+- }
+- } while(!culture.Equals(neutral_culture) &&
+- !culture.Equals(CultureInfo.InvariantCulture));
++ culture = culture.Parent;
++ }
+ }
+
+- return(null);
++ return null;
+ }
+
+ protected virtual string GetResourceFileName (CultureInfo culture)