[PR PATCH] 7kaa: update to 2.15.4p1.

[PR PATCH] 7kaa: update to 2.15.4p1.

[Piraty]

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

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages 7kaa-2.15.4p1
https://github.com/void-linux/void-packages/pull/24439

7kaa: update to 2.15.4p1.
@travankor 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-7kaa-2.15.4p1-24439.patch --]
[-- Type: text/x-diff, Size: 1837 bytes --]

From 2fca003eec25071ca8fc7d765bb47f267f1cf69d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 23 Aug 2020 19:28:32 +0200
Subject: [PATCH] 7kaa: update to 2.15.4p1.

---
 srcpkgs/7kaa/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/7kaa/template b/srcpkgs/7kaa/template
index ade56365ec1..31084587025 100644
--- a/srcpkgs/7kaa/template
+++ b/srcpkgs/7kaa/template
@@ -1,6 +1,7 @@
 # Template file for '7kaa'
 pkgname=7kaa
-version=2.15.4
+version=2.15.4p1
+_v_7kaa_music=2.15
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake gettext-devel pkg-config tar"
@@ -8,23 +9,24 @@ makedepends="libcurl-devel libenet-devel libopenal-devel SDL2-devel"
 depends="${pkgname}-data-${version}_${revision}"
 short_desc="Seven Kingdoms: Ancient Adversaries"
 maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-or-later, MIT"
+license="GPL-2.0-or-later"
 homepage="https://7kfans.com/"
 distfiles="https://github.com/the3dfxdude/7kaa/releases/download/v${version}/${pkgname}-${version}.tar.xz
- https://www.7kfans.com/downloads/${pkgname}-music.tar.bz2"
-checksum="ba956602b300a92d46ed7c43fae7eca1e11d5431745220d1e46c6ca8bbb10b58
- d2dc74005c628de31577fe773d2db253698e2d7a91f48e81ea092330a84f8a86"
+ https://www.7kfans.com/downloads/${pkgname}-music-${_v_7kaa_music}.tar.bz2"
+checksum="f0265c077025d77b435f1c10b8ba178bdb16329e51ab735330ebaa71a104fbf8
+ b0d767b6e25719a14f5f34a93744a8022d7bc24af66275bee54dfc788695c1c3"
 
 pre_configure() {
-	autoreconf -i
+	autoreconf -vfi
 }
 
 7kaa-data_package() {
 	archs=noarch
 	short_desc+=" - data files"
+	license="MIT"
 	pkg_install() {
 		vmove usr/share/7kaa
-		vcopy ../7kaa-music/music usr/share/7kaa
+		vcopy ../7kaa-music/MUSIC usr/share/7kaa
 		vlicense ../7kaa-music/COPYING-Music.txt
 	}
 }

Re: 7kaa: update to 2.15.4p1.

[Piraty]

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

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/24439#issuecomment-678802069

Comment:
by using the version music tarball, `/usr/share/7kaa/music/` changed to `/usr/share/7kaa/MUSIC/`

Re: [PR REVIEW] 7kaa: update to 2.15.4p1.

[travankor]

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

New review comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/24439#discussion_r476202424

Comment:
you can use `${version%.*}` instead

Re: 7kaa: update to 2.15.4p1.

[travankor]

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

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/24439#issuecomment-679825851

Comment:
lgtm

Re: [PR PATCH] [Closed]: 7kaa: update to 2.15.4p1.

[Piraty]

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

There's a closed pull request on the void-packages repository

7kaa: update to 2.15.4p1.
https://github.com/void-linux/void-packages/pull/24439

Description:
@travankor