From 274112ffb8728ea8b9640409fa88dc5ce320b8fa Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Feb 27 2021 17:18:31 +0000 Subject: drop mono-6.12.0-fix-process-start.patch because it is already part of mono-6.12.0.122 --- diff --git a/mono-6.12.0-fix-process-start.patch b/mono-6.12.0-fix-process-start.patch deleted file mode 100644 index 4b9e02c..0000000 --- a/mono-6.12.0-fix-process-start.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 325577feffad1f87b07d92710c0d37c79c5f50a1 Mon Sep 17 00:00:00 2001 -From: Ryan Lucia -Date: Thu, 4 Feb 2021 08:55:48 -0500 -Subject: [PATCH] Fix early return in Process.Start - ---- - mono/metadata/w32process-unix.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/mono/metadata/w32process-unix.c b/mono/metadata/w32process-unix.c -index 663cc6ff5111..d030101aede6 100644 ---- a/mono/metadata/w32process-unix.c -+++ b/mono/metadata/w32process-unix.c -@@ -2032,6 +2032,9 @@ ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoW32ProcessStar - - static char *handler; - static gunichar2 *handler_utf16; -+#ifndef HOST_DARWIN -+ gboolean finished = FALSE; -+#endif - - if (handler_utf16 == (gunichar2 *)-1) { - ret = FALSE; -@@ -2057,6 +2060,7 @@ ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoW32ProcessStar - if (handler == NULL){ - handler_utf16 = (gunichar2 *) -1; - ret = FALSE; -+ finished = TRUE; - } else { - /* kfmclient needs exec argument */ - char *old = handler; -@@ -2067,9 +2071,8 @@ ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoW32ProcessStar - } - } - MONO_EXIT_GC_SAFE; -- if (ret == FALSE){ -+ if (finished) - goto done; -- } - #endif - handler_utf16 = g_utf8_to_utf16 (handler, -1, NULL, NULL, NULL); - g_free (handler); diff --git a/mono.spec b/mono.spec index 8b37b08..5d04452 100644 --- a/mono.spec +++ b/mono.spec @@ -58,8 +58,6 @@ Patch11: 0001-Replace-new-Csharp-features-with-old-ones.patch Patch12: 0001-Reenable-mdoc.exe-build.patch # fix issue with conflicts between i686 and x86_64 package (#1853724) Patch13: mono-6.6.0-fix-multi-arch-issue.patch -# fix issue with process start (#1839410) -Patch14: mono-6.12.0-fix-process-start.patch BuildRequires: make BuildRequires: bison @@ -351,7 +349,6 @@ pushd external/api-doc-tools popd %patch12 -p1 %patch13 -p1 -%patch14 -p1 # don't build mono-helix-client which requires the helix-binaries to build sed -i 's|mono-helix-client||g' mcs/tools/Makefile