diff --git a/games/openage/Makefile b/games/openage/Makefile index bf2d9a4fd8db..b1a622aabe49 100644 --- a/games/openage/Makefile +++ b/games/openage/Makefile @@ -1,58 +1,55 @@ PORTNAME= openage DISTVERSIONPREFIX= v DISTVERSION= 0.4.1 PORTREVISION= 2 CATEGORIES= games MAINTAINER= freebsd@sysctl.cz COMMENT= Free engine clone of the Genie Engine 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} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libogg.so:audio/libogg \ libopus.so:audio/opus \ libopusfile.so:audio/opusfile \ libpng.so:graphics/png \ libnyan.so:lang/nyan RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} USES= cmake compiler:c++17-lang eigen:3 gl ncurses:base python:3.8-3.9 qt:5 sdl shebangfix SHEBANG_FILES= configure run.py.in buildsystem/cythonize.py USE_GITHUB= yes GH_ACCOUNT= SFTtech USE_SDL= image2 sdl2 USE_GL= gl glu USE_QT= core declarative gui network buildtools:build qmake:build USE_PYTHON= cython USE_LDCONFIG= yes CMAKE_OFF= WANT_BACKTRACE WANT_GPERFTOOLS_PROFILER WANT_INOTIFY 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 / { x; s/^/#include /; H; x; }' \ + ${WRKSRC}/libopenage/renderer/vulkan/render_target.h post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/openage @${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg .include 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 @@ -1,23 +1,32 @@ --- buildsystem/pxdgen.py.orig 2020-08-15 10:50:07 UTC +++ buildsystem/pxdgen.py @@ -23,6 +23,7 @@ class ParserError(Exception): """ Represents a fatal parsing error in PXDGenerator. """ + def __init__(self, filename, lineno, message): super().__init__("{}:{} {}".format(filename, lineno, message)) @@ -218,8 +219,11 @@ class PXDGenerator: return self.handle_token(token, val) def handle_state_1(self, token, val, namespace_parts): + # Patch from upstream, commit 3aa91ea4d4a72a5f3b6f90ad0390b9e07de7aa77 # we're inside a namespace definition; expect Token.Name - if token != Token.Name: + # TODO: pygments 2.9 correctly reports Token.Name.Namespace + # we can require this version eventually and change the condition + if token not in Token.Name: 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: