Compare commits

..

2 commits

Author SHA1 Message Date
Troy Dawson
2704d8f4b2 epel8-playground decommissioned : https://pagure.io/epel/issue/136 2022-01-31 11:41:25 -08:00
Timotheus Pokorra
ef19a92457 bootstrap build for epel8 2020-02-29 22:21:38 +01:00
24 changed files with 1 additions and 4018 deletions

3
.gitignore vendored
View file

@ -1,3 +0,0 @@
mono-*.tar.bz2
mono-*.src.rpm
mono-*.tar.xz

View file

@ -1,41 +0,0 @@
From 415b0ca76d1071bc2bb89f8860f4ce831d6a090a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Mon, 3 Feb 2020 23:09:36 +0100
Subject: [PATCH] DocumentationEnumerator.cs: Declare iface and ifaceMethod
correctly to fix NRE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Using TypeReference and MethodReference instead of var to declare them.
Fix #462
Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
mdoc/Mono.Documentation/Updater/DocumentationEnumerator.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mdoc/Mono.Documentation/Updater/DocumentationEnumerator.cs b/mdoc/Mono.Documentation/Updater/DocumentationEnumerator.cs
index be22bf0..1917b59 100644
--- a/mdoc/Mono.Documentation/Updater/DocumentationEnumerator.cs
+++ b/mdoc/Mono.Documentation/Updater/DocumentationEnumerator.cs
@@ -341,7 +341,7 @@ namespace Mono.Documentation.Updater
var method = ((PropertyDefinition) mr).GetMethod ?? ((PropertyDefinition) mr).SetMethod;
if (method?.Overrides != null && method.Overrides.Any())
{
- DocUtils.GetInfoForExplicitlyImplementedMethod(method, out var iface, out var ifaceMethod);
+ DocUtils.GetInfoForExplicitlyImplementedMethod(method, out TypeReference iface, out MethodReference ifaceMethod);
var newName = DocUtils.GetMemberForProperty(ifaceMethod.Name);
if (newName == memberName && verifyInterface(mr) && docName.Contains (iface.Name))
yield return mr;
@@ -428,4 +428,4 @@ namespace Mono.Documentation.Updater
return count;
}
}
-}
\ No newline at end of file
+}
--
2.24.1

View file

@ -1,86 +0,0 @@
From 7d46c195498b06f6fe0562f957f7309140c24a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Mon, 3 Feb 2020 20:51:40 +0100
Subject: [PATCH] Reenable mdoc.exe build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Robert-Andr<C3><A9> Mauchin <zebob.m@gmail.com>
---
mcs/docs/Makefile | 4 ----
mcs/tools/mdoc/Makefile | 18 ++++++------------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/mcs/docs/Makefile b/mcs/docs/Makefile
index b66d70230..519a98443 100644
--- a/mcs/docs/Makefile
+++ b/mcs/docs/Makefile
@@ -38,10 +38,6 @@ DISABLE_MCS_DOCS = yes
endif
endif
-ifdef MCS_MODE
-DISABLE_MCS_DOCS = yes
-endif
-
test-local run-test-local run-test-ondotnet-local doc-update:
clean-local:
diff --git a/mcs/tools/mdoc/Makefile b/mcs/tools/mdoc/Makefile
index e3c5a321d..008203616 100644
--- a/mcs/tools/mdoc/Makefile
+++ b/mcs/tools/mdoc/Makefile
@@ -44,12 +44,6 @@ $(PROGRAM): $(PROGRAM_DEPS)
PROGRAM_COMPILE = $(CSCOMPILE)
-ifdef MCS_MODE
-NO_INSTALL=1
-NO_BUILD=1
-NO_TEST=1
-endif
-
include ../../build/executable.make
MONO = \
@@ -63,6 +57,11 @@ DIFF = diff -rupZ
DIFF_QUIET = diff --brief -Z
endif
+ifdef MCS_MODE
+DIFF = echo "WARNING: running in mcs mode, tests are specific to roslyn and would fail. Skipping diff check."
+DIFF_QUIET = $(DIFF)
+endif
+
dist-local: dist-default dist-tests
dist-tests:
@@ -360,7 +359,7 @@ check-mdoc-export-msxdoc-update:
check-mdoc-export-msxdoc:
$(MONO) $(PROGRAM) export-msxdoc -o - Test/en.expected.importslashdoc \
- | $(DIFF) - Test/msxdoc-expected.importslashdoc.xml
+ | $(DIFF_QUIET) - Test/msxdoc-expected.importslashdoc.xml
my_abs_top_srcdir = $(shell cd . && pwd)
@@ -390,10 +389,6 @@ run-test-local: check-doc-tools
run-test-update : check-doc-tools-update
-ifdef MCS_MODE
-check-doc-tools:
- @echo "WARNING: running in mcs mode, mdoc doesn't compile with mcs. Skipping."
-else
check-doc-tools: \
check-monodocer-since \
check-monodocer-importecmadoc \
@@ -412,7 +407,6 @@ check-doc-tools: \
check-monodocer-dropns-multi-withexisting
#check-monodocer-dropns-delete
-endif
check-doc-tools-update: check-monodocer-since-update \
check-monodocer-importecmadoc-update \

View file

@ -1,301 +0,0 @@
From bf5c5a72978a0f9d32c9934e216bfaaf2d1717be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Mon, 3 Feb 2020 18:38:58 +0100
Subject: [PATCH] Replace new Csharp features with old ones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Replace new Csharp features like switch statements and
"is null" to allow mdoc.exe to build with mcs.
Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
mdoc/Mono.Documentation/Updater/DocUtils.cs | 91 ++++++++++---------
.../CppFormatters/CppFullMemberFormatter.cs | 26 +++---
.../Updater/Formatters/FSharpFormatter.cs | 16 ++--
.../Updater/Formatters/JsFormatter.cs | 27 +++---
.../Updater/Formatters/JsMemberFormatter.cs | 9 +-
5 files changed, 85 insertions(+), 84 deletions(-)
diff --git a/mdoc/Mono.Documentation/Updater/DocUtils.cs b/mdoc/Mono.Documentation/Updater/DocUtils.cs
index 331ef90..fe2da59 100644
--- a/mdoc/Mono.Documentation/Updater/DocUtils.cs
+++ b/mdoc/Mono.Documentation/Updater/DocUtils.cs
@@ -287,24 +287,24 @@ namespace Mono.Documentation.Updater
return inst != null
? inst.GenericArguments.Count
: type.GenericParameters.Count;
- }
+ }
class TypeEquality : IEqualityComparer<TypeReference>
- {
- bool IEqualityComparer<TypeReference>.Equals (TypeReference x, TypeReference y)
+ {
+ bool IEqualityComparer<TypeReference>.Equals (TypeReference x, TypeReference y)
+ {
+ if (x == null && y == null) return true;
+ if (x == null || y == null) return false;
+ return x.FullName == y.FullName;
+ }
+
+ int IEqualityComparer<TypeReference>.GetHashCode (TypeReference obj)
{
- if (x is null && y is null) return true;
- if (x is null || y is null) return false;
- return x.FullName == y.FullName;
- }
-
- int IEqualityComparer<TypeReference>.GetHashCode (TypeReference obj)
- {
- return obj.GetHashCode ();
+ return obj.GetHashCode ();
}
}
static TypeEquality typeEqualityComparer = new TypeEquality ();
-
+
public static IEnumerable<TypeReference> GetAllPublicInterfaces (TypeDefinition type)
{
return GetAllInterfacesFromType (type)
@@ -314,7 +314,7 @@ namespace Mono.Documentation.Updater
private static IEnumerable<TypeReference> GetAllInterfacesFromType(TypeDefinition type)
{
- if (type is null)
+ if (type == null)
yield break;
foreach(var i in type.Interfaces)
@@ -525,26 +525,29 @@ namespace Mono.Documentation.Updater
FillUnifiedMemberTypeNames(unifiedTypeNames, memberReference as IGenericParameterProvider);// Fill the member generic parameters unified names as M0, M1....
FillUnifiedTypeNames(unifiedTypeNames, memberReference.DeclaringType, genericInterface);// Fill the type generic parameters unified names as T0, T1....
- switch (memberReference)
- {
- case IMethodSignature methodSignature:
- buf.Append(GetUnifiedTypeName(methodSignature.ReturnType, unifiedTypeNames)).Append(" ");
- buf.Append(SimplifyName(memberReference.Name)).Append(" ");
- AppendParameters(buf, methodSignature.Parameters, unifiedTypeNames);
- break;
- case PropertyDefinition propertyReference:
- buf.Append(GetUnifiedTypeName(propertyReference.PropertyType, unifiedTypeNames)).Append(" ");
- if (propertyReference.GetMethod != null)
- buf.Append("get").Append(" ");
- if (propertyReference.SetMethod != null)
- buf.Append("set").Append(" ");
- buf.Append(SimplifyName(memberReference.Name)).Append(" ");
- AppendParameters(buf, propertyReference.Parameters, unifiedTypeNames);
- break;
- case EventDefinition eventReference:
- buf.Append(GetUnifiedTypeName(eventReference.EventType, unifiedTypeNames)).Append(" ");
- buf.Append(SimplifyName(memberReference.Name)).Append(" ");
- break;
+ if (memberReference is IMethodSignature)
+ {
+ IMethodSignature methodSignature = (IMethodSignature)memberReference;
+ buf.Append(GetUnifiedTypeName(methodSignature.ReturnType, unifiedTypeNames)).Append(" ");
+ buf.Append(SimplifyName(memberReference.Name)).Append(" ");
+ AppendParameters(buf, methodSignature.Parameters, unifiedTypeNames);
+ }
+ if (memberReference is PropertyDefinition)
+ {
+ PropertyDefinition propertyReference = (PropertyDefinition)memberReference;
+ buf.Append(GetUnifiedTypeName(propertyReference.PropertyType, unifiedTypeNames)).Append(" ");
+ if (propertyReference.GetMethod != null)
+ buf.Append("get").Append(" ");
+ if (propertyReference.SetMethod != null)
+ buf.Append("set").Append(" ");
+ buf.Append(SimplifyName(memberReference.Name)).Append(" ");
+ AppendParameters(buf, propertyReference.Parameters, unifiedTypeNames);
+ }
+ if (memberReference is EventDefinition)
+ {
+ EventDefinition eventReference = (EventDefinition)memberReference;
+ buf.Append(GetUnifiedTypeName(eventReference.EventType, unifiedTypeNames)).Append(" ");
+ buf.Append(SimplifyName(memberReference.Name)).Append(" ");
}
var memberUnifiedTypeNames = new Dictionary<string, string>();
@@ -666,14 +669,20 @@ namespace Mono.Documentation.Updater
/// </summary>
private static Collection<MethodReference> GetOverrides(MemberReference memberReference)
{
- switch (memberReference)
+ if (memberReference is MethodDefinition)
+ {
+ MethodDefinition methodDefinition = (MethodDefinition)memberReference;
+ return methodDefinition.Overrides;
+ }
+ if (memberReference is PropertyDefinition)
+ {
+ PropertyDefinition propertyDefinition = (PropertyDefinition)memberReference;
+ return (propertyDefinition.GetMethod ?? propertyDefinition.SetMethod)?.Overrides;
+ }
+ if (memberReference is EventDefinition)
{
- case MethodDefinition methodDefinition:
- return methodDefinition.Overrides;
- case PropertyDefinition propertyDefinition:
- return (propertyDefinition.GetMethod ?? propertyDefinition.SetMethod)?.Overrides;
- case EventDefinition evendDefinition:
- return evendDefinition.AddMethod.Overrides;
+ EventDefinition evendDefinition = (EventDefinition)memberReference;
+ return evendDefinition.AddMethod.Overrides;
}
return null;
@@ -692,4 +701,4 @@ namespace Mono.Documentation.Updater
return method.Name.StartsWith("op_", StringComparison.Ordinal);
}
}
-}
\ No newline at end of file
+}
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppFullMemberFormatter.cs
index 7d68c38..6b9bcf6 100644
--- a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppFullMemberFormatter.cs
+++ b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppFullMemberFormatter.cs
@@ -1029,20 +1029,16 @@ namespace Mono.Documentation.Updater.Formatters.CppFormatters
if (mref.IsDefinition == false)
mref = mref.Resolve() as MemberReference;
- switch (mref)
- {
- case FieldDefinition field:
- return IsSupportedField(field);
- case MethodDefinition method:
- return IsSupportedMethod(method);
- case PropertyDefinition property:
- return IsSupportedProperty(property);
- case EventDefinition @event:
- return IsSupportedEvent(@event);
- case AttachedPropertyDefinition _:
- case AttachedEventDefinition _:
- return false;
- }
+ if (mref is FieldDefinition)
+ return IsSupportedField((FieldDefinition)mref);
+ else if (mref is MethodDefinition)
+ return IsSupportedMethod((MethodDefinition)mref);
+ else if (mref is PropertyDefinition)
+ return IsSupportedProperty((PropertyDefinition)mref);
+ else if (mref is EventDefinition)
+ return IsSupportedEvent((EventDefinition)mref);
+ else if (mref is AttachedPropertyDefinition || mref is AttachedEventDefinition)
+ return false;
throw new NotSupportedException("Unsupported member type: " + mref?.GetType().FullName);
}
@@ -1119,4 +1115,4 @@ namespace Mono.Documentation.Updater.Formatters.CppFormatters
return true;
}
}
-}
\ No newline at end of file
+}
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/FSharpFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/FSharpFormatter.cs
index 236d56f..f91bf9a 100644
--- a/mdoc/Mono.Documentation/Updater/Formatters/FSharpFormatter.cs
+++ b/mdoc/Mono.Documentation/Updater/Formatters/FSharpFormatter.cs
@@ -1029,15 +1029,15 @@ namespace Mono.Documentation.Updater
}
return false;
}
- switch (mref)
+ if (mref is MethodDefinition)
{
- case MethodDefinition method:
- return !(method.HasCustomAttributes && method.CustomAttributes.Any(
- ca => ca.GetDeclaringType() ==
- "System.Diagnostics.Contracts.ContractInvariantMethodAttribute"
- || ca.GetDeclaringType() ==
- Consts.CompilerGeneratedAttribute))
- && AppendVisibility(new StringBuilder(), method) != null;
+ MethodDefinition method = (MethodDefinition)mref;
+ return !(method.HasCustomAttributes && method.CustomAttributes.Any(
+ ca => ca.GetDeclaringType() ==
+ "System.Diagnostics.Contracts.ContractInvariantMethodAttribute"
+ || ca.GetDeclaringType() ==
+ Consts.CompilerGeneratedAttribute))
+ && AppendVisibility(new StringBuilder(), method) != null;
}
return true;
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/JsFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/JsFormatter.cs
index f8b2f04..92b8f3c 100644
--- a/mdoc/Mono.Documentation/Updater/Formatters/JsFormatter.cs
+++ b/mdoc/Mono.Documentation/Updater/Formatters/JsFormatter.cs
@@ -68,23 +68,22 @@ namespace mdoc.Mono.Documentation.Updater.Formatters
public override bool IsSupported(MemberReference mref)
{
- switch (mref)
+ if (mref is PropertyDefinition)
{
- case PropertyDefinition propertyDefinition:
- if (!IsPropertySupported(propertyDefinition))
- return false;
- break;
- case MethodDefinition methodDefinition:
- if (!IsMethodSupported(methodDefinition))
- return false;
- break;
- case FieldDefinition _:
- return false;// In WinRT fields can be exposed only by structures.
- case AttachedEventDefinition _:
+ PropertyDefinition propertyDefinition = (PropertyDefinition)mref;
+ if (!IsPropertySupported(propertyDefinition))
return false;
- case AttachedPropertyDefinition _:
+ }
+ else if (mref is MethodDefinition)
+ {
+ MethodDefinition methodDefinition = (MethodDefinition)mref;
+ if (!IsMethodSupported(methodDefinition))
return false;
}
+ else if (mref is FieldDefinition // In WinRT fields can be exposed only by structures.
+ || mref is AttachedEventDefinition
+ || mref is AttachedPropertyDefinition)
+ return false;
var member = mref.Resolve();
return member != null
@@ -169,4 +168,4 @@ namespace mdoc.Mono.Documentation.Updater.Formatters
return fullName;
}
}
-}
\ No newline at end of file
+}
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/JsMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/JsMemberFormatter.cs
index 6bc6995..f6c8af6 100644
--- a/mdoc/Mono.Documentation/Updater/Formatters/JsMemberFormatter.cs
+++ b/mdoc/Mono.Documentation/Updater/Formatters/JsMemberFormatter.cs
@@ -58,12 +58,9 @@ namespace mdoc.Mono.Documentation.Updater.Formatters
public override bool IsSupported(MemberReference mref)
{
- switch (mref)
+ if (mref is PropertyDefinition || mref is EventDefinition)
{
- case PropertyDefinition _:
- return false;
- case EventDefinition _:
- return false;
+ return false;
}
return base.IsSupported(mref);
}
@@ -82,4 +79,4 @@ namespace mdoc.Mono.Documentation.Updater.Formatters
return base.IsSupported(tref);
}
}
-}
\ No newline at end of file
+}
--
2.24.1

1
dead.package Normal file
View file

@ -0,0 +1 @@
epel8-playground decommissioned : https://pagure.io/epel/issue/136

View file

@ -1,27 +0,0 @@
From bc9d2b37c682f3fdc2c41450cf367c78d0f6ca22 Mon Sep 17 00:00:00 2001
From: Arsen Shnurkov <Arsen.Shnurkov@gmail.com>
Date: Thu, 4 Jun 2015 21:32:20 +0300
Subject: [PATCH] https://bugzilla.xamarin.com/show_bug.cgi?id=14976
---
mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs | 3 ---
1 file changed, 3 deletions(-)
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
index b0777b5..d50d6c4 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
@@ -6219,9 +6219,6 @@ namespace System.Windows.Forms {
atoms [0] = (IntPtr)1; // Version 1
atoms [1] = (IntPtr)1; // we want to be mapped
- // This line cost me 3 days...
- XChangeProperty(DisplayHandle, hwnd.whole_window, _XEMBED_INFO, _XEMBED_INFO, 32, PropertyMode.Replace, atoms, 2);
-
// Need to pick some reasonable defaults
tt = new ToolTip();
tt.AutomaticDelay = 350;
--
2.0.5

View file

@ -1,11 +0,0 @@
--- a/mcs/class/corlib/System/TimeZoneInfo.cs 2016-08-23 16:24:24.658169558 +0200
+++ b/mcs/class/corlib/System/TimeZoneInfo.cs 2016-08-23 16:25:22.925434487 +0200
@@ -1224,7 +1224,7 @@
} catch (InvalidTimeZoneException) {
throw;
} catch (Exception e) {
- throw new InvalidTimeZoneException ("Time zone information file contains invalid data", e);
+ return Utc; // throw new InvalidTimeZoneException ("Time zone information file contains invalid data", e);
}
}

