Attachment #227278 for bug #257471




PORTNAME=	openage
DISTVERSIONPREFIX=	v
DISTVERSION=	0.4.1
DISTVERSIONSUFFIX=	-ga554ab49
PORTREVISION=	5
CATEGORIES=	games

PATCH_SITES=	https://github.com/SFTtech/openage/commit/
PATCHFILES=	663b1158018d839eb5cfed63f4b228c1590c6104.patch:-p1

MAINTAINER=	freebsd@sysctl.cz
COMMENT=	Free engine clone of the Genie Engine


LICENSE_FILE=	${WRKSRC}/legal/GPLv3

BUILD_DEPENDS=	${PYNUMPY} \
		eigen>0:math/eigen3 \
		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
		${PY_PILLOW} \
		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}

		${PY_PILLOW} \
		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}

USES=		cmake compiler:c++17-lang gl ncurses:base python:3.4+ qt:5 sdl shebangfix
SHEBANG_FILES=	configure run.py.in buildsystem/cythonize.py
USE_GITHUB=	yes
GH_ACCOUNT=	SFTtech
USE_SDL=	image2 sdl2

CMAKE_OFF=	WANT_BACKTRACE WANT_GPERFTOOLS_PROFILER WANT_INOTIFY
CMAKE_ARGS=	-DGLOBAL_CONFIG_DIR:STRING=${ETCDIR}

pre-configure:
	${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' ${WRKSRC}/openage/codegen/main.py

post-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/openage

Lines 1-5 Link Here

(-)b/games/openage/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1586003415	1	TIMESTAMP = 1628960206
2	SHA256 (SFTtech-openage-v0.3.0-1262-ga554ab49_GH0.tar.gz) = a0c7de5b4a187fb991c4f3e560d80f1a7afc411812ab4d7ab49a63c61b446e29	2	SHA256 (SFTtech-openage-v0.4.1_GH0.tar.gz) = 9d83138cc0f544b0fae799f10cbbaec7671511f9600a869bdb755668db0e5ccf
3	SIZE (SFTtech-openage-v0.3.0-1262-ga554ab49_GH0.tar.gz) = 2081730	3	SIZE (SFTtech-openage-v0.4.1_GH0.tar.gz) = 2321890
4	SHA256 (663b1158018d839eb5cfed63f4b228c1590c6104.patch) = defe0d166e0c70524b53ebaa61e6e220e7e1b6c569b3dd33088eb4d47bf8779a
5	SIZE (663b1158018d839eb5cfed63f4b228c1590c6104.patch) = 1365




--- 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)




--- libopenage/CMakeLists.txt.orig	2020-08-15 10:50:07 UTC
+++ libopenage/CMakeLists.txt
@@ -38,13 +38,21 @@ if(WIN32)
 endif()
 if(NOT APPLE AND NOT WIN32)
 	find_library(RT_LIB rt)
-	if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-		find_library(EXECINFO_LIB execinfo)

+   find_library(NYAN_LIBRARY NAMES "nyan" PATHS /usr/local/lib )
+   list(APPEND CMAKE_REQUIRED_INCLUDES ${NYAN_INCLUDE_DIR})
+   list(APPEND CMAKE_REQUIRED_LIBRARIES ${NYAN_LIBRARY})
 
