From ee35884d4b936ac4313f10576488ad7892f9dfe9 Mon Sep 17 00:00:00 2001 From: AN3223 Date: Sun, 12 Apr 2020 11:33:52 -0500 Subject: [PATCH] Cataclysm-DDA: update to 0.E. --- srcpkgs/Cataclysm-DDA/patches/lua-cmake.patch | 10 --------- srcpkgs/Cataclysm-DDA/template | 21 +++++++------------ 2 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/Cataclysm-DDA/patches/lua-cmake.patch diff --git a/srcpkgs/Cataclysm-DDA/patches/lua-cmake.patch b/srcpkgs/Cataclysm-DDA/patches/lua-cmake.patch deleted file mode 100644 index 85c4fc4be1f..00000000000 --- a/srcpkgs/Cataclysm-DDA/patches/lua-cmake.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- lua/CMakeLists.txt 2019-03-08 04:34:43.000000000 +0100 -+++ - 2019-03-23 04:29:21.852370856 +0100 -@@ -4,6 +4,7 @@ - SET(CATACLYSM_DDA_LUA_SOURCES - ${CMAKE_SOURCE_DIR}/lua/class_definitions.lua - ${CMAKE_SOURCE_DIR}/lua/autoexec.lua -+ ${CMAKE_SOURCE_DIR}/lua/log.lua - ) - - # test chain diff --git a/srcpkgs/Cataclysm-DDA/template b/srcpkgs/Cataclysm-DDA/template index 527c0a4ee60..c3c2c2f8c09 100644 --- a/srcpkgs/Cataclysm-DDA/template +++ b/srcpkgs/Cataclysm-DDA/template @@ -1,22 +1,21 @@ # Template file for 'Cataclysm-DDA' pkgname=Cataclysm-DDA -version=0.D -revision=3 +version=0.E +revision=1 build_style=cmake -configure_args="-DRELEASE=1 $(vopt_bool backtrace BACKTRACE) $(vopt_bool lua LUA) - -DUSE_HOME_DIR=1 -DPREFIX=/usr" +configure_args="-DRELEASE=1 $(vopt_bool backtrace BACKTRACE) -DUSE_HOME_DIR=1 -DPREFIX=/usr" hostmakedepends="gettext pkg-config" -makedepends="$(vopt_if tiles 'SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel') freetype-devel - gettext-devel ncurses-devel $(vopt_if lua lua-devel)" -depends="Cataclysm-DDA-data" +makedepends="$(vopt_if tiles 'SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel freetype-devel') + ncurses-devel" +depends="Cataclysm-DDA-data>=${version}_${revision}" short_desc="Turn-based survival game set in a post-apocalyptic world" maintainer="John " license="CC-BY-SA-3.0, CC-BY-3.0" homepage="https://cataclysmdda.org/" distfiles="https://github.com/CleverRaven/Cataclysm-DDA/archive/${version}.tar.gz" -checksum=6cc97b3e1e466b8585e8433a6d6010931e9a073f6ec060113161b38052d82882 +checksum=b0af9a9292929e17332edcea770bca9a91f1d08ea47726d78a47e09281a42fa3 -build_options="lua tiles backtrace" +build_options="tiles backtrace" build_options_default="tiles" case $XBPS_TARGET_MACHINE in @@ -24,10 +23,6 @@ case $XBPS_TARGET_MACHINE in *) build_options_default+=" backtrace";; esac -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" lua" -fi - if [ "$build_option_tiles" ]; then subpackages="Cataclysm-DDA-tiles-data Cataclysm-DDA-tiles" post_configure() {