Index: head/games/wyrmgus/files/patch-src_database_data__type.h =================================================================== --- head/games/wyrmgus/files/patch-src_database_data__type.h (revision 561949) +++ head/games/wyrmgus/files/patch-src_database_data__type.h (nonexistent) @@ -1,33 +0,0 @@ -diff --git a/src/database/data_type.h b/src/database/data_type.h -index 1e9aa40ce..645cb217e 100644 ---- src/database/data_type.h -+++ src/database/data_type.h -@@ -52,6 +52,15 @@ template - class data_type : public data_type_base - { - public: -+ data_type() { -+ // this check is required for class_initialized variable and, -+ // correspondingly, data_type::initialize_class() call not to -+ // be initialized away -+ if (!class_initialized) { -+ throw std::runtime_error("Never reached"); -+ } -+ } -+ - static T *get(const std::string &identifier) - { - if (identifier == "none") { -@@ -308,12 +317,7 @@ class data_type : public data_type_base - static inline std::map> instances_by_identifier; - static inline std::map instances_by_alias; - static inline data_module_map> sml_data_to_process; --#ifdef __GNUC__ -- //the "used" attribute is needed under GCC, or else this variable will be optimized away (even in debug builds) -- static inline bool class_initialized [[gnu::used]] = data_type::initialize_class(); --#else - static inline bool class_initialized = data_type::initialize_class(); --#endif - }; - - } Property changes on: head/games/wyrmgus/files/patch-src_database_data__type.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/wyrmgus/Makefile =================================================================== --- head/games/wyrmgus/Makefile (revision 561949) +++ head/games/wyrmgus/Makefile (revision 561950) @@ -1,49 +1,49 @@ # Created by: Travis Poppe # $FreeBSD$ PORTNAME= wyrmgus -PORTVERSION= 4.1.1 +PORTVERSION= 4.1.2 DISTVERSIONPREFIX= v CATEGORIES= games devel MAINTAINER= amdmi3@FreeBSD.org COMMENT= Modified Stratagus engine for Wyrmsun LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtolua++-${LUA_VER}.so:lang/tolua++ BUILD_DEPENDS= ${LOCALBASE}/include/boost/tokenizer.hpp:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= Andrettin GH_PROJECT= Wyrmgus USES= cmake compiler:c++17-lang lua:51 pkgconfig sdl sqlite qt:5 xorg USE_QT= core gui widgets multimedia location declarative network \ qmake_build buildtools_build USE_XORG= x11 USE_SDL= sdl mixer CMAKE_ARGS= -DGAMEDIR:STRING="bin" \ -DTOLUA++_APP:STRING="tolua++-${LUA_VER}" \ -DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \ -DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so" \ -DENABLE_USEGAMEDIR:BOOL=OFF PORTDOCS= * PLIST_FILES= bin/${PORTNAME} \ share/pixmaps/wyrmsun.ico OPTIONS_DEFINE= OPENGL DOCS OPTIONS_DEFAULT=OPENGL OPENGL_USES= gl OPENGL_USE= GL=gl,glu OPENGL_CMAKE_ON= -DWITH_RENDERER="OpenGL" OPENGL_CMAKE_OFF= -DWITH_RENDERER="NativeSDL" post-install: ${INSTALL_DATA} ${WRKSRC}/src/win32/wyrmsun.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ .include Index: head/games/wyrmgus/distinfo =================================================================== --- head/games/wyrmgus/distinfo (revision 561949) +++ head/games/wyrmgus/distinfo (revision 561950) @@ -1,3 +1,3 @@ -TIMESTAMP = 1610282165 -SHA256 (Andrettin-Wyrmgus-v4.1.1_GH0.tar.gz) = 97950652a6b9ab2f94d7b794e0ef1f5932f0479682dac30d7d10108a1f1dd990 -SIZE (Andrettin-Wyrmgus-v4.1.1_GH0.tar.gz) = 1536309 +TIMESTAMP = 1610886938 +SHA256 (Andrettin-Wyrmgus-v4.1.2_GH0.tar.gz) = b7652685f682f132ecb5235f1132747f23f9129d4570bf1a015b16bce80713d7 +SIZE (Andrettin-Wyrmgus-v4.1.2_GH0.tar.gz) = 1544931