Compare commits

...
Sign in to create a new pull request.

5 commits

Author SHA1 Message Date
Cristian Le
49a1ca5197 Allow to build with CMake 4.0 (rhbz#2380917) 2025-11-12 18:28:02 +01:00
Timotheus Pokorra
943b7bf956 Upgrade to Mono 6.14.1 2025-11-08 19:34:13 +01:00
Yaakov Selkowitz
763c0d0b4d Un-bootstrap for Fedora 43 flatpaks 2025-10-09 23:51:46 -04:00
Yaakov Selkowitz
f915b3ac91 Bootstrap for Fedora 43 flatpaks 2025-10-09 23:07:31 -04:00
Yaakov Selkowitz
91cb75519d Specify path to cert-sync in %post snippet
Mock builds are run with a limited PATH.  When built for flatpaks in /app,
the cert-sync command is not found, and %post fails.  While this was
previously non-critical, as of RPM 6.0 (Fedora 43), this causes the install
to fail.
2025-10-09 23:06:57 -04:00
4 changed files with 47 additions and 17 deletions

View file

@ -6,14 +6,14 @@ MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
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 92e8f2adbe5..88bddb66268 100644
index b66d70230..519a98443 100644
--- a/mcs/docs/Makefile
+++ b/mcs/docs/Makefile
@@ -38,10 +38,6 @@ DISABLE_MCS_DOCS = yes
@ -24,11 +24,11 @@ index 92e8f2adbe5..88bddb66268 100644
-DISABLE_MCS_DOCS = yes
-endif
-
csproj-local test-local run-test-local run-test-ondotnet-local doc-update:
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 e3c5a321d1a..00820361636 100644
index e3c5a321d..008203616 100644
--- a/mcs/tools/mdoc/Makefile
+++ b/mcs/tools/mdoc/Makefile
@@ -44,12 +44,6 @@ $(PROGRAM): $(PROGRAM_DEPS)
@ -84,6 +84,3 @@ index e3c5a321d1a..00820361636 100644
check-doc-tools-update: check-monodocer-since-update \
check-monodocer-importecmadoc-update \
--
2.24.1

View file

@ -0,0 +1,26 @@
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

@ -21,15 +21,14 @@
%undefine _missing_build_ids_terminate_build
%endif
%global xamarinrelease 199
Name: mono
Version: 6.12.0
Release: 21%{?dist}
Version: 6.14.1
Release: 2%{?dist}
Summary: Cross-platform, Open Source, .NET development framework
License: MIT
URL: http://www.mono-project.com
Source0: http://download.mono-project.com/sources/mono/mono-%{version}.%{xamarinrelease}.tar.xz
Source0: https://dl.winehq.org/mono/sources/mono/%{name}-%{version}.tar.xz
# This key was generated by Tom "spot" Callaway <tcallawa@redhat.com> on Dec 1, 2009
# by running the following command:
# sn -k mono.snk
@ -60,6 +59,7 @@ Patch12: 0001-Reenable-mdoc.exe-build.patch
Patch13: mono-6.6.0-fix-multi-arch-issue.patch
Patch14: mono-configure-c99.patch
Patch15: mono-6.12.0-correct-alloc-free-for-zlib.patch
Patch16: mono-6.14.0-arm64-fix-pointer-int.patch
BuildRequires: make
BuildRequires: bison
@ -332,7 +332,7 @@ not install anything from outside the mono source (XSP, mono-basic, etc.).
%{nil}
%prep
%setup -q -n %{name}-%{version}.%{xamarinrelease}
%setup -q -n %{name}-%{version}
%patch -P 0 -p1
%ifarch ppc ppc64 ppc64le s390x
@ -353,13 +353,11 @@ popd
%patch -P 13 -p1
%patch -P 14 -p1
%patch -P 15 -p1
%patch -P 16 -p1
# don't build mono-helix-client which requires the helix-binaries to build
sed -i 's|mono-helix-client||g' mcs/tools/Makefile
# use v4.7.1 instead of v4.6
sed -i 's|TARGET_NET_REFERENCE = v4.6|TARGET_NET_REFERENCE = $(BOOTSTRAP_BIN_PROFILE)|g' mcs/tools/upload-to-sentry/Makefile
# use v4.7.1 instead of v4.7
sed -i 's|BOOTSTRAP_BIN_PROFILE = v4.7|BOOTSTRAP_BIN_PROFILE = v4.7.1|g' mcs/build/profiles/build.make
@ -380,6 +378,8 @@ cd external/binary-reference-assemblies && mv v4.7.1 v4.7.1.tobuild && ln -s %{_
%endif
%build
# TODO: Please submit an issue to upstream (rhbz#2380917)
export CMAKE_POLICY_VERSION_MINIMUM=3.5
# This package fails to build with LTO on ppc64le. Root cause analysis has not been
# done. For now disable LTO
%ifarch ppc64le
@ -505,7 +505,7 @@ rm %{buildroot}%{_bindir}/mono-find-provides
%post core
%{?ldconfig}
cert-sync --quiet /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
%{_bindir}/cert-sync --quiet /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
%ldconfig_postun
@ -759,6 +759,7 @@ cert-sync --quiet /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
%{_libdir}/pkgconfig/wcf.pc
%{_libdir}/pkgconfig/xbuild12.pc
%{_includedir}/mono-2.0/mono/jit/jit.h
%{_includedir}/mono-2.0/mono/jit/mono-private-unstable.h
%{_includedir}/mono-2.0/mono/metadata/*.h
%{_includedir}/mono-2.0/mono/utils/*.h
%{_includedir}/mono-2.0/mono/cil/opcode.def
@ -945,6 +946,12 @@ cert-sync --quiet /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
%files complete
%changelog
* Tue Nov 11 2025 Cristian Le <git@lecris.dev> - 6.14.1-2
- Allow to build with CMake 4.0 (rhbz#2380917)
* Sat Nov 08 2025 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.14.1-1
- Upgrade to Mono 6.14.1
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.12.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (mono-6.12.0.199.tar.xz) = 9e379aaeb2e8750edbda74648c0ae9cc8cb9b2d7af85512bf2e729132c2e0322e776ef0b7657da708cbc1ae2a62f5532519d339fa68f465b30a65ca30d4a1e51
SHA512 (mono-6.14.1.tar.xz) = c16a2ecbfce93db20a7a6d11b6406c8764f5694355c1ce82081399cd7ab6d8b22e7f8fb21f7af78967b34ef54dcb682917b8cf22d61f1b72be996d1a42e9f1b9