From nobody Thu Nov 30 08:31:00 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgqCT1pQmz531pf; Thu, 30 Nov 2023 08:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgqCT1CNpz4fDb; Thu, 30 Nov 2023 08:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701333061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZURpAnzqFvX1rSat0M7nBz0Yci319tOrKya6CWpMlM=; b=iQ5v9wpC580lfl5a0Avf1D9xzLWn/ewQt/+39lxjixCkqQuW+95EBoQ4h9GxFsdmTiHMdW hYsJrjIZnirFpyyU2XdForV1l2BfgDyLlo2fc5cH0tlnWALb/zpXdny6JIJZNOmUDuZpAG iKkqe98vTKuG1ZIin1M/KLjBLDOKiKNemR3NVKvVgNf2Z5doCBjmDEeGRmLG8jyaUq6oFn lBRz9ewugqXPXYLviDUC4Oc8UZUgtHFS+u2fQLHDHEJD1s+tCey4eEsV351Y1pq89ML9Kv 0jTvoqG1gcnawT+llovJn/AcY3dQjXK1ICtXM0qILwgL56xdV8ILU0uN5ZHNww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701333061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZURpAnzqFvX1rSat0M7nBz0Yci319tOrKya6CWpMlM=; b=s4SHPjvbXXWF8M2ZJJ4ZWgyMmHHLxa1U0Ue9OnBomDUzido6Mq4Y7KItco8DizmCDeeJkG 8HLHs3YYAPdc8oT7qN5ReOQu01PsVY8g1uDwb9CJwNJSa8mtl/9ALnZlEd4STN5vWgHLwl g/Y5y5l4lA0mHOXJ6ZnrZRBK4hIb6uQ43NguS8xr02MKWe+eMiNp80MDHmtnRsLDALM+XX geFz0hXJ7pRENhpvOkHhvQEgbJl+UEm+6jW/ILmXBUQpMYE/sRX57owqfRr1Ns4vAVg0gF Zg8IumuMl1S9TiJw40PyMHpQpEEAM83LorZC6uf7kGyGc7+QmXJ8XIxHDuRgQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701333061; a=rsa-sha256; cv=none; b=YQKGuurh7LCDhHctv2nwuRS3TYDNzuZfqnVJx5LEO0vM7AzbCYkLEIV4yuwclxwA6CdOx1 ng9FOiT1z7fjJDoYjW54cu6VjrUn0MoHMrT8xTaP269qjVOrNTWlII+pAtKmJLXBTiGGz3 nYJHXW68tI6q/DcOBOUTv0UC9M+ev2YPb2/nN8R2qaVm2UNPpjx/NSJsJu8RLjNhOTW0TO bHPVusyc/+ckAKVrLQweI0661oc8HLWzamNPE9L1RoroF0jML9mbPU3b4Vyr5VM07BEHIA PdDIOHpZtoC5is7O0Ufg/PrcUIT/XEMg7b2XDEXk2yjYtp9gqDRv9QJEPUKdqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgqCT0FLyzjQ8; Thu, 30 Nov 2023 08:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AU8V0gP051520; Thu, 30 Nov 2023 08:31:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU8V0bd051517; Thu, 30 Nov 2023 08:31:00 GMT (envelope-from git) Date: Thu, 30 Nov 2023 08:31:00 GMT Message-Id: <202311300831.3AU8V0bd051517@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 54aafbe1992c - main - games/openage: try to unbreak and undeprecate the port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54aafbe1992cd05d62fbb689c8e3a4c6abdeee61 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=54aafbe1992cd05d62fbb689c8e3a4c6abdeee61 commit 54aafbe1992cd05d62fbb689c8e3a4c6abdeee61 Author: Alexey Dokuchaev AuthorDate: 2023-11-30 08:29:54 +0000 Commit: Alexey Dokuchaev 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 / { x; s/^/#include /; 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: