Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2

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

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

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

https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628

[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**


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

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

From bcd444938148204ce06933228e1c5ba736e6d5dc 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/abaddon/files/abaddon.desktop   |  8 ++++
 srcpkgs/abaddon/patches/cmake.patch     | 14 +++++++
 srcpkgs/abaddon/template                | 53 +++++++++++++++++++++++++
 srcpkgs/devilutionX/patches/cmake.patch | 29 ++++++++++++++
 srcpkgs/devilutionX/template            | 38 +++++++++++++++---
 srcpkgs/neko/template                   | 14 +++++++
 srcpkgs/ocaml-ppxlib/template           | 24 +++++++++++
 srcpkgs/ocaml-sedlex/template           | 23 +++++++++++
 srcpkgs/ocaml-stdlib-shims/template     | 22 ++++++++++
 9 files changed, 219 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/abaddon/files/abaddon.desktop
 create mode 100644 srcpkgs/abaddon/patches/cmake.patch
 create mode 100644 srcpkgs/abaddon/template
 create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
 create mode 100644 srcpkgs/neko/template
 create mode 100644 srcpkgs/ocaml-ppxlib/template
 create mode 100644 srcpkgs/ocaml-sedlex/template
 create mode 100644 srcpkgs/ocaml-stdlib-shims/template

diff --git a/srcpkgs/abaddon/files/abaddon.desktop b/srcpkgs/abaddon/files/abaddon.desktop
new file mode 100644
index 0000000000000..7515311284c34
--- /dev/null
+++ b/srcpkgs/abaddon/files/abaddon.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=abaddon
+Type=Application
+Comment=Alternative Discord client using GTK
+Exec=/usr/bin/abaddon
+TryExec=/usr/bin/abaddon
+Icon=abaddon
+Categories=Network;InstantMessaging;
diff --git a/srcpkgs/abaddon/patches/cmake.patch b/srcpkgs/abaddon/patches/cmake.patch
new file mode 100644
index 0000000000000..c42868a25ae5c
--- /dev/null
+++ b/srcpkgs/abaddon/patches/cmake.patch
@@ -0,0 +1,14 @@
+fix cross-build
+
+--- a/CMakeLists.txt	2023-08-29 00:30:45.000000000 -0400
++++ b/CMakeLists.txt	2023-10-17 12:40:08.372798709 -0400
+@@ -212,7 +212,8 @@
+             NAMES miniaudio.h
+             HINTS subprojects
+             PATH_SUFFIXES miniaudio
+-            REQUIRED)
++            REQUIRED
++    NO_CMAKE_FIND_ROOT_PATH)
+ 
+     if (APPLE)
+         target_link_libraries(abaddon "-framework CoreFoundation")
diff --git a/srcpkgs/abaddon/template b/srcpkgs/abaddon/template
new file mode 100644
index 0000000000000..3181aeac920bb
--- /dev/null
+++ b/srcpkgs/abaddon/template
@@ -0,0 +1,53 @@
+# Template file for 'abaddon'
+pkgname=abaddon
+version=0.1.14
+revision=1
+_ixwebsocket_commit="bc765e73a31ea5372e36d1b1add036af3218cb17"
+_keychain_commit="502312f59fdc44fa1103e67f8f17cec3affb82d9"
+_miniaudio_commit="7384bde3725412523871f0fcf60efe5c47fbbfc6"
+_qrcodegen_commit="22fac31bdf81da68730c177c0e931c93234d2a30"
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="gtkmm-devel libcurl-devel sqlite-devel openssl-devel
+ json-c++ libsecret-devel libhandy1-devel opus-devel spdlog
+ libsodium-devel rnnoise-devel"
+short_desc="Alternative Discord client with voice support made with C++ and GTK3"
+maintainer="Mazin Fadl <mazen@illumed.net>"
+license="GPL-3.0-only"
+homepage="https://github.com/uowuo/abaddon"
+distfiles="https://github.com/uowuo/abaddon/archive/refs/tags/v${version}.tar.gz
+ https://github.com/machinezone/IXWebSocket/archive/${_ixwebsocket_commit}.tar.gz
+ https://github.com/hrantzsch/keychain/archive/${_keychain_commit}.tar.gz
+ https://github.com/mackron/miniaudio/archive/${_miniaudio_commit}.tar.gz
+ https://github.com/nayuki/QR-Code-generator/archive/${_qrcodegen_commit}.tar.gz"
+checksum="afb64186532aecf83929f30fa31a4ba8d0e76279db6319ed0d9912fba06d311c
+ 9dea909d05e882a540526b15fbdc9764a39deb53810eb86ad797fd8135a02275
+ 3c57d272a06419ed58068d9fe14c16807041bf9b9b372b80950b9b09d08cf441
+ 4b3648bf227f2373af773c6769f9c147e38d99edd74cd0736f4df1eff224e6c6
+ 218e3e96ded7880d05f47c668aad6541a08e63303ac4d783720389087da6f4ed"
+skip_extraction="
+ ${_ixwebsocket_commit}.tar.gz
+ ${_keychain_commit}.tar.gz
+ ${_miniaudio_commit}.tar.gz
+ ${_qrcodegen_commit}.tar.gz
+ "
+
+post_extract() {
+	vsrcextract -C subprojects/ixwebsocket ${_ixwebsocket_commit}.tar.gz
+	vsrcextract -C subprojects/keychain ${_keychain_commit}.tar.gz
+	vsrcextract -C subprojects/miniaudio ${_miniaudio_commit}.tar.gz
+	vsrcextract -C subprojects/qrcodegen ${_qrcodegen_commit}.tar.gz
+}
+
+do_install() {
+	vmkdir usr/bin
+	vmkdir usr/share/abaddon
+	vmkdir usr/share/applications
+	vcopy build/abaddon usr/bin
+	vcopy res/css usr/share/abaddon
+	vcopy res/res usr/share/abaddon
+
+	vdoc README.md
+
+	vinstall "${FILESDIR}/abaddon.desktop" 644 usr/share/applications
+}
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..178b7067f7686
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..628d053fa 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+ 
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+-  URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+-  URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++  SOURCE_DIR "${CMAKE_SOURCE_DIR}/../SDL_audiolib/"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+ 
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..c343ea890 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ 
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+-    URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+-    URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++  SOURCE_DIR "${CMAKE_SOURCE_DIR}/../simpleini/"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+ 
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..82e8230263c49 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
 # 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="${wrksrc}/simpleini"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${wrksrc}/sdl_audiolib"
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +14,33 @@ makedepends="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/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+post_extract() {
+	vsrcextract -C "${_simpleini_wrksrc}"  v${_simpleini_version}.tar.gz
+	vsrcextract -C "${_sdl_audiolib_wrksrc}"  ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+	mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }
diff --git a/srcpkgs/neko/template b/srcpkgs/neko/template
new file mode 100644
index 0000000000000..f9602a94a1119
--- /dev/null
+++ b/srcpkgs/neko/template
@@ -0,0 +1,14 @@
+# Template file for 'neko'
+pkgname=neko
+version=2.3.0
+revision=1
+build_style=cmake
+configure_args="-DSTATIC_DEPS="
+hostmakedepends="pkg-config git"
+makedepends="gc-devel openssl-devel pcre-devel zlib-devel libmariadbclient-devel apache-devel sqlite-devel mbedtls-devel gtk+-devel"
+short_desc="TODO"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://nekovm.org/"
+distfiles="https://github.com/HaxeFoundation/neko/archive/v${version//./-}.tar.gz"
+checksum=850e7e317bdaf24ed652efeff89c1cb21380ca19f20e68a296c84f6bad4ee995
diff --git a/srcpkgs/ocaml-ppxlib/template b/srcpkgs/ocaml-ppxlib/template
new file mode 100644
index 0000000000000..fbbb8ec586e78
--- /dev/null
+++ b/srcpkgs/ocaml-ppxlib/template
@@ -0,0 +1,24 @@
+# Template file for 'ocaml-ppxlib'
+pkgname=ocaml-ppxlib
+version=0.31.0
+revision=1
+build_style=gnu-makefile
+#make_install_target="findlib-install"
+hostmakedepends="dune"
+makedepends="ocaml-stdlib-shims"
+short_desc="OCaml legacy Num library for arbitrary-precision integers"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://github.com/ocaml-ppx/ppxlib"
+distfiles="https://github.com/ocaml-ppx/ppxlib/archive/refs/tags/${version}.tar.gz"
+checksum=0723f1385e7baaecb89ab43cd11f03fe36663d6e2bd54bf889d518c8b5cc5f29
+nocross=yes
+
+#pre_install() {
+#	export OCAMLFIND_DESTDIR=${DESTDIR}/usr/lib/ocaml
+#	vmkdir /usr/lib/ocaml/stublibs
+#}
+
+post_install() {
+	vlicense LICENSE.md
+}
diff --git a/srcpkgs/ocaml-sedlex/template b/srcpkgs/ocaml-sedlex/template
new file mode 100644
index 0000000000000..fbfc0c11e370d
--- /dev/null
+++ b/srcpkgs/ocaml-sedlex/template
@@ -0,0 +1,23 @@
+# Template file for 'ocaml-sedlex'
+pkgname=ocaml-sedlex
+version=3.2
+revision=1
+build_style=gnu-makefile
+#make_install_target="findlib-install"
+makedepends="ocaml dune curl"
+short_desc="OCaml legacy Num library for arbitrary-precision integers"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://github.com/ocaml-community/sedlex"
+distfiles="https://github.com/ocaml-community/sedlex/archive/refs/tags/v${version}.tar.gz"
+checksum=c8c8c89283d7c62cde1d9d70483664395636400d34e01f1982887c68c6623e9d
+#nocross=yes
+
+pre_install() {
+	export OCAMLFIND_DESTDIR=${DESTDIR}/usr/lib/ocaml
+	vmkdir /usr/lib/ocaml/stublibs
+}
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/ocaml-stdlib-shims/template b/srcpkgs/ocaml-stdlib-shims/template
new file mode 100644
index 0000000000000..f20b626038dcb
--- /dev/null
+++ b/srcpkgs/ocaml-stdlib-shims/template
@@ -0,0 +1,22 @@
+# Template file for 'ocaml-stdlib-shims'
+pkgname=ocaml-stdlib-shims
+version=0.3.0
+revision=1
+hostmakedepends="dune"
+makedepends="ocaml"
+short_desc='Shim to substitute `Pervasives` with `Stdlib` before 4.08'
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="custom: LGPL-2.1-only with OCaml-LGPL-linking-exception"
+homepage="https://github.com/ocaml/stdlib-shims/"
+distfiles="https://github.com/ocaml/stdlib-shims/archive/refs/tags/${version}.tar.gz"
+checksum=6d0386313a021146300011549180fcd4e94f7ac3c3bf021ff165f6558608f0c2
+nocross=yes
+
+do_build() {
+        dune build --display=short
+}
+
+do_install() {
+        dune install --prefix=/usr --destdir="$DESTDIR" \
+                --libdir=/usr/lib/ocaml --docdir=/usr/share/doc
+}