Github messages for voidlinux
 help / color / mirror / Atom feed
From: MIvanchev <MIvanchev@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
Date: Sat, 10 Feb 2024 18:12:54 +0100	[thread overview]
Message-ID: <20240210171254.914DD2011B@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48628@inbox.vuxu.org>

[-- 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: 2600 bytes --]

From 4098802cd6d3bf311faacbb4c321c9bebc1e7cad 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 ++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..ac66f44c4ca61 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
 }

  parent reply	other threads:[~2024-02-10 17:12 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-09 15:12 [PR PATCH] " MIvanchev
2024-02-09 15:13 ` [PR PATCH] [Updated] " MIvanchev
2024-02-09 19:09 ` [PR PATCH] [Updated] [WIP] " MIvanchev
2024-02-09 19:13 ` MIvanchev
2024-02-09 19:52 ` MIvanchev
2024-02-10 10:33 ` MIvanchev
2024-02-10 10:36 ` MIvanchev
2024-02-10 10:41 ` MIvanchev
2024-02-10 10:48 ` MIvanchev
2024-02-10 10:57 ` MIvanchev
2024-02-10 16:48 ` MIvanchev
2024-02-10 17:05 ` MIvanchev
2024-02-10 17:12 ` MIvanchev [this message]
2024-02-10 17:16 ` MIvanchev
2024-02-10 17:22 ` MIvanchev
2024-02-10 17:30 ` MIvanchev
2024-02-11 10:46 ` MIvanchev
2024-02-11 10:51 ` MIvanchev
2024-02-11 11:00 ` MIvanchev
2024-02-11 11:03 ` MIvanchev
2024-02-11 11:10 ` MIvanchev
2024-02-11 11:40 ` MIvanchev
2024-02-11 11:54 ` MIvanchev
2024-02-11 11:55 ` MIvanchev
2024-02-11 11:55 ` MIvanchev
2024-02-11 12:06 ` MIvanchev
2024-02-11 18:12 ` MIvanchev
2024-02-11 18:15 ` MIvanchev
2024-02-11 18:17 ` MIvanchev
2024-02-11 18:23 ` MIvanchev
2024-02-11 18:42 ` MIvanchev
2024-02-11 18:44 ` MIvanchev
2024-02-11 18:56 ` MIvanchev
2024-02-11 19:03 ` MIvanchev
2024-02-11 19:11 ` MIvanchev
2024-02-11 19:29 ` MIvanchev
2024-02-11 19:30 ` MIvanchev
2024-02-15 14:57 ` [PR PATCH] [Updated] " MIvanchev
2024-02-15 15:02 ` MIvanchev
2024-02-15 15:07 ` MIvanchev
2024-02-15 15:10 ` MIvanchev
2024-02-15 15:13 ` MIvanchev
2024-02-15 15:15 ` [PR PATCH] [Updated] " MIvanchev
2024-02-15 15:16 ` MIvanchev
2024-02-15 15:20 ` [PR PATCH] [Updated] " MIvanchev
2024-04-08 17:32 ` MIvanchev
2024-07-08  1:51 ` github-actions
2024-07-08  9:16 ` MIvanchev
2024-08-07  3:59 ` [PR REVIEW] " classabbyamp
2024-08-07  3:59 ` classabbyamp
2024-08-07  3:59 ` classabbyamp
2024-08-07  7:26 ` MIvanchev
2024-08-07  7:27 ` MIvanchev
2024-09-26 13:34 ` [PR PATCH] [Updated] " MIvanchev
2024-09-26 14:20 ` MIvanchev
2024-09-26 14:30 ` MIvanchev
2024-09-26 16:20 ` MIvanchev
2024-09-26 16:47 ` [PR PATCH] [Updated] devilutionX: update to 1.5.3 MIvanchev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240210171254.914DD2011B@inbox.vuxu.org \
    --to=mivanchev@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).