From e4aebb1de991e103884cb3b73b0c75c1829edcea Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2

---
 srcpkgs/devilutionX/template | 38 ++++++++++++++++++++++++++++--------
 srcpkgs/simpleini/template   | 17 ++++++++++++++++
 2 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/simpleini/template

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..2ebfe3fc3fc44 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,42 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
 hostmakedepends="pkg-config"
-makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
+makedepends="simpleini SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+	vsrcextract -C "${simpleini_wrksrc}"  ${_simpleini_version}.tar.gz
+}
+
+pre_build() {
+	cd "${simpleini_wrksrc}"
+	cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+	cmake --build build
+}
+
+pre_check() {
+	mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }
diff --git a/srcpkgs/simpleini/template b/srcpkgs/simpleini/template
new file mode 100644
index 0000000000000..de7483a46e23a
--- /dev/null
+++ b/srcpkgs/simpleini/template
@@ -0,0 +1,17 @@
+# Template file for 'simpleini'
+pkgname=simpleini
+version=4.22
+revision=1
+build_style=cmake
+configure_args="-DSIMPLEINI_USE_SYSTEM_GTEST=ON"
+makedepends="gtest-devel"
+short_desc="Simple C++ API to read and write INI-style configuration files"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://github.com/brofield/simpleini"
+distfiles="https://github.com/brofield/simpleini/archive/refs/tags/v4.22.tar.gz"
+checksum=b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+
+post_install() {
+	vlicense LICENCE.txt
+}