From 512d2b619fbbf96091b9cabb3cf4251cea3bd995757f35d764be6150897430af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 19 Dec 2020 22:27:08 +0000 Subject: [PATCH 1/3] Accepting request 855607 from home:Mailaender:branches:Mono:Factory new upstream bugfix release OBS-URL: https://build.opensuse.org/request/show/855607 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=216 --- fix-dbg-headers.patch | 32 --------------------------- fix-ppc-64bit-portability-issue.patch | 12 ---------- mono-6.12.0.107.tar.xz | 3 +++ mono-6.8.0.105.tar.xz | 3 --- mono-core.changes | 7 ++++++ mono-core.spec | 15 ++----------- 6 files changed, 12 insertions(+), 60 deletions(-) delete mode 100644 fix-dbg-headers.patch delete mode 100644 fix-ppc-64bit-portability-issue.patch create mode 100644 mono-6.12.0.107.tar.xz delete mode 100644 mono-6.8.0.105.tar.xz diff --git a/fix-dbg-headers.patch b/fix-dbg-headers.patch deleted file mode 100644 index 74bc67b..0000000 --- a/fix-dbg-headers.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -uprN mono.bak/Makefile.am mono-6.4.0.198/Makefile.am ---- mono.bak/Makefile.am 2019-11-20 21:36:02.812573696 +0100 -+++ mono-6.4.0.198/Makefile.am 2019-11-20 21:36:28.188845471 +0100 -@@ -178,3 +178,6 @@ update-solution-files: - - update-solution-files-with-tests: - $(MAKE) "GENPROJ_ARGS=2012 true true" update-solution-files -+ -+confighfixdir = $(includedir)/mono-2.0 -+dist_confighfix_DATA = config.h -diff -uprN mono.bak/mono/metadata/Makefile.am mono-6.4.0.198/mono/metadata/Makefile.am ---- mono.bak/mono/metadata/Makefile.am 2019-11-20 21:35:47.512409834 +0100 -+++ mono-6.4.0.198/mono/metadata/Makefile.am 2019-11-20 21:36:28.192845514 +0100 -@@ -461,6 +461,7 @@ libmonoruntimeinclude_HEADERS = \ - attrdefs.h \ - blob.h \ - class.h \ -+ debug-internals.h \ - debug-helpers.h \ - debug-mono-symfile.h \ - environment.h \ -diff -uprN mono.bak/mono/utils/Makefile.am mono-6.4.0.198/mono/utils/Makefile.am ---- mono.bak/mono/utils/Makefile.am 2019-11-20 21:35:47.552410263 +0100 -+++ mono-6.4.0.198/mono/utils/Makefile.am 2019-11-20 21:36:28.192845514 +0100 -@@ -328,6 +328,7 @@ libmonoutilsinclude_HEADERS = \ - mono-publib.h \ - mono-jemalloc.h \ - mono-dl-fallback.h \ -+ mono-compiler.h \ - mono-counters.h - - EXTRA_DIST = mono-errno.h mono-embed.h mono-embed.c ../../support/libm/complex.c mono-experiments.def diff --git a/fix-ppc-64bit-portability-issue.patch b/fix-ppc-64bit-portability-issue.patch deleted file mode 100644 index 76f8712..0000000 --- a/fix-ppc-64bit-portability-issue.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uprN mono-5.14.0.177.old/mono/mini/exceptions-ppc.c mono-5.14.0.177/mono/mini/exceptions-ppc.c ---- mono-5.14.0.177.old/mono/mini/exceptions-ppc.c 2018-08-07 10:46:01.000000000 +0300 -+++ mono-5.14.0.177/mono/mini/exceptions-ppc.c 2018-08-11 01:03:25.219208741 +0300 -@@ -796,7 +796,7 @@ mono_arch_setup_async_callback (MonoCont - sp -= PPC_MINIMAL_STACK_SIZE; - *(unsigned long *)sp = MONO_CONTEXT_GET_SP(ctx); - MONO_CONTEXT_SET_BP(ctx, sp); -- mono_arch_setup_resume_sighandler_ctx(ctx, (unsigned long) async_cb); -+ mono_arch_setup_resume_sighandler_ctx((MonoContext *)ctx, (gpointer) async_cb); - } - - void diff --git a/mono-6.12.0.107.tar.xz b/mono-6.12.0.107.tar.xz new file mode 100644 index 0000000..538c74c --- /dev/null +++ b/mono-6.12.0.107.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61f3cd629f8e99371c6b47c1f8d96b8ac46d9e851b5531eef20cdf9ab60d2a5f +size 291862192 diff --git a/mono-6.8.0.105.tar.xz b/mono-6.8.0.105.tar.xz deleted file mode 100644 index 1b16651..0000000 --- a/mono-6.8.0.105.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:578799c44c3c86a9eb5daf6dec6c60a24341940fd376371956d4a46cf8612178 -size 243441900 diff --git a/mono-core.changes b/mono-core.changes index b1bc9e8..ac2bab1 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Dec 13 19:20:32 UTC 2020 - Matthias Mailänder + +- Update to version 6.12.0 +- Drop fix-dbg-headers.patch +- Drop fix-ppc-64bit-portability-issue.patch + ------------------------------------------------------------------- Sat Nov 7 16:20:03 UTC 2020 - Callum Farmer diff --git a/mono-core.spec b/mono-core.spec index 87ea052..02ffcb6 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -39,10 +39,10 @@ %define roslyn no %endif -%define version_suffix 105 +%define version_suffix 107 Name: mono-core -Version: 6.8.0 +Version: 6.12.0 Release: 0 Summary: Cross-platform, Open Source, .NET development framework License: LGPL-2.1-only AND MIT AND MS-PL @@ -60,12 +60,8 @@ ExcludeArch: ppc Patch14: find-deps-fix.patch # PATCH-FIX-OPENSUSE revert Microsoft.Build.Tasks library to use old mcs compiler. This will make xbuild to use old mcs instead of csc - patch is used when roslyn is unavailable for current platform (big-endian systems). Patch15: xbuild-revert-to-mcs.patch -# PATCH-FIX-OPENSUSE add missing internal headers to distribution, this is necessary for mono-debugger package. (Seems this bug is caused by this upstream commit: https://github.com/mono/mono/commit/e71a7f33ef30a5bbd0047b37a95533d06c860846) -Patch16: fix-dbg-headers.patch # PATCH-FIX-OPENSUSE make xbuild to use roslyn-vbc on roslyn-enabled builds, in order to fix vbnc's VBNC99999 failures on such builds Patch20: xbuild-use-roslyn-vbc.patch -# PATCH-FIX-OPENSUSE fix 64bit-portability-issue at exceptions-ppc.c:799 -Patch21: fix-ppc-64bit-portability-issue.patch # PATCH-FIX-UPSTREAM fix-s390x-ucontext.patch bsc#1171934 mgorse@suse.com -- fix s390x build on glibc 2.26. Patch22: fix-s390x-ucontext.patch BuildRequires: autoconf @@ -210,22 +206,15 @@ technologies that have been submitted to the ECMA for standardization. %prep %setup -q -n mono-%{version}.%{version_suffix} %patch14 -p1 -%patch16 -p1 %if "%roslyn" == "no" %patch15 -p1 %else %patch20 -p1 %endif -%patch21 -p1 %patch22 -p1 %build %define _lto_cflags %{nil} -# TODO: re-check on next release, already fixed in master branch -# remove accidentally packaged build artifacts that lead to build failures on non x86_64 platforms -# see https://github.com/mono/mono/issues/11619, https://github.com/mono/mono/issues/11501 for more info -find . \( -name ".libs" -o -name ".deps" \) -type d -prune -exec rm -rv {} \; -find . \( -name "*.o" -o -name "*.lo" -o -name ".dirstamp" \) -exec rm -v {} \; # autogen.sh seems broken: it is not processing libgs subdirectory leaving old stuff there untouched. # so, remove gnu-build-system files manually find . \( \ From 9ca6e410fe22df5a29a97291cb56e77f16d12d7c1ff147d7c4481b52142333a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 20 Dec 2020 17:30:40 +0000 Subject: [PATCH 2/3] Accepting request 857731 from home:Mailaender:branches:Mono:Factory fix closing parenthesis OBS-URL: https://build.opensuse.org/request/show/857731 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=217 --- mono-core.changes | 7 ++++++- mono-core.spec | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mono-core.changes b/mono-core.changes index ac2bab1..4544cb0 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 20 13:03:20 UTC 2020 - Matthias Mailänder + +- Attempt to fix the dependency problems with System.Runtime.CompilerServices.Unsafe + ------------------------------------------------------------------- Sun Dec 13 19:20:32 UTC 2020 - Matthias Mailänder @@ -37,7 +42,7 @@ Tue May 26 19:57:47 UTC 2020 - Michael Gorse ------------------------------------------------------------------- Sun May 24 08:07:07 UTC 2020 - Guillaume GARDET -- Enable roslyn on aarch64 to build additionnal tools (mdoc.exe, ...) +- Enable roslyn on aarch64 to build additional tools (mdoc.exe, ...) ------------------------------------------------------------------- Wed Apr 29 10:05:31 UTC 2020 - Dominique Leuenberger diff --git a/mono-core.spec b/mono-core.spec index 02ffcb6..0e5a593 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -190,7 +190,7 @@ Requires: timezone # instead of filtering bigger list of broken requires\provides, filter initial filelist and disable precompiled binaries from evaluation %define roslyn_prefix %{buildroot}%{_prefix}/lib/mono/4.5 %define msbuild_prefix %{buildroot}%{_prefix}/lib/mono/msbuild/15.0/bin/Roslyn -%define filtered_filelist printf "%s\\n" "${filelist[@]}" | grep -v "%{roslyn_prefix}/dim/" | grep -v "%{roslyn_prefix}/Microsoft.CodeAnalysis" | grep -v "%{roslyn_prefix}/Microsoft.Build.Tasks.CodeAnalysis.dll" | grep -v "%{roslyn_prefix}/System.Collections.Immutable.dll" | grep -v "%{roslyn_prefix}/System.Reflection.Metadata.dll" | grep -v "%{roslyn_prefix}/csc.exe" | grep -v "%{roslyn_prefix}/csc-dim.exe" | grep -v "%{roslyn_prefix}/vbc.exe" | grep -v "%{roslyn_prefix}/csi.exe" | grep -v "%{roslyn_prefix}/VBCSCompiler.exe" | grep -v "%{msbuild_prefix}/Microsoft.CodeAnalysis" | grep -v "%{msbuild_prefix}/Microsoft.Build.Tasks.CodeAnalysis.dll" | grep -v "%{msbuild_prefix}/System.Collections.Immutable.dll" | grep -v "%{msbuild_prefix}/System.Reflection.Metadata.dll" | grep -v "%{msbuild_prefix}/csc.exe" | grep -v "%{msbuild_prefix}/vbc.exe" | grep -v "%{msbuild_prefix}/csi.exe" | grep -v "%{msbuild_prefix}/VBCSCompiler.exe" | cat - +%define filtered_filelist printf "%s\\n" "${filelist[@]}" | grep -v "%{roslyn_prefix}/dim/" | grep -v "%{roslyn_prefix}/Microsoft.CodeAnalysis" | grep -v "%{roslyn_prefix}/Microsoft.Build.Tasks.CodeAnalysis.dll" | grep -v "%{roslyn_prefix}/System.Collections.Immutable.dll" | grep -v "%{roslyn_prefix}/System.Reflection.Metadata.dll" | grep -v "%{roslyn_prefix}/csc.exe" | grep -v "%{roslyn_prefix}/csc-dim.exe" | grep -v "%{roslyn_prefix}/vbc.exe" | grep -v "%{roslyn_prefix}/csi.exe" | grep -v "%{roslyn_prefix}/VBCSCompiler.exe" | grep -v "%{msbuild_prefix}/Microsoft.CodeAnalysis" | grep -v "%{msbuild_prefix}/Microsoft.Build.Tasks.CodeAnalysis.dll" | grep -v "%{msbuild_prefix}/System.Collections.Immutable.dll" | grep -v "%{msbuild_prefix}/System.Reflection.Metadata.dll" | grep -v "%{msbuild_prefix}/csc.exe" | grep -v "%{msbuild_prefix}/vbc.exe" | grep -v "%{msbuild_prefix}/csi.exe" | grep -v "%{msbuild_prefix}/VBCSCompiler.exe" | grep -v "%{roslyn_prefix}/System.Runtime.CompilerServices.Unsafe | cat - %define extra_req_filters grep -vE "%{buildroot}%{_prefix}/lib/mono/.*-api/Mono.Debugger.Soft.dll" %define __find_provides env sh -c 'filelist=($(cat)) && { %{filtered_filelist} | /usr/lib/rpm/find-provides && %{filtered_filelist} | prefix=%{buildroot}%{_prefix} %{buildroot}%{_bindir}/mono-find-provides ; } | sort | uniq' From ed9aeac452d240f7700e4dbffb032fcda10b0bd146f82f08747c5535719cff46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 20 Dec 2020 23:14:07 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=218 --- mono-core.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mono-core.spec b/mono-core.spec index 0e5a593..b7954b6 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -181,6 +181,7 @@ Provides: mono(System.Xml.XmlSerializer) = 4.0.0.0 Provides: mono(mscorlib) = 1.0.5000.0 Provides: mono(mscorlib) = 2.0.0.0 Provides: mono(mscorlib) = 4.0.0.0 +Provides: mono(System.Runtime.CompilerServices.Unsafe) = 4.0.4.1 # mono-core provides System.DateTime functions, which rely on timezone information Requires: timezone @@ -190,7 +191,7 @@ Requires: timezone # instead of filtering bigger list of broken requires\provides, filter initial filelist and disable precompiled binaries from evaluation %define roslyn_prefix %{buildroot}%{_prefix}/lib/mono/4.5 %define msbuild_prefix %{buildroot}%{_prefix}/lib/mono/msbuild/15.0/bin/Roslyn -%define filtered_filelist printf "%s\\n" "${filelist[@]}" | grep -v "%{roslyn_prefix}/dim/" | grep -v "%{roslyn_prefix}/Microsoft.CodeAnalysis" | grep -v "%{roslyn_prefix}/Microsoft.Build.Tasks.CodeAnalysis.dll" | grep -v "%{roslyn_prefix}/System.Collections.Immutable.dll" | grep -v "%{roslyn_prefix}/System.Reflection.Metadata.dll" | grep -v "%{roslyn_prefix}/csc.exe" | grep -v "%{roslyn_prefix}/csc-dim.exe" | grep -v "%{roslyn_prefix}/vbc.exe" | grep -v "%{roslyn_prefix}/csi.exe" | grep -v "%{roslyn_prefix}/VBCSCompiler.exe" | grep -v "%{msbuild_prefix}/Microsoft.CodeAnalysis" | grep -v "%{msbuild_prefix}/Microsoft.Build.Tasks.CodeAnalysis.dll" | grep -v "%{msbuild_prefix}/System.Collections.Immutable.dll" | grep -v "%{msbuild_prefix}/System.Reflection.Metadata.dll" | grep -v "%{msbuild_prefix}/csc.exe" | grep -v "%{msbuild_prefix}/vbc.exe" | grep -v "%{msbuild_prefix}/csi.exe" | grep -v "%{msbuild_prefix}/VBCSCompiler.exe" | grep -v "%{roslyn_prefix}/System.Runtime.CompilerServices.Unsafe | cat - +%define filtered_filelist printf "%s\\n" "${filelist[@]}" | grep -v "%{roslyn_prefix}/dim/" | grep -v "%{roslyn_prefix}/Microsoft.CodeAnalysis" | grep -v "%{roslyn_prefix}/Microsoft.Build.Tasks.CodeAnalysis.dll" | grep -v "%{roslyn_prefix}/System.Collections.Immutable.dll" | grep -v "%{roslyn_prefix}/System.Reflection.Metadata.dll" | grep -v "%{roslyn_prefix}/csc.exe" | grep -v "%{roslyn_prefix}/csc-dim.exe" | grep -v "%{roslyn_prefix}/vbc.exe" | grep -v "%{roslyn_prefix}/csi.exe" | grep -v "%{roslyn_prefix}/VBCSCompiler.exe" | grep -v "%{msbuild_prefix}/Microsoft.CodeAnalysis" | grep -v "%{msbuild_prefix}/Microsoft.Build.Tasks.CodeAnalysis.dll" | grep -v "%{msbuild_prefix}/System.Collections.Immutable.dll" | grep -v "%{msbuild_prefix}/System.Reflection.Metadata.dll" | grep -v "%{msbuild_prefix}/csc.exe" | grep -v "%{msbuild_prefix}/vbc.exe" | grep -v "%{msbuild_prefix}/csi.exe" | grep -v "%{msbuild_prefix}/VBCSCompiler.exe" | cat - %define extra_req_filters grep -vE "%{buildroot}%{_prefix}/lib/mono/.*-api/Mono.Debugger.Soft.dll" %define __find_provides env sh -c 'filelist=($(cat)) && { %{filtered_filelist} | /usr/lib/rpm/find-provides && %{filtered_filelist} | prefix=%{buildroot}%{_prefix} %{buildroot}%{_bindir}/mono-find-provides ; } | sort | uniq'