View file

@ -1,12 +0,0 @@
--- a/scripts/mono-find-provides.in 2018-03-02 21:56:22.911149656 +0100
+++ b/scripts/mono-find-provides.in 2018-03-02 21:56:57.985962849 +0100
@@ -16,7 +16,8 @@
# Only include files with /gac/, /Facades/ or /4.5/ in path
# (Allows packages to contain private assemblies that don't conflict with other packages)
-monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/(gac|Facades|4\\.5)/"))
+#quite a number of files are not in the gac, eg. System.IO, and Mono.Configuration.Crypto, and others
+#monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/(gac|Facades|4\\.5)/"))
# Disabled... see ChangeLog
# Set the prefix, unless it is overriden (used when building mono rpms)

File diff suppressed because it is too large Load diff

View file

@ -1,12 +0,0 @@
--- a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/FastZip.cs 2019-02-21 05:54:25.493666036 +0000
+++ b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/FastZip.cs 2019-02-21 05:55:01.494273426 +0000
@@ -375,7 +375,8 @@
targetName = Path.Combine(targetDirectory, entryFileName);
dirName = Path.GetDirectoryName(Path.GetFullPath(targetName));
-
+ if (!Path.GetFullPath(targetName).StartsWith(targetDirectory, StringComparison.InvariantCultureIgnoreCase))
+ throw new ZipException("Parent traversal in paths is not allowed");
doExtraction = doExtraction && (entryFileName.Length > 0);
}