+#    message(STATUS ${NYAN_INCLUDE_DIR})
+#    message(STATUS ${NYAN_LIBRARY})
+endif()
+
+
+find_library(FONTCONFIG_LIB fontconfig)
 find_package(Freetype REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(PNG REQUIRED)
 find_package(SDL2 REQUIRED)
@@ -70,78 +78,78 @@ endif()
 
 # first, try to locate nyan directly
 # this discovers the system package or the user-registry package

 
 # if this didn't work, we can download nyan like a git submodule.
 # this is the treeish to be checked out.
-if(NOT DEFINED NYAN_CLONE_VERSION)
-	set(NYAN_CLONE_VERSION origin/master)
-endif()
+#if(NOT DEFINED NYAN_CLONE_VERSION)
+#	set(NYAN_CLONE_VERSION origin/master)
+#endif()
 
-option(
-	DOWNLOAD_NYAN

 # or if it was used before.
-if((NOT nyan_FOUND AND DOWNLOAD_NYAN) OR FORCE_DOWNLOAD_NYAN)
-	message(STATUS "Downloading nyan as submodule project...")
-
-	if(DISABLE_SUBPROJECT_UPDATES)
-		set(DISABLE_NYAN_UPDATES "DISABLE_UPDATES")
-	endif()
-
-	fetch_project(
-		NAME nyan
-		${DISABLE_NYAN_UPDATES}
-		GIT_REPOSITORY https://github.com/SFTtech/nyan
-		GIT_TAG ${nyan_clone_version}
-	)
-
-	# don't register nyan to the userpackage-repo!
-	set(REGISTER_USERPACKAGE OFF)
-	# don't generate the `doc` target again (name conflict!)
-	set(DOXYGEN_ENABLE OFF)
-
-	# register the targets
-	add_subdirectory(${nyan_SOURCE_DIR} ${nyan_BINARY_DIR})
-
-	message(STATUS "nyan processed successfully!")
-
-elseif(NOT nyan_FOUND)
-	message(FATAL_ERROR "
-  Could not find the cmake package configuration file \"nyanConfig.cmake\".
-  To find it, you have several options:
-  * If your distribution provides it, install \"nyan\" through the package manager.
-  * If you want openage to automatically download \"nyan\", append `-DDOWNLOAD_NYAN=YES` to the cmake invocation or use `./configure --download-nyan`.
-  * If you want to build nyan manually, follow the build instructions:
-      [[  doc/building.md#nyan-installation  ]]
-  * If you already built nyan but it still can't be found (cmake package repo fails):
-    * Try to set \"nyan_DIR\" to the nyan build directory (it contains nyanConfig.cmake)
-      either through:  \"./configure $youroptions -- -Dnyan_DIR=/home/dev/nyan/build\"
-      or:              \"cmake $yourotheroptions -Dnyan_DIR=/home/dev/nyan/build ..\"
+#if((NOT nyan_FOUND AND DOWNLOAD_NYAN) OR FORCE_DOWNLOAD_NYAN)
+#	message(STATUS "Downloading nyan as submodule project...")
+#

+#		NAME nyan
+#		${DISABLE_NYAN_UPDATES}
+#		GIT_REPOSITORY https://github.com/SFTtech/nyan
+#		GIT_TAG ${NYAN_CLONE_VERSION}
+#	)
+#
+#	# don't register nyan to the userpackage-repo!

+#	add_subdirectory(${nyan_SOURCE_DIR} ${nyan_BINARY_DIR})
+#
+#	message(STATUS "nyan processed successfully!")
+#
-  In case of other problems, please try to figure them out (and tell us what you did).
-  Contact information is in README.md.
-")
-endif()
+#elseif(NOT nyan_FOUND)
+#	message(FATAL_ERROR "
+#  Could not find the cmake package configuration file \"nyanConfig.cmake\".

+#")
+#endif()
 
-	if(DISABLE_SUBPROJECT_UPDATES)
-		set(DISABLE_NYAN_UPDATES "DISABLE_UPDATES")
-	endif()
 
-	fetch_project(
-		NAME nyan
-		${DISABLE_NYAN_UPDATES}
-		GIT_REPOSITORY https://github.com/SFTtech/nyan
-		GIT_TAG ${NYAN_CLONE_VERSION}
-	)
-
-	# don't register nyan to the userpackage-repo!
-	set(REGISTER_USERPACKAGE OFF)
-	# don't generate the `doc` target again (name conflict!)
-	set(DOXYGEN_ENABLE OFF)
-
-	# register the targets
-	add_subdirectory(${nyan_SOURCE_DIR} ${nyan_BINARY_DIR})
-
-	message(STATUS "nyan processed successfully!")
-
-elseif(NOT nyan_FOUND)
-	message(FATAL_ERROR "
-  Could not find the cmake package configuration file \"nyanConfig.cmake\".
-  To find it, you have several options:
-  * If your distribution provides it, install \"nyan\" through the package manager.
-  * If you want openage to automatically download \"nyan\", append `-DDOWNLOAD_NYAN=YES` to the cmake invocation or use `./configure --download-nyan`.
-  * If you want to build nyan manually, follow the build instructions:
-      [[  doc/building.md#nyan-installation  ]]
-  * If you already built nyan but it still can't be found (cmake package repo fails):
-    * Try to set \"nyan_DIR\" to the nyan build directory (it contains nyanConfig.cmake)
-      either through:  \"./configure $youroptions -- -Dnyan_DIR=/home/dev/nyan/build\"
-      or:              \"cmake $yourotheroptions -Dnyan_DIR=/home/dev/nyan/build ..\"
-
-  In case of other problems, please try to figure them out (and tell us what you did).
-  Contact information is in README.md.
-")
-endif()
-
-
 ##################################################
 # optional dependencies
 
@@ -264,6 +272,7 @@ target_include_directories(libopenage
@@ -245,6 +253,7 @@ include_directories(
 	${SDL2IMAGE_INCLUDE_DIRS}
 	${HarfBuzz_INCLUDE_DIRS}
 	${QTPLATFORM_INCLUDE_DIRS}
+	${NYAN_INCLUDE_DIRS}
 )
 
 ##################################################
@@ -274,7 +283,8 @@ target_include_directories(libopenage
 target_link_libraries(libopenage
 	PRIVATE
 		Threads::Threads
-		nyan::nyan
+		${NYAN_LIBRARY}
+#		nyan::nyan
 		Eigen3::Eigen
 		${PNG_LIBRARIES}
 		${OPUS_LIBRARIES}




--- openage/default_dirs.py.orig	2020-08-15 10:50:07 UTC
+++ openage/default_dirs.py
@@ -33,6 +33,14 @@ LINUX_DIRS = {
     "runtime_dir": ("XDG_RUNTIME_DIR", ("/run/user/$UID")),

 
 # Windows-specific paths
 WINDOWS_DIRS = {
@@ -59,6 +67,9 @@ def get_dir(which):
 
     elif sys.platform.startswith("win32"):
         platform_table = WINDOWS_DIRS
+
+    elif sys.platform.startswith("freebsd"):
+    	platform_table = FREEBSD_DIRS
 
     else:
         raise Exception("unsupported platform: '%s'" % sys.platform)
 

Lines 1-8 Link Here

(-)b/games/openage/pkg-descr (-4 / +4 lines)
1	Openage: a volunteer project to create a free engine clone of the Genie Engine	1	Openage: a volunteer project to create a free engine clone of the Genie Engine
2	used by Age of Empires, Age of Empires II (HD) and Star Wars: Galactic	2	used by Age of Empires, Age of Empires II (HD) and Star Wars: Galactic
3	Battlegrounds, comparable to projects like OpenMW, OpenRA, OpenTTD and	3	Battlegrounds, comparable to projects like OpenMW, OpenRA, OpenTTD and
4	OpenRCT2. Openage uses the original game assets (such as sounds and graphics),	4	OpenRCT2. Openage uses the original game assets (such as sounds and graphics),
5	but (for obvious reasons) doesn't ship them. To play, you require an original	5	but (for obvious reasons) doesn't ship them. To play, you require an original
6	AoE II : TC installation or AoE II: HD (installation via Wine).	6	AoE II : TC installation or AoE II: HD (installation via Wine).
7		7
8	WWW: https://openage.sft.mx/	8	WWW: https://openage.sft.mx/

Lines 1-5 Link Here

(-)b/games/openage/pkg-plist (-1 / +14 lines)
1	%%ETCDIR%%/keybinds.oac
2	bin/openage	1	bin/openage
		2	%%ETCDIR%%/keybinds.oac
3	lib/libopenage.so	3	lib/libopenage.so
4	lib/libopenage.so.0	4	lib/libopenage.so.0
5	%%PYTHON_SITELIBDIR%%/openage/__init__.py	5	%%PYTHON_SITELIBDIR%%/openage/__init__.py
Lines 144-149 lib/libopenage.so.0 Link Here
144	%%PYTHON_SITELIBDIR%%/openage/convert/singlefile.py	144	%%PYTHON_SITELIBDIR%%/openage/convert/singlefile.py
145	%%PYTHON_SITELIBDIR%%/openage/convert/slp%%PYTHON_EXT_SUFFIX%%.so	145	%%PYTHON_SITELIBDIR%%/openage/convert/slp%%PYTHON_EXT_SUFFIX%%.so
146	%%PYTHON_SITELIBDIR%%/openage/convert/slp_converter_pool.py	146	%%PYTHON_SITELIBDIR%%/openage/convert/slp_converter_pool.py
		147	%%PYTHON_SITELIBDIR%%/openage/convert/smp%%PYTHON_EXT_SUFFIX%%.so
		148	%%PYTHON_SITELIBDIR%%/openage/convert/smx%%PYTHON_EXT_SUFFIX%%.so
147	%%PYTHON_SITELIBDIR%%/openage/convert/stringresource.py	149	%%PYTHON_SITELIBDIR%%/openage/convert/stringresource.py
148	%%PYTHON_SITELIBDIR%%/openage/convert/texture.py	150	%%PYTHON_SITELIBDIR%%/openage/convert/texture.py
149	%%PYTHON_SITELIBDIR%%/openage/cppinterface/__init__.py	151	%%PYTHON_SITELIBDIR%%/openage/cppinterface/__init__.py
Lines 161-167 lib/libopenage.so.0 Link Here
161	%%PYTHON_SITELIBDIR%%/openage/cvar/config_file.py	163	%%PYTHON_SITELIBDIR%%/openage/cvar/config_file.py
162	%%PYTHON_SITELIBDIR%%/openage/cvar/cvar%%PYTHON_EXT_SUFFIX%%.so	164	%%PYTHON_SITELIBDIR%%/openage/cvar/cvar%%PYTHON_EXT_SUFFIX%%.so
163	%%PYTHON_SITELIBDIR%%/openage/cvar/location.py	165	%%PYTHON_SITELIBDIR%%/openage/cvar/location.py
		166	%%PYTHON_SITELIBDIR%%/openage/cython_check%%PYTHON_EXT_SUFFIX%%.so
164	%%PYTHON_SITELIBDIR%%/openage/default_dirs.py	167	%%PYTHON_SITELIBDIR%%/openage/default_dirs.py
		168	%%PYTHON_SITELIBDIR%%/openage/event/__init__.py
		169	%%PYTHON_SITELIBDIR%%/openage/event/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
		170	%%PYTHON_SITELIBDIR%%/openage/event/demo%%PYTHON_EXT_SUFFIX%%.so
165	%%PYTHON_SITELIBDIR%%/openage/game/__init__.py	171	%%PYTHON_SITELIBDIR%%/openage/game/__init__.py
166	%%PYTHON_SITELIBDIR%%/openage/game/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc	172	%%PYTHON_SITELIBDIR%%/openage/game/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
167	%%PYTHON_SITELIBDIR%%/openage/game/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc	173	%%PYTHON_SITELIBDIR%%/openage/game/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
Lines 172-177 lib/libopenage.so.0 Link Here
172	%%PYTHON_SITELIBDIR%%/openage/log/__pycache__/tests.cpython-%%PYTHON_SUFFIX%%.pyc	178	%%PYTHON_SITELIBDIR%%/openage/log/__pycache__/tests.cpython-%%PYTHON_SUFFIX%%.pyc
173	%%PYTHON_SITELIBDIR%%/openage/log/log_cpp%%PYTHON_EXT_SUFFIX%%.so	179	%%PYTHON_SITELIBDIR%%/openage/log/log_cpp%%PYTHON_EXT_SUFFIX%%.so
174	%%PYTHON_SITELIBDIR%%/openage/log/tests.py	180	%%PYTHON_SITELIBDIR%%/openage/log/tests.py
		181	%%PYTHON_SITELIBDIR%%/openage/renderer/__init__.py
		182	%%PYTHON_SITELIBDIR%%/openage/renderer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
		183	%%PYTHON_SITELIBDIR%%/openage/renderer/renderer_cpp%%PYTHON_EXT_SUFFIX%%.so
		184	%%PYTHON_SITELIBDIR%%/openage/renderer/tests%%PYTHON_EXT_SUFFIX%%.so
175	%%PYTHON_SITELIBDIR%%/openage/testing/__init__.py	185	%%PYTHON_SITELIBDIR%%/openage/testing/__init__.py
176	%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc	186	%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
177	%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/benchmark.cpython-%%PYTHON_SUFFIX%%.pyc	187	%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/benchmark.cpython-%%PYTHON_SUFFIX%%.pyc
Lines 242-247 lib/libopenage.so.0 Link Here
242	%%PYTHON_SITELIBDIR%%/openage/util/struct.py	252	%%PYTHON_SITELIBDIR%%/openage/util/struct.py
243	%%PYTHON_SITELIBDIR%%/openage/util/system.py	253	%%PYTHON_SITELIBDIR%%/openage/util/system.py
244	%%PYTHON_SITELIBDIR%%/openage/util/threading.py	254	%%PYTHON_SITELIBDIR%%/openage/util/threading.py
		255	%%PYTHON_SITELIBDIR%%/openage/versions/__init__.py
		256	%%PYTHON_SITELIBDIR%%/openage/versions/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
		257	%%PYTHON_SITELIBDIR%%/openage/versions/versions%%PYTHON_EXT_SUFFIX%%.so
245	share/applications/openage.desktop	258	share/applications/openage.desktop
246	%%DATADIR%%/banner.svg	259	%%DATADIR%%/banner.svg
247	%%DATADIR%%/gaben.png	260	%%DATADIR%%/gaben.png

Return to bug 257471

Lines 1-13 Link Here

(-)b/games/openage/Makefile (-10 / +6 lines)
1	PORTNAME= openage	1	PORTNAME= openage
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.3.0-1262	3	DISTVERSION= 0.4.1
4	DISTVERSIONSUFFIX= -ga554ab49
5	PORTREVISION= 5
6	CATEGORIES= games	4	CATEGORIES= games
7		5
8	PATCH_SITES= https://github.com/SFTtech/openage/commit/
9	PATCHFILES= 663b1158018d839eb5cfed63f4b228c1590c6104.patch:-p1
10
11	MAINTAINER= freebsd@sysctl.cz	6	MAINTAINER= freebsd@sysctl.cz
12	COMMENT= Free engine clone of the Genie Engine	7	COMMENT= Free engine clone of the Genie Engine
13		8
Lines 15-20 LICENSE= GPLv3 Link Here
15	LICENSE_FILE= ${WRKSRC}/legal/GPLv3	10	LICENSE_FILE= ${WRKSRC}/legal/GPLv3
16		11
17	BUILD_DEPENDS= ${PYNUMPY} \	12	BUILD_DEPENDS= ${PYNUMPY} \
		13	eigen>0:math/eigen3 \
18	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \	14	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
19	${PY_PILLOW} \	15	${PY_PILLOW} \
20	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}	16	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
Lines 32-39 RUN_DEPENDS= ${PYNUMPY} \ Link Here
32	${PY_PILLOW} \	28	${PY_PILLOW} \
33	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}	29	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
34		30
35	USES= cmake compiler:c++17-lang gl python:3.4+ qt:5 sdl shebangfix	31	USES= cmake compiler:c++17-lang gl ncurses:base python:3.4+ qt:5 sdl shebangfix
36	SHEBANG_FILES= configure run.py buildsystem/cythonize.py	32	SHEBANG_FILES= configure run.py.in buildsystem/cythonize.py
37	USE_GITHUB= yes	33	USE_GITHUB= yes
38	GH_ACCOUNT= SFTtech	34	GH_ACCOUNT= SFTtech
39	USE_SDL= image2 sdl2	35	USE_SDL= image2 sdl2
Lines 45-52 USE_LDCONFIG= yes Link Here
45	CMAKE_OFF= WANT_BACKTRACE WANT_GPERFTOOLS_PROFILER WANT_INOTIFY	41	CMAKE_OFF= WANT_BACKTRACE WANT_GPERFTOOLS_PROFILER WANT_INOTIFY
46	CMAKE_ARGS= -DGLOBAL_CONFIG_DIR:STRING=${ETCDIR}	42	CMAKE_ARGS= -DGLOBAL_CONFIG_DIR:STRING=${ETCDIR}
47		43
48	post-patch:	44	pre-configure:
49	@${REINPLACE_CMD} -e 's\|/usr/bin/env python3\|${PYTHON_CMD}\|' ${WRKSRC}/buildsystem/modules/FindPython.cmake	45	${REINPLACE_CMD} -e 's\|python3\|${PYTHON_CMD}\|' ${WRKSRC}/openage/codegen/main.py
50		46
51	post-install:	47	post-install:
52	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/openage	48	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/openage

Added Link Here

(-)b/games/openage/files/patch-buildsystem_pxdgen.py (+23 lines)
1	--- buildsystem/pxdgen.py.orig 2020-08-15 10:50:07 UTC
2	+++ buildsystem/pxdgen.py
3	@@ -23,6 +23,7 @@ class ParserError(Exception):
4	"""
5	Represents a fatal parsing error in PXDGenerator.
6	"""
7	+
8	def __init__(self, filename, lineno, message):
9	super().__init__("{}:{} {}".format(filename, lineno, message))
10
11	@@ -218,8 +219,11 @@ class PXDGenerator:
12	return self.handle_token(token, val)
13
14	def handle_state_1(self, token, val, namespace_parts):
15	+ # Patch from upstream, commit 3aa91ea4d4a72a5f3b6f90ad0390b9e07de7aa77
16	# we're inside a namespace definition; expect Token.Name
17	- if token != Token.Name:
18	+ # TODO: pygments 2.9 correctly reports Token.Name.Namespace
19	+ # we can require this version eventually and change the condition
20	+ if token not in Token.Name:
21	raise self.parser_error(
22	"expected identifier after 'namespace'")
23	namespace_parts.append(val)

Lines 1-8 Link Here

(-)b/games/openage/files/patch-libopenage_CMakeLists.txt (-59 / +66 lines)
1	--- libopenage/CMakeLists.txt.orig 2018-07-14 15:12:15 UTC	1	--- libopenage/CMakeLists.txt.orig 2020-08-15 10:50:07 UTC
2	+++ libopenage/CMakeLists.txt	2	+++ libopenage/CMakeLists.txt
3	@@ -86,13 +86,21 @@ if(MSVC)	3	@@ -38,13 +38,21 @@ if(WIN32)
4	endif()	4	endif()
5	if(NOT APPLE AND NOT MSVC)	5	if(NOT APPLE AND NOT WIN32)
6	find_library(RT_LIB rt)	6	find_library(RT_LIB rt)
7	- if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")	7	- if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
8	- find_library(EXECINFO_LIB execinfo)	8	- find_library(EXECINFO_LIB execinfo)
Lines 16-32 Link Here
16	+ find_library(NYAN_LIBRARY NAMES "nyan" PATHS /usr/local/lib )	16	+ find_library(NYAN_LIBRARY NAMES "nyan" PATHS /usr/local/lib )
17	+ list(APPEND CMAKE_REQUIRED_INCLUDES ${NYAN_INCLUDE_DIR})	17	+ list(APPEND CMAKE_REQUIRED_INCLUDES ${NYAN_INCLUDE_DIR})
18	+ list(APPEND CMAKE_REQUIRED_LIBRARIES ${NYAN_LIBRARY})	18	+ list(APPEND CMAKE_REQUIRED_LIBRARIES ${NYAN_LIBRARY})
19	+	19
20	+# message(STATUS ${NYAN_INCLUDE_DIR})	20	+# message(STATUS ${NYAN_INCLUDE_DIR})
21	+# message(STATUS ${NYAN_LIBRARY})	21	+# message(STATUS ${NYAN_LIBRARY})
22	+endif()	22	+endif()
23	+	23	+
24		24	+
25	+find_library(FONTCONFIG_LIB fontconfig)	25	+find_library(FONTCONFIG_LIB fontconfig)
26	find_package(Freetype REQUIRED)	26	find_package(Freetype REQUIRED)
27	find_package(OpenGL REQUIRED)
28	find_package(PNG REQUIRED)	27	find_package(PNG REQUIRED)
29	@@ -115,74 +123,74 @@ endif()	28	find_package(SDL2 REQUIRED)
		29	@@ -70,78 +78,78 @@ endif()
30		30
31	# first, try to locate nyan directly	31	# first, try to locate nyan directly
32	# this discovers the system package or the user-registry package	32	# this discovers the system package or the user-registry package
Lines 35-42 Link Here
35		35
36	# if this didn't work, we can download nyan like a git submodule.	36	# if this didn't work, we can download nyan like a git submodule.
37	# this is the treeish to be checked out.	37	# this is the treeish to be checked out.
38	-set(nyan_clone_version origin/master)	38	-if(NOT DEFINED NYAN_CLONE_VERSION)
39	+#set(nyan_clone_version origin/master)	39	- set(NYAN_CLONE_VERSION origin/master)
		40	-endif()
		41	+#if(NOT DEFINED NYAN_CLONE_VERSION)
		42	+# set(NYAN_CLONE_VERSION origin/master)
		43	+#endif()
40		44
41	-option(	45	-option(
42	- DOWNLOAD_NYAN	46	- DOWNLOAD_NYAN
Lines 76-115 Link Here
76	# or if it was used before.	80	# or if it was used before.
77	-if((NOT nyan_FOUND AND DOWNLOAD_NYAN) OR FORCE_DOWNLOAD_NYAN)	81	-if((NOT nyan_FOUND AND DOWNLOAD_NYAN) OR FORCE_DOWNLOAD_NYAN)
78	- message(STATUS "Downloading nyan as submodule project...")	82	- message(STATUS "Downloading nyan as submodule project...")
79	-
80	- if(DISABLE_SUBPROJECT_UPDATES)
81	- set(DISABLE_NYAN_UPDATES "DISABLE_UPDATES")
82	- endif()
83	-
84	- fetch_project(
85	- NAME nyan
86	- ${DISABLE_NYAN_UPDATES}
87	- GIT_REPOSITORY https://github.com/SFTtech/nyan
88	- GIT_TAG ${nyan_clone_version}
89	- )
90	-
91	- # don't register nyan to the userpackage-repo!
92	- set(REGISTER_USERPACKAGE OFF)
93	- # don't generate the `doc` target again (name conflict!)
94	- set(DOXYGEN_ENABLE OFF)
95	-
96	- # register the targets
97	- add_subdirectory(${nyan_SOURCE_DIR} ${nyan_BINARY_DIR})
98	-
99	- message(STATUS "nyan processed successfully!")
100	-
101	-elseif(NOT nyan_FOUND)
102	- message(FATAL_ERROR "
103	- Could not find the cmake package configuration file \"nyanConfig.cmake\".
104	- To find it, you have several options:
105	- * If your distribution provides it, install \"nyan\" through the package manager.
106	- * If you want openage to automatically download \"nyan\", append `-DDOWNLOAD_NYAN=YES` to the cmake invocation or use `./configure --download-nyan`.
107	- * If you want to build nyan manually, follow the build instructions:
108	- [[ doc/building.md#nyan-installation ]]
109	- * If you already built nyan but it still can't be found (cmake package repo fails):
110	- * Try to set \"nyan_DIR\" to the nyan build directory (it contains nyanConfig.cmake)
111	- either through: \"./configure $youroptions -- -Dnyan_DIR=/home/dev/nyan/build\"
112	- or: \"cmake $yourotheroptions -Dnyan_DIR=/home/dev/nyan/build ..\"
113	+#if((NOT nyan_FOUND AND DOWNLOAD_NYAN) OR FORCE_DOWNLOAD_NYAN)	83	+#if((NOT nyan_FOUND AND DOWNLOAD_NYAN) OR FORCE_DOWNLOAD_NYAN)
114	+# message(STATUS "Downloading nyan as submodule project...")	84	+# message(STATUS "Downloading nyan as submodule project...")
115	+#	85	+#
Lines 121-127 Link Here
121	+# NAME nyan	91	+# NAME nyan
122	+# ${DISABLE_NYAN_UPDATES}	92	+# ${DISABLE_NYAN_UPDATES}
123	+# GIT_REPOSITORY https://github.com/SFTtech/nyan	93	+# GIT_REPOSITORY https://github.com/SFTtech/nyan
124	+# GIT_TAG ${nyan_clone_version}	94	+# GIT_TAG ${NYAN_CLONE_VERSION}
125	+# )	95	+# )
126	+#	96	+#
127	+# # don't register nyan to the userpackage-repo!	97	+# # don't register nyan to the userpackage-repo!
Lines 133-143 Link Here
133	+# add_subdirectory(${nyan_SOURCE_DIR} ${nyan_BINARY_DIR})	103	+# add_subdirectory(${nyan_SOURCE_DIR} ${nyan_BINARY_DIR})
134	+#	104	+#
135	+# message(STATUS "nyan processed successfully!")	105	+# message(STATUS "nyan processed successfully!")
136		106	+#
137	- In case of other problems, please try to figure them out (and tell us what you did).
138	- Contact information is in README.md.
139	-")
140	-endif()
141	+#elseif(NOT nyan_FOUND)	107	+#elseif(NOT nyan_FOUND)
142	+# message(FATAL_ERROR "	108	+# message(FATAL_ERROR "
143	+# Could not find the cmake package configuration file \"nyanConfig.cmake\".	109	+# Could not find the cmake package configuration file \"nyanConfig.cmake\".
Lines 156-178 Link Here
156	+#")	122	+#")
157	+#endif()	123	+#endif()
158		124
		125	- if(DISABLE_SUBPROJECT_UPDATES)
		126	- set(DISABLE_NYAN_UPDATES "DISABLE_UPDATES")
		127	- endif()
		128
		129	- fetch_project(
		130	- NAME nyan
		131	- ${DISABLE_NYAN_UPDATES}
		132	- GIT_REPOSITORY https://github.com/SFTtech/nyan
		133	- GIT_TAG ${NYAN_CLONE_VERSION}
		134	- )
		135	-
		136	- # don't register nyan to the userpackage-repo!
		137	- set(REGISTER_USERPACKAGE OFF)
		138	- # don't generate the `doc` target again (name conflict!)
		139	- set(DOXYGEN_ENABLE OFF)
		140	-
		141	- # register the targets
		142	- add_subdirectory(${nyan_SOURCE_DIR} ${nyan_BINARY_DIR})
		143	-
		144	- message(STATUS "nyan processed successfully!")
		145	-
		146	-elseif(NOT nyan_FOUND)
		147	- message(FATAL_ERROR "
		148	- Could not find the cmake package configuration file \"nyanConfig.cmake\".
		149	- To find it, you have several options:
		150	- * If your distribution provides it, install \"nyan\" through the package manager.
		151	- * If you want openage to automatically download \"nyan\", append `-DDOWNLOAD_NYAN=YES` to the cmake invocation or use `./configure --download-nyan`.
		152	- * If you want to build nyan manually, follow the build instructions:
		153	- [[ doc/building.md#nyan-installation ]]
		154	- * If you already built nyan but it still can't be found (cmake package repo fails):
		155	- * Try to set \"nyan_DIR\" to the nyan build directory (it contains nyanConfig.cmake)
		156	- either through: \"./configure $youroptions -- -Dnyan_DIR=/home/dev/nyan/build\"
		157	- or: \"cmake $yourotheroptions -Dnyan_DIR=/home/dev/nyan/build ..\"
		158	-
		159	- In case of other problems, please try to figure them out (and tell us what you did).
		160	- Contact information is in README.md.
		161	-")
		162	-endif()
		163	-
		164	-
		165	##################################################
		166	# optional dependencies
159		167
160	if(GCCBacktrace_FOUND)	168	@@ -264,6 +272,7 @@ target_include_directories(libopenage
161	@@ -245,6 +253,7 @@ include_directories(
162	${SDL2IMAGE_INCLUDE_DIRS}	169	${SDL2IMAGE_INCLUDE_DIRS}
163	${HarfBuzz_INCLUDE_DIRS}	170	${HarfBuzz_INCLUDE_DIRS}
164	${QTPLATFORM_INCLUDE_DIRS}	171	${QTPLATFORM_INCLUDE_DIRS}
165	+ ${NYAN_INCLUDE_DIRS}	172	+ ${NYAN_INCLUDE_DIRS}
166	)	173	)
167		174
168	# link the executable to those libraries	175	##################################################
169	@@ -265,7 +274,8 @@ target_link_libraries(libopenage	176	@@ -274,7 +283,8 @@ target_include_directories(libopenage
170	${RT_LIB}	177	target_link_libraries(libopenage
171	${OGG_LIB}	178	PRIVATE
172	${EXECINFO_LIB}	179	Threads::Threads
173	- nyan::nyan	180	- nyan::nyan
174	+ ${NYAN_LIBRARY}	181	+ ${NYAN_LIBRARY}
175	+# nyan::nyan	182	+# nyan::nyan
176		183	Eigen3::Eigen
177	# TODO: change to PUBLIC (or, alternatively, remove all keywords	184	${PNG_LIBRARIES}
178	# of this type) when qt cmake scripts change declarations of the	185	${OPUS_LIBRARIES}

Lines 1-4 Link Here

(-)b/games/openage/files/patch-openage_default__dirs.py (-5 / +5 lines)
1	--- openage/default_dirs.py.orig 2018-07-15 14:29:49 UTC	1	--- openage/default_dirs.py.orig 2020-08-15 10:50:07 UTC
2	+++ openage/default_dirs.py	2	+++ openage/default_dirs.py
3	@@ -33,6 +33,14 @@ LINUX_DIRS = {	3	@@ -33,6 +33,14 @@ LINUX_DIRS = {
4	"runtime_dir": ("XDG_RUNTIME_DIR", ("/run/user/$UID")),	4	"runtime_dir": ("XDG_RUNTIME_DIR", ("/run/user/$UID")),
Lines 15-27 Link Here
15		15
16	# Windows-specific paths	16	# Windows-specific paths
17	WINDOWS_DIRS = {	17	WINDOWS_DIRS = {
18	@@ -60,6 +68,9 @@ def get_dir(which):	18	@@ -59,6 +67,9 @@ def get_dir(which):
		19
19	elif sys.platform.startswith("win32"):	20	elif sys.platform.startswith("win32"):
20	platform_table = WINDOWS_DIRS	21	platform_table = WINDOWS_DIRS
21		22	+
22	+ elif sys.platform.startswith("freebsd"):	23	+ elif sys.platform.startswith("freebsd"):
23	+ platform_table = FREEBSD_DIRS	24	+ platform_table = FREEBSD_DIRS
24	+	25
25	else:	26	else:
26	raise Exception("unsupported platform: '%s'" % sys.platform)	27	raise Exception("unsupported platform: '%s'" % sys.platform)
27