Attachment 244075 Details for Bug 256342 – 0001-games-openra-compat-for-devel-msbuild-16.1.patch

[patch] 0001-games-openra-compat-for-devel-msbuild-16.1.patch

0001-games-openra-compat-for-devel-msbuild-16.1.patch (text/plain), 3.65 KB, created by Marcin Cieślak on 2023-08-13 23:21:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Cieślak

Created: 2023-08-13 23:21:28 UTC

Size: 3.65 KB

patch

obsolete

>From 9625afdafc721316157207837f33ec8d6135c8e0 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marcin=20Cie=C5=9Blak?= <saper@saper.info>
>Date: Mon, 14 Aug 2023 00:55:19 +0200
>Subject: [PATCH] games/openra: compat for devel/msbuild < 16.1
>
>Fixes the following error when using old msbuild 15.8:
>
>error MSB4184: The expression ""Program.cs".GetPathsOfAllDirectoriesAbove()" cannot be evaluated. Method 'System.String.GetPathsOfAllDirectoriesAbove' not found.
>
>PR:	256342
>---
> games/openra/Makefile                         |  5 +---
> .../openra/files/patch-packaging_functions.sh | 26 +++++++++++++++++++
> 2 files changed, 27 insertions(+), 4 deletions(-)
> create mode 100644 games/openra/files/patch-packaging_functions.sh
>
>diff --git a/games/openra/Makefile b/games/openra/Makefile
>index aa1d4540e05e..99d6c2b334f3 100644
>--- a/games/openra/Makefile
>+++ b/games/openra/Makefile
>@@ -56,10 +56,6 @@ PORTDATA=	*
> 
> .include <bsd.port.pre.mk>
> 
>-.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
>-BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: error MSB4184: The expression ""Program.cs".GetPathsOfAllDirectoriesAbove()" cannot be evaluated. Method 'System.String.GetPathsOfAllDirectoriesAbove' not found.
>-.endif
>-
> post-extract:
> 	${CP} ${_DISTDIR}/${DISTFILES:C/:.*//:MIP2LOCATION-*} ${WRKSRC}
> 
>@@ -69,6 +65,7 @@ post-patch:
> 		-e '/echo/!s/	@/	/' \
> 		-e '/^VERSION/s/=.*/=	${GH_TAGNAME}/' \
> 		-e '/^all:/s/$$/ version/' \
>+		-e '/MSBUILD/s/ -p:TargetPlatform/ -p:DiscoverEditorConfigFiles=false&/' \
> 		${WRKSRC}/Makefile
> 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
> 		-e '/target/s,$${DIR}/,,' \
>diff --git a/games/openra/files/patch-packaging_functions.sh b/games/openra/files/patch-packaging_functions.sh
>new file mode 100644
>index 000000000000..d1d70b859171
>--- /dev/null
>+++ b/games/openra/files/patch-packaging_functions.sh
>@@ -0,0 +1,26 @@
>+--- packaging/functions.sh.orig	2023-08-13 22:34:45 UTC
>++++ packaging/functions.sh
>+@@ -33,9 +33,9 @@ install_assemblies_mono() {
>+ 	echo "Building assemblies"
>+ 	ORIG_PWD=$(pwd)
>+ 	cd "${SRC_PATH}" || exit 1
>+-	msbuild -verbosity:m -nologo -t:Clean
>++	msbuild -verbosity:m -nologo -t:Clean -p:DiscoverEditorConfigFiles=false
>+ 	rm -rf "${SRC_PATH:?}/bin"
>+-	msbuild -verbosity:m -nologo -t:Build -restore -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}"
>++	msbuild -verbosity:m -nologo -t:Build -restore -p:DiscoverEditorConfigFiles=false -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}"
>+ 	if [ "${TARGETPLATFORM}" = "unix-generic" ]; then
>+ 		./configure-system-libraries.sh
>+ 	fi
>+@@ -163,9 +163,9 @@ install_windows_launcher()
>+ 	ICON_PATH="${7}"
>+ 	FAQ_URL="${8}"
>+ 
>+-	msbuild -verbosity:m -nologo -t:Clean "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj"
>++	msbuild -verbosity:m -nologo -t:Clean -p:DiscoverEditorConfigFiles=false "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj"
>+ 	rm -rf "${SRC_PATH:?}/bin"
>+-	msbuild -t:Build "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj" -restore -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}" -p:LauncherName="${LAUNCHER_NAME}" -p:LauncherIcon="${ICON_PATH}" -p:ModID="${MOD_ID}" -p:DisplayName="${MOD_NAME}" -p:FaqUrl="${FAQ_URL}"
>++	msbuild -t:Build "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj" -restore -p:DiscoverEditorConfigFiles=false -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}" -p:LauncherName="${LAUNCHER_NAME}" -p:LauncherIcon="${ICON_PATH}" -p:ModID="${MOD_ID}" -p:DisplayName="${MOD_NAME}" -p:FaqUrl="${FAQ_URL}"
>+ 	install -m755 "${SRC_PATH}/bin/${LAUNCHER_NAME}.exe" "${DEST_PATH}"
>+ 	install -m644 "${SRC_PATH}/bin/${LAUNCHER_NAME}.exe.config" "${DEST_PATH}"
>+ 
>-- 
>2.40.0
>

Actions: View | Diff

Attachments on bug 256342: 244075