diff options
| -rw-r--r-- | games/wyrmgus/Makefile | 2 | ||||
| -rw-r--r-- | games/wyrmgus/distinfo | 6 | ||||
| -rw-r--r-- | games/wyrmgus/files/patch-src_database_data__type.h | 33 |
3 files changed, 4 insertions, 37 deletions
diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile index 6f8f9f69baa1..ec44f36883af 100644 --- a/games/wyrmgus/Makefile +++ b/games/wyrmgus/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wyrmgus -PORTVERSION= 4.1.1 +PORTVERSION= 4.1.2 DISTVERSIONPREFIX= v CATEGORIES= games devel diff --git a/games/wyrmgus/distinfo b/games/wyrmgus/distinfo index e87b36a99296..5b0217069f24 100644 --- a/games/wyrmgus/distinfo +++ b/games/wyrmgus/distinfo @@ -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 diff --git a/games/wyrmgus/files/patch-src_database_data__type.h b/games/wyrmgus/files/patch-src_database_data__type.h deleted file mode 100644 index f37badb3683f..000000000000 --- a/games/wyrmgus/files/patch-src_database_data__type.h +++ /dev/null @@ -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 <typename T> - 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<std::string, qunique_ptr<T>> instances_by_identifier; - static inline std::map<std::string, T *> instances_by_alias; - static inline data_module_map<std::vector<sml_data>> 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 - }; - - } |