DarkRadiant: update to 2.10.0.
This commit is contained in:
parent
5d7d82f694
commit
97e86acc9a
3 changed files with 23 additions and 45 deletions
|
@ -1,35 +0,0 @@
|
|||
Description: Resolve FTBFS with GCC 8
|
||||
We can't use the regular C++17 <filesystem> header, because the code is written
|
||||
against the pre-C++17 header <experimental/filesystem>.
|
||||
Author: Juhani Numminen <juhaninumminen0@gmail.com>
|
||||
Bug-Debian: https://bugs.debian.org/897734
|
||||
Forwarded: http://bugs.thedarkmod.com/view.php?id=4874
|
||||
Last-Update: 2018-05-24
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -159,15 +159,6 @@
|
||||
# By default, we rely on boost.filesystem, unless we have the C++17 libs
|
||||
use_boost_filesystem=yes
|
||||
|
||||
-# Check for the regular C++17 <filesystem> header
|
||||
-AC_CHECK_HEADER([filesystem], [found_std_filesystem=yes], [found_std_filesystem=no])
|
||||
-
|
||||
-# if no <filesystem> is present, check for the pre-C++17 header <experimental/filesystem>
|
||||
-if test "$found_std_filesystem" = "yes"
|
||||
-then
|
||||
- AC_DEFINE([HAVE_STD_FILESYSTEM], [1], [Define this to indicate that the <filesystem> header is available for inclusion.])
|
||||
- use_boost_filesystem=no
|
||||
-else
|
||||
AC_CHECK_HEADER([experimental/filesystem], [found_experimental_filesystem=yes], [found_experimental_filesystem=no])
|
||||
|
||||
if test "$found_experimental_filesystem" = "yes"
|
||||
@@ -176,7 +167,6 @@
|
||||
header is available for inclusion.])
|
||||
use_boost_filesystem=no
|
||||
fi
|
||||
-fi
|
||||
|
||||
FILESYSTEM_LIBS=''
|
||||
|
||||
|
||||
|
14
srcpkgs/DarkRadiant/patches/test.patch
Normal file
14
srcpkgs/DarkRadiant/patches/test.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
--- 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)
|
|
@ -1,21 +1,20 @@
|
|||
# Template file for 'DarkRadiant'
|
||||
pkgname=DarkRadiant
|
||||
version=2.8.0
|
||||
revision=3
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
|
||||
PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"
|
||||
hostmakedepends="automake gettext libtool pkg-config"
|
||||
version=2.10.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"
|
||||
checkdepends="boost-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=8f810016b5110308965dd1b47407a0a385903cd62974b2e53e84f8011786b0e5
|
||||
checksum=b0a15d24a1f574616a1631dca64ee69545cd21ebecdc6bf8c8afd1b69ec53f5b
|
||||
|
||||
pre_configure() {
|
||||
./autogen.sh
|
||||
do_check() {
|
||||
:
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue