this is a bugfix release https://github.com/vcmi/vcmi/blob/develop/ChangeLog.md#150---151
tested on amd64, worked fine diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile index b2375cf42b4..5e0fbb7d924 100644 --- a/games/vcmi/Makefile +++ b/games/vcmi/Makefile @@ -6,7 +6,7 @@ HOMEPAGE = https://vcmi.eu/ MAINTAINER = Kirill Bychkov <ki...@openbsd.org> -DIST_TUPLE += github vcmi vcmi 1.5.0 . +DIST_TUPLE += github vcmi vcmi 1.5.1 . DIST_TUPLE += github fuzzylite fuzzylite \ 7aee562d6ca17f3cf42588ffb5116e03017c3c50 AI/FuzzyLite DIST_TUPLE += github google googletest \ diff --git a/games/vcmi/distinfo b/games/vcmi/distinfo index acddf2d0d9f..7548d805c2b 100644 --- a/games/vcmi/distinfo +++ b/games/vcmi/distinfo @@ -1,6 +1,6 @@ SHA256 (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) = cOf9r/LVFHo79ZDMgXGWbZmDzNSZQAL4IWyDskBZl0Y= SHA256 (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) = JoHejAkwsGENxSomAvrUHQ2vo9f/EDDaZXXVb8H0ykY= -SHA256 (vcmi-vcmi-1.5.0.tar.gz) = OPpIx9oxiqWp4NMxn8sk9N/feFVcIbiwufm7tM7fM/g= +SHA256 (vcmi-vcmi-1.5.1.tar.gz) = P58SAgTnZ2pBZBlw9bGp+cb4wpZ+2NqcmNyOP+wBwkk= SIZE (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) = 2194254 SIZE (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) = 864010 -SIZE (vcmi-vcmi-1.5.0.tar.gz) = 9720419 +SIZE (vcmi-vcmi-1.5.1.tar.gz) = 9726101 diff --git a/games/vcmi/patches/patch-CMakeLists_txt b/games/vcmi/patches/patch-CMakeLists_txt index 77a15a7e595..ca7c5059592 100644 --- a/games/vcmi/patches/patch-CMakeLists_txt +++ b/games/vcmi/patches/patch-CMakeLists_txt @@ -1,7 +1,7 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -508,7 +508,7 @@ endif() +@@ -510,7 +510,7 @@ endif() if(ENABLE_LAUNCHER OR ENABLE_EDITOR) # Widgets finds its own dependencies (QtGui and QtCore). diff --git a/games/vcmi/patches/patch-client_CMT_cpp b/games/vcmi/patches/patch-client_CMT_cpp index 0f64536f23f..ca96ffd9826 100644 --- a/games/vcmi/patches/patch-client_CMT_cpp +++ b/games/vcmi/patches/patch-client_CMT_cpp @@ -1,12 +1,12 @@ Index: client/CMT.cpp --- client/CMT.cpp.orig +++ client/CMT.cpp -@@ -419,7 +419,7 @@ static void mainLoop() +@@ -433,7 +433,7 @@ static void mainLoop() // destruction of locked mutexes (fails an assertion), even in third-party libraries (as well as native libs on Android) // Android - std::quick_exit is available only starting from API level 21 // Mingw, macOS and iOS - std::quick_exit is unavailable (at least in current version of CI) -#if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || (defined(__MINGW32__)) || defined(VCMI_APPLE) +#if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || (defined(__MINGW32__)) || defined(VCMI_APPLE) || defined(__OpenBSD__) - ::exit(0); + ::exit(error_code); #else - std::quick_exit(0); + std::quick_exit(error_code); diff --git a/games/vcmi/patches/patch-lib_CThreadHelper_cpp b/games/vcmi/patches/patch-lib_CThreadHelper_cpp index 1f33c2cd3a0..d71a00b5752 100644 --- a/games/vcmi/patches/patch-lib_CThreadHelper_cpp +++ b/games/vcmi/patches/patch-lib_CThreadHelper_cpp @@ -1,12 +1,11 @@ Index: lib/CThreadHelper.cpp --- lib/CThreadHelper.cpp.orig +++ lib/CThreadHelper.cpp -@@ -109,7 +109,7 @@ void setThreadName(const std::string &name) - pthread_setname_np(name.c_str()); +@@ -112,7 +112,6 @@ void setThreadName(const std::string &name) #elif defined(VCMI_HAIKU) rename_thread(find_thread(NULL), name.c_str()); --#elif defined(VCMI_UNIX) -+#elif defined(VCMI_UNIX) && !defined(__OpenBSD__) - prctl(PR_SET_NAME, name.c_str(), 0, 0, 0); + #elif defined(VCMI_UNIX) +- prctl(PR_SET_NAME, name.c_str(), 0, 0, 0); + #else + #error "Failed to find method to set thread name on this system. Please provide one (or disable this line if you just want code to compile)" #endif - }