View file

@ -1,11 +0,0 @@
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs 2019-02-20 21:17:20.324780985 +0000
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs 2019-02-20 21:17:43.537165909 +0000
@@ -219,7 +219,7 @@
protected override string ToolName {
get {
- return MSBuildUtils.RunningOnWindows ? "csc.bat" : "csc.exe";
+ return MSBuildUtils.RunningOnWindows ? "mcs.bat" : "mcs.exe";
}
}

View file

@ -1,35 +0,0 @@
From ed68c250b8589663601aa7dd88177697d0b37ec9 Mon Sep 17 00:00:00 2001
From: jo-oe <38652639+jo-oe@users.noreply.github.com>
Date: Tue, 9 Apr 2024 16:57:39 +0200
Subject: [PATCH] Correct the selection of alloc/free functions for zlib.
Avoids segfault when working with zlib-ng.
See:
https://github.com/zlib-ng/zlib-ng/issues/1708
---
support/zlib-helper.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/support/zlib-helper.c b/support/zlib-helper.c
index 76d8951ad8a8a..a5fbc0138822d 100644
--- a/support/zlib-helper.c
+++ b/support/zlib-helper.c
@@ -76,6 +76,8 @@ CreateZStream (gint compress, guchar gzip, read_write_func func, void *gchandle)
return NULL;
z = z_new0 (z_stream);
+ z->zalloc = z_alloc;
+ z->zfree = z_free;
if (compress) {
retval = deflateInit2 (z, Z_DEFAULT_COMPRESSION, Z_DEFLATED, gzip ? 31 : -15, 8, Z_DEFAULT_STRATEGY);
} else {
@@ -86,8 +88,6 @@ CreateZStream (gint compress, guchar gzip, read_write_func func, void *gchandle)
free (z);
return NULL;
}
- z->zalloc = z_alloc;
- z->zfree = z_free;
result = z_new0 (ZStream);
result->stream = z;
result->func = func;

View file

