Attachment 243943 Details for Bug 273001 – v1.1 (apply via "git am")

[patch] v1.1 (apply via "git am")

bug273001.diff (text/plain), 7.48 KB, created by Jan Beich on 2023-08-07 18:17:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2023-08-07 18:17:39 UTC

Size: 7.48 KB

patch

obsolete

>From 9f4ece9261c16563d378e0a8256b596a160fe813 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 21 Mar 2021 11:10:05 +0000
>Subject: [PATCH] games/openra: update to 20210321
>
>Changes:	https://github.com/OpenRA/OpenRA/wiki/Historical-Changelogs#release-20210321
>PR:		273001
>---
> games/openra/Makefile  | 22 +++++++++-------------
> games/openra/distinfo  | 20 +++++++++++---------
> games/openra/pkg-plist |  6 +++---
> 3 files changed, 23 insertions(+), 25 deletions(-)
>
>diff --git a/games/openra/Makefile b/games/openra/Makefile
>index e92c5382d049..1f1a7635beed 100644
>--- a/games/openra/Makefile
>+++ b/games/openra/Makefile
>@@ -1,14 +1,12 @@
> PORTNAME=	openra
> DISTVERSIONPREFIX=	release-
>-DISTVERSION=	20200503
>-PORTREVISION=	5
>+DISTVERSION=	20210321
> CATEGORIES=	games
> MASTER_SITES=	https://download.ip2location.com/lite/:ip2location
> DISTFILES=	IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP:ip2location
> 
> PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
>-PATCHFILES+=	e13fd693c386.patch:-p1 # https://github.com/OpenRA/OpenRA/pull/17744
>-PATCHFILES+=	85096c4ba2fb.patch:-p1 # https://github.com/OpenRA/OpenRA/pull/17744
>+PATCHFILES+=	ee0d37f2b1c4.patch:-p1 # https://github.com/OpenRA/OpenRA/pull/20041
> 
> MAINTAINER=	jbeich@FreeBSD.org
> COMMENT=	Multiplayer re-envisioning of early RTS games by Westwood Studios
>@@ -19,7 +17,8 @@ LICENSE=	GPLv3
> BUILD_DEPENDS=	msbuild:devel/msbuild
> LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 		libgdiplus.so:x11-toolkits/libgdiplus
>-NUGET_DEPENDS=	Microsoft.NETFramework.ReferenceAssemblies=1.0.0 \
>+NUGET_DEPENDS=	DiscordRichPresence=1.0.150 \
>+		Microsoft.NETFramework.ReferenceAssemblies=1.0.0 \
> 		Microsoft.NETFramework.ReferenceAssemblies.net472=1.0.0 \
> 		NUnit=3.12.0 \
> 		NUnit.Console=3.11.1 \
>@@ -30,13 +29,14 @@ NUGET_DEPENDS=	Microsoft.NETFramework.ReferenceAssemblies=1.0.0 \
> 		NUnit.Extension.TeamCityEventListener=1.0.7 \
> 		NUnit.Extension.VSProjectLoader=3.8.0 \
> 		NUnit3TestAdapter=3.16.1 \
>+		Newtonsoft.Json=12.0.2 \
> 		NuGet.CommandLine=4.4.1 \
> 		OpenRA-Eluant=1.0.17 \
> 		OpenRA-Freetype6=1.0.4 \
> 		OpenRA-FuzzyLogicLibrary=1.0.1 \
> 		OpenRA-Open.NAT=1.0.0 \
> 		OpenRA-OpenAL-CS=1.0.16 \
>-		OpenRA-SDL2-CS=1.0.26 \
>+		OpenRA-SDL2-CS=1.0.28 \
> 		SharpZipLib=1.2.0 \
> 		StyleCop.Analyzers=1.1.118 \
> 		rix0rrr.BeaconLib=1.0.2
>@@ -51,8 +51,7 @@ USE_SDL=	sdl2
> MAKE_ENV=	prefix="${PREFIX}" \
> 		gameinstalldir="${DATADIR}"
> ALL_TARGET=	all
>-INSTALL_TARGET=	install install-man-page \
>-		install-linux-appdata install-linux-mime install-linux-shortcuts
>+INSTALL_TARGET=	install install-man install-linux-appdata install-linux-shortcuts
> PORTDATA=	*
> 
> .include <bsd.port.pre.mk>
>@@ -69,11 +68,8 @@ post-patch:
> 		-e 's/ -verbosity:m//' \
> 		-e '/echo/!s/	@/	/' \
> 		-e '/^VERSION/s/=.*/=	${GH_TAGNAME}/' \
>-		-e '/^core:/s/$$/ version/' \
>+		-e '/^all:/s/$$/ version/' \
> 		${WRKSRC}/Makefile
>-.if defined(PATCHFILES)
>-	${CHMOD} +x ${WRKSRC}/configure-system-libraries.sh
>-.endif
> 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
> 		-e '/target/s,$${DIR}/,,' \
> 		${WRKSRC}/configure-system-libraries.sh
>@@ -81,6 +77,6 @@ post-patch:
> do-test:
> 	@(cd ${TEST_WRKSRC} && mono \
> 		${NUGET_PACKAGEDIR}/NUnit.ConsoleRunner/tools/nunit3-console.exe \
>-		--noresult OpenRA.Test.dll)
>+		--noresult bin/OpenRA.Test.dll)
> 
> .include <bsd.port.post.mk>
>diff --git a/games/openra/distinfo b/games/openra/distinfo
>index 8facc970897b..fa2e9f44ed1d 100644
>--- a/games/openra/distinfo
>+++ b/games/openra/distinfo
>@@ -1,6 +1,8 @@
>-TIMESTAMP = 1651323797
>+TIMESTAMP = 1616325005
> SHA256 (IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP) = 9c40c4156becc60b9792edf3691df05fab7443398f899cbe457851ba2097b8f3
> SIZE (IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP) = 1594281
>+SHA256 (discordrichpresence.1.0.150.nupkg) = e9e075889bd429b1844529607e08f8db0ac3d790db758401e24345c63489ab62
>+SIZE (discordrichpresence.1.0.150.nupkg) = 136992
> SHA256 (microsoft.netframework.referenceassemblies.1.0.0.nupkg) = e9f68f4388da158dce186564de564a5be0c465a20e059ff01ea6e20d3b114759
> SIZE (microsoft.netframework.referenceassemblies.1.0.0.nupkg) = 20946
> SHA256 (microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg) = 2c8fd79ea19bd03cece40ed92b7bafde024f87c73abcebe3eff8da6e05b611af
>@@ -23,6 +25,8 @@ SHA256 (nunit.extension.vsprojectloader.3.8.0.nupkg) = 8ed8fe846d8b1523ee56829b7
> SIZE (nunit.extension.vsprojectloader.3.8.0.nupkg) = 20449
> SHA256 (nunit3testadapter.3.16.1.nupkg) = 0913e56087ab02a2cc91b4f2e8756f5a3bf269fe23cb7fd477faebe6aeaaf0df
> SIZE (nunit3testadapter.3.16.1.nupkg) = 485883
>+SHA256 (newtonsoft.json.12.0.2.nupkg) = 056eec5d3d8b2a93f7ca5b026d34d9d5fe8c835b11e322faf1a2551da25c4e70
>+SIZE (newtonsoft.json.12.0.2.nupkg) = 2521025
> SHA256 (nuget.commandline.4.4.1.nupkg) = 4ba9247f4f10200013e361f35df1e17217af7f2d69b6434e998109c1172cf3eb
> SIZE (nuget.commandline.4.4.1.nupkg) = 1590324
> SHA256 (openra-eluant.1.0.17.nupkg) = cf3a1dbf9218723a619bf2a995e9a433640dd717e38d743c4462627fdbdd42d9
>@@ -35,17 +39,15 @@ SHA256 (openra-open.nat.1.0.0.nupkg) = 6bf30bdad9fc7ea62fe1ac5e78720769ebd78a2c7
> SIZE (openra-open.nat.1.0.0.nupkg) = 53261
> SHA256 (openra-openal-cs.1.0.16.nupkg) = ea2ebaae9936fecba38cb39614bd7c680f87862f527fe0d0ac15cfc3597df3da
> SIZE (openra-openal-cs.1.0.16.nupkg) = 1299557
>-SHA256 (openra-sdl2-cs.1.0.26.nupkg) = 7aa09c904445726af5994b0ee243993112cf26bf06ed60cc567ed8da1fb77ddf
>-SIZE (openra-sdl2-cs.1.0.26.nupkg) = 3699603
>+SHA256 (openra-sdl2-cs.1.0.28.nupkg) = 37b818de18ff6a4b2591b73c36d2cf3e2a014139d1ce898795b2e0da30f43708
>+SIZE (openra-sdl2-cs.1.0.28.nupkg) = 10935388
> SHA256 (sharpziplib.1.2.0.nupkg) = a5e21787aa106a999f6a22a8dbec57498b1678dc2d6b2ef91ae2543971e8d07a
> SIZE (sharpziplib.1.2.0.nupkg) = 414031
> SHA256 (stylecop.analyzers.1.1.118.nupkg) = 0a30b57f9cf4b0fd7917a15e5ea2033ad64b1ea8239904f3a6c22b464c574442
> SIZE (stylecop.analyzers.1.1.118.nupkg) = 377566
> SHA256 (rix0rrr.beaconlib.1.0.2.nupkg) = a49c7c050f4a4d1f1ca174ae6d4be8b6630cd1869cccb321dcd26c74e1891e38
> SIZE (rix0rrr.beaconlib.1.0.2.nupkg) = 24329
>-SHA256 (openra-OpenRA-release-20200503_GH0.tar.gz) = 11ee0aa738c6e7fc4f39ab23f029a280a29530e28096c7da78eb12b12f1a854f
>-SIZE (openra-OpenRA-release-20200503_GH0.tar.gz) = 27619299
>-SHA256 (e13fd693c386.patch) = 7b70ac937272b0ee1281de57f53cc120d3c96e278e5a7369544b5e1edc382dc0
>-SIZE (e13fd693c386.patch) = 71562
>-SHA256 (85096c4ba2fb.patch) = 6405d833f6e42886cd1b25f21c02b02801f38c4ee6f45a25cbeb44d1782126db
>-SIZE (85096c4ba2fb.patch) = 1470
>+SHA256 (openra-OpenRA-release-20210321_GH0.tar.gz) = fe9a09aaebcd2bb859c3d00abdd45f4f958e249d0c9a4c6cff1b8cdceee7e909
>+SIZE (openra-OpenRA-release-20210321_GH0.tar.gz) = 28877484
>+SHA256 (ee0d37f2b1c4.patch) = a1de7e22fcbb53283b3077ee71c388a9ee69ce38dd0ecb6a369d692c8fcb0d50
>+SIZE (ee0d37f2b1c4.patch) = 1511
>diff --git a/games/openra/pkg-plist b/games/openra/pkg-plist
>index 951225f22379..e14d39ab6cfa 100644
>--- a/games/openra/pkg-plist
>+++ b/games/openra/pkg-plist
>@@ -4,9 +4,6 @@ bin/openra-d2k
> bin/openra-d2k-server
> bin/openra-ra
> bin/openra-ra-server
>-share/appdata/openra-cnc.appdata.xml
>-share/appdata/openra-d2k.appdata.xml
>-share/appdata/openra-ra.appdata.xml
> share/applications/openra-cnc.desktop
> share/applications/openra-d2k.desktop
> share/applications/openra-ra.desktop
>@@ -28,6 +25,9 @@ share/icons/hicolor/64x64/apps/openra-ra.png
> share/icons/hicolor/scalable/apps/openra-cnc.svg
> share/icons/hicolor/scalable/apps/openra-ra.svg
> share/man/man6/openra.6.gz
>+share/metainfo/openra-cnc.metainfo.xml
>+share/metainfo/openra-d2k.metainfo.xml
>+share/metainfo/openra-ra.metainfo.xml
> share/mime/packages/openra-cnc.xml
> share/mime/packages/openra-d2k.xml
> share/mime/packages/openra-ra.xml

Actions: View | Diff

Attachments on bug 273001: 243939 | 243943