From 0b6b3c33f658e1b5708eda185e5660584243a7565e1eb3b261d04d89ae260540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 28 May 2015 21:18:54 +0000 Subject: [PATCH] Accepting request 309109 from home:Warhammer40k:Mono_4_0_Custom OBS-URL: https://build.opensuse.org/request/show/309109 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=152 --- mono-4.0.1.43.tar.bz2 | 3 --- mono-4.0.1.44.tar.bz2 | 3 +++ mono-bug-30171.patch | 54 ------------------------------------------- mono-core.changes | 7 ++++++ mono-core.spec | 5 +--- 5 files changed, 11 insertions(+), 61 deletions(-) delete mode 100644 mono-4.0.1.43.tar.bz2 create mode 100644 mono-4.0.1.44.tar.bz2 delete mode 100644 mono-bug-30171.patch diff --git a/mono-4.0.1.43.tar.bz2 b/mono-4.0.1.43.tar.bz2 deleted file mode 100644 index 49a3b23..0000000 --- a/mono-4.0.1.43.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ece21dc289c822077001986a3d58182e295f3d8fb4a773c3fe8f4519bb02e0f -size 96055179 diff --git a/mono-4.0.1.44.tar.bz2 b/mono-4.0.1.44.tar.bz2 new file mode 100644 index 0000000..03c8a18 --- /dev/null +++ b/mono-4.0.1.44.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eaf5bd9d19818cb89483b3c9cae2ee3569643fd621560da036f6a49f6b3e3a6f +size 96054454 diff --git a/mono-bug-30171.patch b/mono-bug-30171.patch deleted file mode 100644 index ebc0cb6..0000000 --- a/mono-bug-30171.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ed1d3ec5260b613849b9af27c9dbcb6566c1637c Mon Sep 17 00:00:00 2001 -From: Marek Safar -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 diff --git a/mono-core.changes b/mono-core.changes index 0430ab6..26cc369 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 28 18:00:00 UTC 2015 - fwdsbs.to.11df@xoxy.net + +- Update to version 4.0.1.44: + * fixed bug: 30171 +- Removed mono-bug-30171.patch (fix included in 4.0.1.44 release) + ------------------------------------------------------------------- Wed May 20 11:00:00 UTC 2015 - fwdsbs.to.11df@xoxy.net diff --git a/mono-core.spec b/mono-core.spec index d2abbdf..c84631f 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -21,7 +21,7 @@ %define sgen yes Name: mono-core -Version: 4.0.1.43 +Version: 4.0.1.44 Release: 0 Summary: Cross-platform, Open Source, .NET development framework License: LGPL-2.1 and MIT and MS-PL @@ -38,8 +38,6 @@ Patch0: mono-nunit-default-runtime-4.5.patch Patch1: mono-3.x-keyboards.resources-cp_r.patch # PATCH-FIX-UPSTREAM https://github.com/mono/mono/commit/bcb651 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 @@ -113,7 +111,6 @@ technologies that have been submitted to the ECMA for standardization. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build NOCONFIGURE="yes" ./autogen.sh