forked from pool/mono-core
Accepting request 308124 from home:Warhammer40k:Mono_4_0_Custom
OBS-URL: https://build.opensuse.org/request/show/308124 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=151
This commit is contained in:
parent
3aff1ee920
commit
9024f9f81c
@ -1,22 +0,0 @@
|
||||
From acdcee6a43f762edcd3cd295cd4225d8c2b949d1 Mon Sep 17 00:00:00 2001
|
||||
From: Zoltan Varga <vargaz@gmail.com>
|
||||
Date: Tue, 31 Mar 2015 18:36:11 -0400
|
||||
Subject: [PATCH] [jit] Increase some trampoline sizes.
|
||||
|
||||
---
|
||||
mono/mini/tramp-amd64.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mono/mini/tramp-amd64.c b/mono/mini/tramp-amd64.c
|
||||
index 526ba98..0c7f8b2 100755
|
||||
--- a/mono/mini/tramp-amd64.c
|
||||
+++ b/mono/mini/tramp-amd64.c
|
||||
@@ -983,7 +983,7 @@ mono_arch_create_monitor_enter_trampoline (MonoTrampInfo **info, gboolean is_v4,
|
||||
status_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (status_offset);
|
||||
nest_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (nest_offset);
|
||||
|
||||
- tramp_size = 96;
|
||||
+ tramp_size = 128;
|
||||
|
||||
code = buf = mono_global_codeman_reserve (tramp_size);
|
||||
|
3
mono-4.0.1.43.tar.bz2
Normal file
3
mono-4.0.1.43.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6ece21dc289c822077001986a3d58182e295f3d8fb4a773c3fe8f4519bb02e0f
|
||||
size 96055179
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ff1f15f3b8d43c6a2818c00fabe377b2d8408ad14acd9d507658b4cae00f5bce
|
||||
size 97197403
|
54
mono-bug-30171.patch
Normal file
54
mono-bug-30171.patch
Normal file
@ -0,0 +1,54 @@
|
||||
From ed1d3ec5260b613849b9af27c9dbcb6566c1637c Mon Sep 17 00:00:00 2001
|
||||
From: Marek Safar <marek.safar@gmail.com>
|
||||
Date: Wed, 20 May 2015 09:55:49 +0200
|
||||
Subject: [PATCH] [corlib] BinaryReader with Unicode encoding needs to read
|
||||
bytes in a pair. Fixes #30171
|
||||
|
||||
---
|
||||
mcs/class/corlib/System.IO/BinaryReader.cs | 7 +++++++
|
||||
mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs | 14 ++++++++++++++
|
||||
2 files changed, 21 insertions(+)
|
||||
|
||||
diff --git a/mcs/class/corlib/System.IO/BinaryReader.cs b/mcs/class/corlib/System.IO/BinaryReader.cs
|
||||
index 73235c9..bbcd817 100644
|
||||
--- a/mcs/class/corlib/System.IO/BinaryReader.cs
|
||||
+++ b/mcs/class/corlib/System.IO/BinaryReader.cs
|
||||
@@ -253,6 +253,13 @@ private int ReadCharBytes (char[] buffer, int index, int count, out int bytes_re
|
||||
|
||||
m_buffer [pos ++] = (byte)read_byte;
|
||||
bytes_read ++;
|
||||
+ if (m_encoding is UnicodeEncoding) {
|
||||
+ CheckBuffer (pos + 1);
|
||||
+ read_byte = m_stream.ReadByte();
|
||||
+ if (read_byte != -1) {
|
||||
+ m_buffer [pos++] = (byte)read_byte;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
int n = m_encoding.GetChars (m_buffer, 0, pos, buffer, index + chars_read);
|
||||
if (n > 0)
|
||||
diff --git a/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs b/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs
|
||||
index 852d690..ca4e3da 100644
|
||||
--- a/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs
|
||||
+++ b/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs
|
||||
@@ -274,6 +274,20 @@ public void TestReadChar()
|
||||
}
|
||||
}
|
||||
|
||||
+ [Test]
|
||||
+ public void TestReadUnicode ()
|
||||
+ {
|
||||
+ char testChar1 = 'H';
|
||||
+ using (var stream = new MemoryStream())
|
||||
+ using (var writer = new BinaryWriter(stream, Encoding.Unicode, true))
|
||||
+ using (var reader = new BinaryReader(stream, Encoding.Unicode))
|
||||
+ {
|
||||
+ writer.Write(testChar1);
|
||||
+ stream.Position = 0;
|
||||
+ Assert.AreEqual ('H', reader.ReadChar ());
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
//-TODO: (TestRead[Type]*) Verify the ReadBoolean, ReadByte ....
|
||||
// ReadBoolean, ReadByte, ReadChar, ReadInt32 Done
|
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 20 11:00:00 UTC 2015 - fwdsbs.to.11df@xoxy.net
|
||||
|
||||
- Update to version 4.0.1.43:
|
||||
* fixed bugs: 29459, 29898, 29667, 28557, 29177, 28847, 28209, 26998, 29039 and more
|
||||
* fixes in mono profiler
|
||||
- Add mono-bug-30171.patch to fix BinaryReader bug with Unicode encoding
|
||||
- Removed amd64-tramp-size.patch (fix included in 4.0.1.43 release)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 20 09:50:17 UTC 2015 - idonmez@suse.com
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
%define sgen yes
|
||||
|
||||
Name: mono-core
|
||||
Version: 4.0.1
|
||||
Version: 4.0.1.43
|
||||
Release: 0
|
||||
Summary: Cross-platform, Open Source, .NET development framework
|
||||
License: LGPL-2.1 and MIT and MS-PL
|
||||
@ -36,10 +36,10 @@ Patch0: mono-nunit-default-runtime-4.5.patch
|
||||
# so cp won't work, should add -r argument
|
||||
# https://github.com/mono/mono/pull/1764
|
||||
Patch1: mono-3.x-keyboards.resources-cp_r.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/mono/mono/commit/acdcee6a43f762edcd3cd295cd4225d8c2b949d1.patch
|
||||
Patch2: amd64-tramp-size.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/mono/mono/commit/bcb651
|
||||
Patch3: mono-bug-28777.patch
|
||||
Patch2: mono-bug-28777.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/mono/mono/commit/ed1d3ec5260b613849b9af27c9dbcb6566c1637c.patch
|
||||
Patch3: mono-bug-30171.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
@ -109,7 +109,7 @@ cross-platform .NET applications. The project will implement various
|
||||
technologies that have been submitted to the ECMA for standardization.
|
||||
|
||||
%prep
|
||||
%setup -q -n mono-%{version}
|
||||
%setup -q -n mono-4.0.1
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
Loading…
Reference in New Issue
Block a user