Re: [PR PATCH] [Updated] Cataclysm-DDA: update to 0.E.

[AN3223 <AN3223@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

There is an updated pull request by AN3223 against master on the void-packages repository

https://github.com/AN3223/void-packages cataclysm
https://github.com/void-linux/void-packages/pull/20924

Cataclysm-DDA: update to 0.E.
lua-devel removed since lua support was removed in 0.E
freetype-devel now only needed with tiles build option
gettext-devel removed because it was unused
version qualifier used to fix #11088 (issue was prematurely closed)

A patch file from https://github.com/void-linux/void-packages/pull/20924.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cataclysm-20924.patch --]
[-- Type: text/x-diff, Size: 4162 bytes --]

From 6fa33cf63d44bcf22eddd714e9bb77c0d6a6f28d Mon Sep 17 00:00:00 2001
From: AN3223 <ethanr2048@gmail.com>
Date: Sun, 12 Apr 2020 11:33:52 -0500
Subject: [PATCH] Cataclysm-DDA: update to 0.E.

---
 .../Cataclysm-DDA/patches/fsigned-char.patch  | 26 +++++++++++++++++++
 srcpkgs/Cataclysm-DDA/patches/lua-cmake.patch | 10 -------
 srcpkgs/Cataclysm-DDA/template                | 21 ++++++---------
 3 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 srcpkgs/Cataclysm-DDA/patches/fsigned-char.patch
 delete mode 100644 srcpkgs/Cataclysm-DDA/patches/lua-cmake.patch

diff --git a/srcpkgs/Cataclysm-DDA/patches/fsigned-char.patch b/srcpkgs/Cataclysm-DDA/patches/fsigned-char.patch
new file mode 100644
index 00000000000..31eceff22c2
--- /dev/null
+++ b/srcpkgs/Cataclysm-DDA/patches/fsigned-char.patch
@@ -0,0 +1,26 @@
+From 4d6820b2159e3d2ed0cf365e07b093fa79932f1e Mon Sep 17 00:00:00 2001
+From: Jookia <166291@gmail.com>
+Date: Thu, 9 Apr 2020 16:08:07 +1000
+Subject: [PATCH] CMakeLists: Add -fsigned-char to mimic Makefile
+
+This fixes the build on ARM.
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index 095d6e23b20..d0f5e0cc7f3 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -240,9 +240,10 @@ ELSE()
+     IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows)
+         SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls")
+     ENDIF()
++    SET(CATA_OTHER_FLAGS "${CATA_OTHER_FLAGS} -fsigned-char")
+     # Compact the whitespace in the warning string
+     string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}")
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS} ${CATA_OTHER_FLAGS}")
+     SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
+ ENDIF()
+
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 <johnz@posteo.net>"
 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() {