From 46989dc4fc42a0b0b1dffbadd3f76059fd35eff4f756c6ea1316573d9bcf2860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 13 Oct 2014 14:51:51 +0000 Subject: [PATCH 1/4] Accepting request 253976 from home:Mailaender:branches:Mono:Factory OBS-URL: https://build.opensuse.org/request/show/253976 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=133 --- mono-3.10.0.tar.bz2 | 3 ++ mono-3.8.0.tar.bz2 | 3 -- mono-core-parallel-build.diff | 13 -------- mono-core.changes | 56 +++++++++++++++++++++++++++++++++++ mono-core.spec | 5 +--- 5 files changed, 60 insertions(+), 20 deletions(-) create mode 100644 mono-3.10.0.tar.bz2 delete mode 100644 mono-3.8.0.tar.bz2 delete mode 100644 mono-core-parallel-build.diff diff --git a/mono-3.10.0.tar.bz2 b/mono-3.10.0.tar.bz2 new file mode 100644 index 0000000..4831937 --- /dev/null +++ b/mono-3.10.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd74d1a6810d2d9b4733b4affbda67958e61520aade531c73103568dc18ab0b4 +size 73485820 diff --git a/mono-3.8.0.tar.bz2 b/mono-3.8.0.tar.bz2 deleted file mode 100644 index e0da0bb..0000000 --- a/mono-3.8.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71b80d555f334a05a8db386e1c41e1a2f61a845c57726205f846e563a5ee2a4b -size 73495543 diff --git a/mono-core-parallel-build.diff b/mono-core-parallel-build.diff deleted file mode 100644 index 6337447..0000000 --- a/mono-core-parallel-build.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: mono-3.4.0/mcs/Makefile -=================================================================== ---- mono-3.4.0.orig/mcs/Makefile -+++ mono-3.4.0/mcs/Makefile -@@ -83,7 +83,7 @@ all-local $(STD_TARGETS:=-local): - @: - - dir-check: -- @if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then make -C ../runtime; fi -+ @if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then $(MAKE) -C ../runtime; fi - - # fun specialty targets - diff --git a/mono-core.changes b/mono-core.changes index 305fc47..c247a51 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Sat Oct 4 18:46:11 UTC 2014 - mailaender@opensuse.org + +- Removed upstreamed mono-core-parallel-build.diff patch +- Updated to 3.10.0 + + Implemented System.IO.Compression.FileSystem. + + Uri now implements the .NET 4.5 behavior, it can be reverted to the old behavior in the same way by setting the System.Uri::s_IriParsing static field to false. + + Remove unnecessary locking from core metadata parsing functions. + + Avoid cache thrashing of locals array when looping over enumerator. + + Fix support for unaligned offsets in the store_membase_imm opcodes. bxc#23267. + + Fix the lookup of nested types which have a namespace. bxc#21653. + + Increase some opcode sizes. bxc#23026. + + Always pass the imt arg to interface calls in gsharedvt methods. bxc#22624. + + Store the epilog length in MonoArchEHJitInfo instead of encoding it in jinfo->unwind_desc, since the latter can overflow for methods with large epilogs. bxc#22685. + + Add a mono_thread_detach_if_exiting () public api function which can be called by embedding code to detach the runtime if the code is running from a pthread dtor. bxc#21164. + + Fix yet another native types problem. bxc#22053. + + Fix the leaking of mach ports introduced by 98bbf8512aec0fa01b4426583280f6d231d22187. bxc#22068. + + Add support for constrained calls with vtype return types in gsharedvt code. bxc#22109. + + Fix the PLATFORM_GNU check so it works with gnueabi etc. as well. bxc#21520. + + Don’t make runtime invoke signatures generic. bxc#21973. + + Allow v8..v15 in unwind info on arm64. Fixes part of #21615. + + Fix Process.PrivateMemorySize64 etc. on ios. bxc#21882. + + Fix enum->int casts in gsharedvt code. bxc#21893. + + Don’t assert when loading a generic methodspec with 0 arity. bxc#19097. + + Avoid asserting when a cattr cannot be loaded. bxc#21653. + + Avoid making generic calls from gsharedvt methods normally, go through the rgctx infrastructure instead. bxc#21677. + + Fix Uri UserInfo parsing. Fixes 23246. + + Update RequestMessage.RequestUri.AbsoluteUri after redirect. bxc#22383. + + Fixes XContainer attempt to create a XNode from a null value. bxc#20151. + + Changed XObject OnChanged and OnChanging to use Owner. When XObject.Owner is not a XElement XObject.Parent returns null and the owner would not be notified of changing and changed events. bxc#18772. + + Process XslLiteralElements with only child attributes as empty ones. bxc#14751. + + ‘finally’ protect ClientRuntimeChannel.Begin/EndProcess(). bxc#22179. + + WebClient.OpenWrite() must get the response on close. bxc#10163. + + Fix WebClient.UploadValuesTaskAsync(); bxc#20359. + + Improve System.Security.Claims. bxc#22282. + + Fixed serialization of XmlNode field with attribute XmlAnyElement. bxc#3211. + + Handle String::Format with escaped closing }. bxc#22114 + + Add a missing check to TypeBuilder.CreateType (). bxc#22059. + + Xml Serialization of Base class w/o a parameterless constructor. Removed validation code that did not allowed serialization of base classes without a parameterless constructor. bxc#6913. + + Fixed XmlSerializer to handle attribute XmlSchemePrivider.IsAny. XmlSerializer no longer outputs a root element with class name when the class has the attribute + XmlSchemeProvider and IsAny is true. bxc#11916 + + Test that DeflateStream.Read does read an empty stream. Covers #19313. + + Reseting all private key values to null is required because a new import may not overwrite existing values. bxc#18482. + + Handle quoted filename value. bxc#21960. + + Dispose XmlReader using correct value. bxc#21771. + + Don’t use `1 naming for compiler generated second level and deeper nested types. bxc#22893. + + Extend missing type check to type lookups. bxc#20933. + + Fix copy and paste error in constraints checker. bxc#22131. + + Speed up nullable tokenizer. bxc#20195. + + Coalescing operator if the lhs of a null is a integer type that is larger than the integer type on the rhs. bxc#22054. + + Check for duplicate destructors. bxc#21983. + + Switch statement with constant block at first label. bxc#21805. + + Decimal constants modulo folding. bxc#21743. + + Update codegen for boolean loads. bxc#21685. + + Workaround for issues with CreateItem task where metadata are not generated due to up-to-data inputs. bxc#23022. + + Add KeepDuplicates etc. to 4.0 as internal. bxc#20961. + ------------------------------------------------------------------- Sat Sep 6 15:12:18 UTC 2014 - mailaender@opensuse.org diff --git a/mono-core.spec b/mono-core.spec index 85984c1..d2ee8c4 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -21,7 +21,7 @@ %define sgen yes Name: mono-core -Version: 3.8.0 +Version: 3.10.0 Release: 0 Summary: Cross-platform, Open Source, .NET development framework License: LGPL-2.1 and MIT and MS-PL @@ -31,8 +31,6 @@ Source0: http://download.mono-project.com/sources/mono/mono-%{version}.ta Source1: mono-core.rpmlintrc # PATCH-FIX-UPSTREAM mono-core-target-4.0.patch dimstar@opensuse.org -- Use runtime 4.0 as default for cairo and nunit -- https://github.com/mono/mono/pull/1209 Patch5: mono-core-target-4.0.patch -# PATCH-FIX-UPSTREAM -- ro@suse.de -- https://github.com/mono/mono/pull/1210 -Patch6: mono-core-parallel-build.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch7: mono-core-ppc64le.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -98,7 +96,6 @@ technologies that have been submitted to the ECMA for standardization. %prep %setup -q -n mono-%{version} %patch5 -p1 -%patch6 -p1 %ifarch ppc64 %patch7 -p1 %patch8 -p1 From d9d9bc95bef171c8539347169239f338f9cf0ddafe571205b055935b1673e48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 4 Nov 2014 07:16:08 +0000 Subject: [PATCH 2/4] Accepting request 259287 from home:MargueriteSu:branches:Mono:Factory resubmit OBS-URL: https://build.opensuse.org/request/show/259287 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=134 --- mono-3.x-keyboards.resources-cp_r.patch | 18 ++++++++++++++++++ mono-core-target-4.0.patch | 19 ------------------- mono-core.changes | 12 ++++++++++++ mono-core.spec | 11 ++++++----- mono-nunit-default-runtime-4.5.patch | 10 ++++++++++ 5 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 mono-3.x-keyboards.resources-cp_r.patch delete mode 100644 mono-core-target-4.0.patch create mode 100644 mono-nunit-default-runtime-4.5.patch diff --git a/mono-3.x-keyboards.resources-cp_r.patch b/mono-3.x-keyboards.resources-cp_r.patch new file mode 100644 index 0000000..b51826d --- /dev/null +++ b/mono-3.x-keyboards.resources-cp_r.patch @@ -0,0 +1,18 @@ +Index: mono-3.10.0/mcs/class/Managed.Windows.Forms/Makefile +=================================================================== +--- mono-3.10.0.orig/mcs/class/Managed.Windows.Forms/Makefile ++++ mono-3.10.0/mcs/class/Managed.Windows.Forms/Makefile +@@ -122,11 +122,11 @@ TEST_HARNESS_EXCLUDES_ONDOTNET = -exclud + $(the_lib): $(RESOURCES) + + $(RESX_RESOURCES): %.resources: %.resx +- $(RESGEN) $< || cp $@.prebuilt $@ ++ $(RESGEN) $< || cp -r $@.prebuilt $@ + + $(LIBRARY): $(CUR_RESOURCES) + + $(PREBUILT): %.prebuilt: % +- cp $* $@ ++ cp -r $* $@ + + dist-default: $(PREBUILT) diff --git a/mono-core-target-4.0.patch b/mono-core-target-4.0.patch deleted file mode 100644 index 6525c96..0000000 --- a/mono-core-target-4.0.patch +++ /dev/null @@ -1,19 +0,0 @@ -Subject: use runtime 4.0 as default for cairo and nunit - ---- - data/mono-nunit.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/mono-nunit.pc.in b/data/mono-nunit.pc.in -index 5f4e116..e454c30 100644 ---- a/data/mono-nunit.pc.in -+++ b/data/mono-nunit.pc.in -@@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib - Name: Mono NUnit - Description: Mono's version of NUnit - Version: @VERSION@ --Libs: -r:${libdir}/mono/2.0/nunit.core.dll -r:${libdir}/mono/2.0/nunit.core.interfaces.dll -r:${libdir}/mono/2.0/nunit.core.extensions.dll -r:${libdir}/mono/2.0/nunit.framework.dll -r:${libdir}/mono/2.0/nunit.framework.extensions.dll -r:${libdir}/mono/2.0/nunit.mocks.dll -r:${libdir}/mono/2.0/nunit.util.dll -r:${libdir}/mono/2.0/nunit-console-runner.dll -+Libs: -r:${libdir}/mono/4.0/nunit.core.dll -r:${libdir}/mono/4.0/nunit.core.interfaces.dll -r:${libdir}/mono/4.0/nunit.core.extensions.dll -r:${libdir}/mono/4.0/nunit.framework.dll -r:${libdir}/mono/4.0/nunit.framework.extensions.dll -r:${libdir}/mono/4.0/nunit.mocks.dll -r:${libdir}/mono/4.0/nunit.util.dll -r:${libdir}/mono/4.0/nunit-console-runner.dll --- -2.0.0 - diff --git a/mono-core.changes b/mono-core.changes index c247a51..9be4cd7 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Oct 27 00:02:10 UTC 2014 - i@marguerite.su + +- fix build for factory x86_64 + * add mono-3.x-keyboards.resources-cp_r.patch + * resources/keyboards.resources exists on x86_64, so cp won't work + should add -r argument +- drop mono-core-target-4.0.patch + * runtime 4.0 is no more, now mono-nunit should use 4.5 +- add patch mono-nunit-default-runtime-4.5.patch + * use runtime 4.5 for mono-nunit by default + ------------------------------------------------------------------- Sat Oct 4 18:46:11 UTC 2014 - mailaender@opensuse.org diff --git a/mono-core.spec b/mono-core.spec index d2ee8c4..9a77f75 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -29,14 +29,14 @@ Group: Development/Languages/Mono Url: http://www.mono-project.com Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2 Source1: mono-core.rpmlintrc -# PATCH-FIX-UPSTREAM mono-core-target-4.0.patch dimstar@opensuse.org -- Use runtime 4.0 as default for cairo and nunit -- https://github.com/mono/mono/pull/1209 -Patch5: mono-core-target-4.0.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-UPSTREAM Use runtime 4.5 as default for nunit +Patch5: mono-nunit-default-runtime-4.5.patch Patch7: mono-core-ppc64le.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch8: mono-core-ppc64le-swr11r12.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch9: mono-core-ppc64le-callreg.diff +# PATCH-FIX-UPSTREAM resources/keyboards.resources exists on x86_64, +# so cp won't work, should add -r argument +Patch10: mono-3.x-keyboards.resources-cp_r.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -101,6 +101,7 @@ technologies that have been submitted to the ECMA for standardization. %patch8 -p1 %patch9 -p1 %endif +%patch10 -p1 %build ./autogen.sh diff --git a/mono-nunit-default-runtime-4.5.patch b/mono-nunit-default-runtime-4.5.patch new file mode 100644 index 0000000..caa7a47 --- /dev/null +++ b/mono-nunit-default-runtime-4.5.patch @@ -0,0 +1,10 @@ +Index: mono-3.10.0/data/mono-nunit.pc.in +=================================================================== +--- mono-3.10.0.orig/data/mono-nunit.pc.in ++++ mono-3.10.0/data/mono-nunit.pc.in +@@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib + Name: Mono NUnit + Description: Mono's version of NUnit + Version: @VERSION@ +-Libs: -r:${libdir}/mono/2.0/nunit.core.dll -r:${libdir}/mono/2.0/nunit.core.interfaces.dll -r:${libdir}/mono/2.0/nunit.core.extensions.dll -r:${libdir}/mono/2.0/nunit.framework.dll -r:${libdir}/mono/2.0/nunit.framework.extensions.dll -r:${libdir}/mono/2.0/nunit.mocks.dll -r:${libdir}/mono/2.0/nunit.util.dll -r:${libdir}/mono/2.0/nunit-console-runner.dll ++Libs: -r:${libdir}/mono/4.5/nunit.core.dll -r:${libdir}/mono/4.5/nunit.core.interfaces.dll -r:${libdir}/mono/4.5/nunit.core.extensions.dll -r:${libdir}/mono/4.5/nunit.framework.dll -r:${libdir}/mono/4.5/nunit.framework.extensions.dll -r:${libdir}/mono/4.5/nunit.mocks.dll -r:${libdir}/mono/4.5/nunit.util.dll -r:${libdir}/mono/4.5/nunit-console-runner.dll From fb814160d5c91fd237ff7365c02417fe46c92b916fa37ba3c5d0956d8870c35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 4 Nov 2014 07:16:33 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=135 --- mono-core.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mono-core.spec b/mono-core.spec index 9a77f75..e7277ee 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -31,8 +31,11 @@ Source0: http://download.mono-project.com/sources/mono/mono-%{version}.ta Source1: mono-core.rpmlintrc # PATCH-FIX-UPSTREAM Use runtime 4.5 as default for nunit Patch5: mono-nunit-default-runtime-4.5.patch +# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch7: mono-core-ppc64le.diff +# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch8: mono-core-ppc64le-swr11r12.diff +# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch9: mono-core-ppc64le-callreg.diff # PATCH-FIX-UPSTREAM resources/keyboards.resources exists on x86_64, # so cp won't work, should add -r argument From 4866b39a14612f341a65784708da5fdd7995cc61454f0921c1de692b6c9d10c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 13 Nov 2014 19:35:39 +0000 Subject: [PATCH 4/4] Accepting request 261331 from home:msmeissn:branches:Mono:Factory - libmono-2_0-1 has a hard dependency on libmonoboehm-2_0-1, require it bnc#904460 OBS-URL: https://build.opensuse.org/request/show/261331 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=136 --- mono-core.changes | 6 ++++++ mono-core.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/mono-core.changes b/mono-core.changes index 9be4cd7..7831e53 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 7 19:59:41 UTC 2014 - meissner@suse.com + +- libmono-2_0-1 has a hard dependency on libmonoboehm-2_0-1, + require it bnc#904460 + ------------------------------------------------------------------- Mon Oct 27 00:02:10 UTC 2014 - i@marguerite.su diff --git a/mono-core.spec b/mono-core.spec index e7277ee..73f5de7 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -414,6 +414,7 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py Summary: A Library for embedding Mono in your Application License: LGPL-2.1 Group: Development/Libraries/C and C++ +Requires: libmonoboehm-2_0-1 %description -n libmono-2_0-1 The Mono Project is an open development initiative that is working to