@ -1,26 +0,0 @@
From 2224c6915a98f870cc9a3a9f9e3698e7b20e3d27 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Sat, 12 Apr 2025 20:31:54 +0000
Subject: [PATCH] arm64: Fix a pointer-to-int cast size mismatch.
---
mono/utils/mono-sigcontext.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/mono/utils/mono-sigcontext.h b/mono/utils/mono-sigcontext.h
index 2153c1cad57..6426f44b7c7 100644
--- a/mono/utils/mono-sigcontext.h
+++ b/mono/utils/mono-sigcontext.h
@@ -492,6 +492,12 @@ typedef struct ucontext {
#define UCONTEXT_REG_SP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.sp)
#define UCONTEXT_REG_R0(ctx) (((ucontext_t*)(ctx))->uc_mcontext.regs [ARMREG_R0])
#define UCONTEXT_GREGS(ctx) (&(((ucontext_t*)(ctx))->uc_mcontext.regs))
+ #define UCONTEXT_REG_SET_PC(ctx, val) do { \
+ UCONTEXT_REG_PC (ctx) = (gsize)(val); \
+ } while (0)
+ #define UCONTEXT_REG_SET_SP(ctx, val) do { \
+ UCONTEXT_REG_SP (ctx) = (val); \
+ } while (0)
#endif
#ifndef UCONTEXT_REG_SET_PC

View file

@ -1,11 +0,0 @@
--- a/mono/sgen/sgen-archdep.h 2016-10-10 11:22:26.607082785 -0500
+++ b/mono/sgen/sgen-archdep.h 2016-10-10 11:22:48.526184527 -0500
@@ -45,6 +45,8 @@
#elif defined(TARGET_ARM64)
+#define ARCH_MIN_MS_BLOCK_SIZE (64*1024)
+#define ARCH_MIN_MS_BLOCK_SIZE_SHIFT 16
#if defined(__APPLE__)
#define REDZONE_SIZE 128
#else

View file

@ -1,15 +0,0 @@
--- a/mono/eglib/eglib-config.h.in 2020-10-12 14:57:46.354634946 +0200
+++ b/mono/eglib/eglib-config.h.in 2020-10-12 15:00:10.106637683 +0200
@@ -26,7 +26,11 @@
typedef @GSIZE@ gsize;
typedef @GSSIZE@ gssize;
-#define G_GSIZE_FORMAT @GSIZE_FORMAT@
+#ifdef __i386__
+#define G_GSIZE_FORMAT "u"
+#else
+#define G_GSIZE_FORMAT "lu"
+#endif
#if defined (HOST_WATCHOS)
#undef G_BREAKPOINT

View file

