Date: Thu, 30 Nov 2023 08:31:00 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 54aafbe1992c - main - games/openage: try to unbreak and undeprecate the port Message-ID: <202311300831.3AU8V0bd051517@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=54aafbe1992cd05d62fbb689c8e3a4c6abdeee61 commit 54aafbe1992cd05d62fbb689c8e3a4c6abdeee61 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-11-30 08:29:54 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-11-30 08:29:54 +0000 games/openage: try to unbreak and undeprecate the port Earlier fix (see PR) was briefly helpful against Pygments v2.9, but had to be extended for version 2.10 and beyond. While here, remove rather useless `pre-configure' target. PR: 257471 --- games/openage/Makefile | 9 +++------ games/openage/files/patch-buildsystem_pxdgen.py | 9 +++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/games/openage/Makefile b/games/openage/Makefile index bf2d9a4fd8db..b1a622aabe49 100644 --- a/games/openage/Makefile +++ b/games/openage/Makefile @@ -11,10 +11,6 @@ WWW= https://openage.sft.mx/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/legal/GPLv3 -BROKEN= fails to build -DEPRECATED= Outdated, fails to build and marked broken several months ago -EXPIRATION_DATE=2023-11-30 - BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PY_PILLOW} \ @@ -48,8 +44,9 @@ CMAKE_ARGS= -DGLOBAL_CONFIG_DIR:STRING=${ETCDIR} BINARY_ALIAS= python3=${PYTHON_CMD} -pre-configure: - ${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' ${WRKSRC}/openage/codegen/main.py +post-patch: + @${REINPLACE_CMD} -e '/^#include <algorithm>/ { x; s/^/#include <array>/; H; x; }' \ + ${WRKSRC}/libopenage/renderer/vulkan/render_target.h post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/openage diff --git a/games/openage/files/patch-buildsystem_pxdgen.py b/games/openage/files/patch-buildsystem_pxdgen.py index 645f3eb92dd7..0419c3df72c7 100644 --- a/games/openage/files/patch-buildsystem_pxdgen.py +++ b/games/openage/files/patch-buildsystem_pxdgen.py @@ -21,3 +21,12 @@ raise self.parser_error( "expected identifier after 'namespace'") namespace_parts.append(val) +@@ -262,7 +266,7 @@ class PXDGenerator: + + for token, val in self.tokenize(): + # ignore whitespaces +- if token == Token.Text and not val.strip(): ++ if token in Token.Text and not val.strip(): + continue + + try:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311300831.3AU8V0bd051517>