DarkRadiant: update to 2.12.0.

This commit is contained in:
John 2021-05-03 17:06:36 +02:00
parent 8f4b810a36
commit 4d7c55b1d8
4 changed files with 43 additions and 17 deletions

View File

@ -0,0 +1,11 @@
--- test/CMakeLists.txt 2021-05-01 12:10:44.000000000 +0200
+++ - 2021-05-03 17:29:15.242919282 +0200
@@ -47,6 +47,4 @@
${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
${SIGC_LIBRARIES} ${GLEW_LIBRARIES} ${X11_LIBRARIES}
PRIVATE Threads::Threads)
-install(TARGETS drtest)
-
-gtest_discover_tests(drtest)
\ No newline at end of file
+gtest_discover_tests(drtest)

View File

@ -0,0 +1,28 @@
--- radiantcore/log/SegFaultHandler.cpp 2021-05-01 12:10:44.000000000 +0200
+++ - 2021-05-04 19:37:03.411760291 +0200
@@ -2,7 +2,7 @@
#include "itextstream.h"
-#ifdef POSIX
+#ifdef __GLIBC__
#include <execinfo.h>
#include <signal.h>
#endif
@@ -12,14 +12,14 @@
void SegFaultHandler::Install()
{
-#ifdef POSIX
+#ifdef __GLIBC__
signal(SIGSEGV, _handleSigSegv);
#endif
}
void SegFaultHandler::_handleSigSegv(int sig)
{
-#ifdef POSIX
+#ifdef __GLIBC__
rError() << "SIGSEGV signal caught: " << sig << std::endl;
std::cerr << "SIGSEGV signal caught: " << sig << std::endl;

View File

@ -1,14 +0,0 @@
--- test/CMakeLists.txt 2020-12-26 13:15:24.000000000 +0100
+++ - 2020-12-27 00:12:53.749544936 +0100
@@ -1,3 +1,4 @@
+enable_testing()
add_executable(drtest
Camera.cpp
ColourSchemes.cpp
@@ -38,4 +38,5 @@
${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
${SIGC_LIBRARIES} ${GLEW_LIBRARIES} ${X11_LIBRARIES}
PRIVATE Threads::Threads)
-install(TARGETS drtest)
+add_test(NAME drtest
+ COMMAND drtest)

View File

@ -1,19 +1,20 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.10.0
version=2.12.0
revision=1
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config"
makedepends="ftgl-devel glew-devel libjpeg-turbo-devel libsigc++-devel
libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel freealut-devel"
libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel
eigen libglib-devel freealut-devel"
checkdepends="gtest-devel"
short_desc="Map editor for The Dark Mod and other idTech4/Doom3-based games"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://github.com/codereader/DarkRadiant/"
distfiles="https://github.com/codereader/DarkRadiant/archive/${version}.tar.gz"
checksum=b0a15d24a1f574616a1631dca64ee69545cd21ebecdc6bf8c8afd1b69ec53f5b
checksum=8c5dc0f7d160dea7e9c735f9739e36462dd8c8719a3022156f9584250fc3b867
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/lib/wx/include/gtk3-unicode-3.0"