@ -1,77 +0,0 @@
--- a/mcs/class/reference-assemblies/Makefile 2019-01-02 10:25:41.011999700 +0100
+++ b/mcs/class/reference-assemblies/Makefile 2019-01-02 10:27:20.591632515 +0100
@@ -10,29 +10,11 @@
$(MAKE) -C ../../../external/binary-reference-assemblies CSC="MONO_PATH=$(abspath $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)) $(INTERNAL_CSC)"
install-local:
- $(MKINSTALLDIRS) $(PROFILE_DIR)/2.0-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/3.5-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.0-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5.1-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5.2-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6.1-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6.2-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.7-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.1-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.2-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.8-api
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5-api/Facades
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5.1-api/Facades
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5.2-api/Facades
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6-api/Facades
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6.1-api/Facades
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6.2-api/Facades
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.7-api/Facades
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.1-api/Facades
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.2-api/Facades
- $(MKINSTALLDIRS) $(PROFILE_DIR)/4.8-api/Facades
+ $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5
+ ln -sf 4.5 $(PROFILE_DIR)/4.7-api
+ ln -sf 4.5 $(PROFILE_DIR)/4.6-api
+ ln -sf 4.5 $(PROFILE_DIR)/4.5-api
+ ln -sf 4.5 $(PROFILE_DIR)/4.0-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v2.0/*.dll $(PROFILE_DIR)/2.0-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v3.5/*.dll $(PROFILE_DIR)/3.5-api
--- a/mcs/Makefile 2018-03-03 06:32:13.642690150 +0100
+++ b/mcs/Makefile 2018-03-03 06:32:54.699643624 +0100
@@ -43,7 +43,7 @@
# fun specialty targets
-PROFILES = net_4_x binary_reference_assemblies xbuild_12 xbuild_14
+PROFILES = net_4_x xbuild_12 xbuild_14
.PHONY: all-profiles compiler-test-profiles run-compiler-test-profiles $(STD_TARGETS:=-profiles)
all-profiles compiler-test-profiles run-compiler-test-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -65,7 +65,6 @@
_boot_ = all clean install
$(_boot_:%=profile-do--xbuild_14--%): profile-do--xbuild_14--%: profile-do--net_4_x--%
$(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%: profile-do--net_4_x--%
-$(_boot_:%=profile-do--binary_reference_assemblies--%): profile-do--binary_reference_assemblies--%: profile-do--build--%
$(_boot_:%=profile-do--net_4_x--%): profile-do--net_4_x--%: profile-do--build--%
$(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--%
$(_boot_:%=profile-do--monodroid_tools--%): profile-do--monodroid_tools--%: profile-do--build--%
--- a/mcs/build/Makefile 2018-03-03 07:18:20.662959369 +0100
+++ b/mcs/build/Makefile 2018-03-03 07:18:33.303253408 +0100
@@ -18,7 +18,6 @@
PLATFORMS = macos linux win32 unix
PROFILES = \
build \
- binary_reference_assemblies \
net_4_x \
xbuild_12 \
xbuild_14
--- a/runtime/Makefile.in 2018-03-03 14:06:44.691631197 +0100
+++ b/runtime/Makefile.in 2018-03-03 14:07:07.241155116 +0100
@@ -90,7 +90,7 @@
host_triplet = @host@
target_triplet = @target@
@INSTALL_4_x_TRUE@am__append_1 = etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
-@INSTALL_4_x_TRUE@am__append_2 = binary_reference_assemblies net_4_x xbuild_12 xbuild_14
+@INSTALL_4_x_TRUE@am__append_2 = net_4_x xbuild_12 xbuild_14
@INSTALL_MONODROID_TRUE@am__append_3 = monodroid monodroid_tools
@INSTALL_MONOTOUCH_TRUE@am__append_4 = monotouch monotouch_runtime
@INSTALL_MONOTOUCH_WATCH_TRUE@am__append_5 = monotouch_watch monotouch_watch_runtime

View file

@ -1,16 +0,0 @@
--- a/mcs/packages/Makefile 2019-02-21 04:53:46.843939657 +0000
+++ b/mcs/packages/Makefile 2019-02-21 04:53:40.111824983 +0000
@@ -42,11 +42,13 @@
install-local:
$(MKINSTALLDIRS) $(TARGET_DIR)
+ifndef MCS_MODE
$(INSTALL_LIB) $(ROSLYN_FILES_FOR_MONO) $(TARGET_DIR)
$(MKINSTALLDIRS) $(MSBUILD_ROSLYN_DIR)
$(INSTALL_LIB) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) $(MSBUILD_ROSLYN_DIR)
(cd $(MSBUILD_ROSLYN_DIR); for asm in $(ROSLYN_FILES_FOR_MONO); do ln -fs ../../../../$(FRAMEWORK_VERSION)/$$(basename $$asm) . ; done)
+endif
run-test-local: test-csi

View file

@ -1,76 +0,0 @@
The thread start routine must return void *, and int and void *
are distinct types. Compilers increasingly issue errors instead
of warnings for such type errors, and this causes the configure
probe to fail unconditionally, even if the system supports
__thread variables.
Submitted upstream: <https://github.com/mono/mono/pull/21730>
diff --git a/configure.ac b/configure.ac
index bbbd1622d9728859..5a3a5770c8a3cdb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2833,14 +2833,16 @@ if test x$host_win32 = xno; then
__thread int i;
static int res1, res2;
- void thread_main (void *arg)
+ void *thread_main (void *parg)
{
+ int arg = *(int *)parg;
i = arg;
sleep (1);
if (arg == 1)
res1 = (i == arg);
else
res2 = (i == arg);
+ return NULL;
}
int main () {
@@ -2848,8 +2850,10 @@ if test x$host_win32 = xno; then
i = 5;
- pthread_create (&t1, NULL, thread_main, 1);
- pthread_create (&t2, NULL, thread_main, 2);
+ int one = 1;
+ pthread_create (&t1, NULL, thread_main, &one);
+ int two = 2;
+ pthread_create (&t2, NULL, thread_main, &two);
pthread_join (t1, NULL);
pthread_join (t2, NULL);
--- a/configure 2023-06-14 17:18:48.000000000 +0200
+++ b/configure 2023-12-09 10:41:58.001084368 +0100
@@ -24906,14 +24894,16 @@
__thread int i;
static int res1, res2;
- void thread_main (void *arg)
+ void *thread_main (void *parg)
{
+ int arg = *(int *)parg;
i = arg;
sleep (1);
if (arg == 1)
res1 = (i == arg);
else
res2 = (i == arg);
+ return NULL;
}
int main () {
@@ -24921,8 +24911,10 @@
i = 5;
- pthread_create (&t1, NULL, thread_main, 1);
- pthread_create (&t2, NULL, thread_main, 2);
+ int one = 1;
+ pthread_create (&t1, NULL, thread_main, &one);
+ int two = 2;
+ pthread_create (&t2, NULL, thread_main, &two);
pthread_join (t1, NULL);
pthread_join (t2, NULL);

View file

@ -1,42 +0,0 @@
#!/usr/bin/bash
#
# mono-find-provides
#
# Authors:
# Ben Maurer (bmaurer@ximian.com)
#
# (C) 2005 Novell (http://www.novell.com)
#
# Args: builddir buildroot libdir
IFS=$'\n'
filelist=($(grep -Ev "$3/doc/|$3/share/doc/"))
monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$"))
# If monodis is in the package being installed, use that one
# This is to support building mono
build_bindir="$2$3/bin"
build_libdir="$2$3/$4"
if [ -x $build_bindir/monodis ]; then
monodis="$build_bindir/monodis"
export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
elif [ -x $3/bin/monodis ]; then
monodis="$3/bin/monodis"
else
exit 0;
fi
export MONO_SHARED_DIR=$1
for i in "${monolist[@]}"; do
($monodis --assembly $i | awk '
BEGIN { LIBNAME=""; VERSION=""; }
/^Version:/ { VERSION=$2 }
/^Name:/ { LIBNAME=$2 }
END {
if (VERSION && LIBNAME)
print "mono(" LIBNAME ") = " VERSION
}
') 2>/dev/null
done

View file

@ -1,86 +0,0 @@
#!/usr/bin/bash
#
# mono-find-requires
#
# Authors:
# Ben Maurer (bmaurer@ximian.com)
#
# (C) 2005 Novell (http://www.novell.com)
#
# Args: builddir buildroot libdir
IFS=$'\n'
filelist=($(grep -Ev "$3/doc/|$3/share/doc/"))
monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$"))
# If monodis is in the package being installed, use that one
# This is to support building mono
build_bindir="$2$3/bin"
build_libdir="$2$3/$4"
if [ -x $build_bindir/monodis ]; then
monodis="$build_bindir/monodis"
export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
elif [ -x $3/bin/monodis ]; then
monodis="$3/bin/monodis"
else
exit 0;
fi
export MONO_SHARED_DIR=$1
REQUIRES=$(
for i in "${monolist[@]}"; do
($monodis --assemblyref $i | awk '
BEGIN { START=0; LIBNAME=""; VERSION=""; }
(START==0) && /^[0-9]+: Version=/ {
START=1;
sub(/Version=/, "", $2);
VERSION=$2
}
(START==1) && /^\tName=/ {
sub(/Name=/, "", $1);
LIBNAME=$1
print "mono(" LIBNAME ") = " VERSION
START=0
}
') 2> /dev/null
done
)
PROVIDES=$(
for i in "${monolist[@]}"; do
($monodis --assembly $i | awk '
BEGIN { LIBNAME=""; VERSION=""; }
/^Version:/ { VERSION=$2 }
/^Name:/ { LIBNAME=$2 }
END {
if (VERSION && LIBNAME)
print "mono(" LIBNAME ") = " VERSION
}
') 2>/dev/null
done
)
#
# This is a little magic trick to get all REQUIRES that are not
# in PROVIDES. While RPM functions correctly when such deps exist,
# they make the metadata a bit bloated.
#
# Filter out dups from both lists
REQUIRES=$(echo "$REQUIRES" | sort | uniq)
PROVIDES=$(echo "$PROVIDES" | sort | uniq)
#
# Get a list of elements that exist in exactly one of PROVIDES or REQUIRES
#
UNIQ=$(echo "$PROVIDES
$REQUIRES" | sort | uniq -u)
#
# Of those, only chose the ones that are in REQUIRES
#
echo "$UNIQ
$REQUIRES" | sort | uniq -d

View file

@ -1,3 +0,0 @@
%__mono_provides %{_rpmconfigdir}/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_prefix} %{_lib}
%__mono_requires %{_rpmconfigdir}/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_prefix} %{_lib}
%__mono_magic Mono/.Net assembly

BIN
mono.snk

Binary file not shown.

2053
mono.spec

File diff suppressed because it is too large Load diff

View file

@ -1 +0,0 @@
SHA512 (mono-6.14.1.tar.xz) = c16a2ecbfce93db20a7a6d11b6406c8764f5694355c1ce82081399cd7ab6d8b22e7f8fb21f7af78967b34ef54dcb682917b8cf22d61f1b72be996d1a42e9f1b9