From 18f88776e4ce5414501c66deeca9b61b2ad0e749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 5 Oct 2020 07:27:01 +0700
Subject: [PATCH] 7kaa: drop noarch

---
 srcpkgs/7kaa-data                       |  1 -
 srcpkgs/7kaa/INSTALL.msg                |  3 ---
 srcpkgs/7kaa/patches/default-data.patch | 11 +++++++++++
 srcpkgs/7kaa/template                   | 20 +++++++++-----------
 4 files changed, 20 insertions(+), 15 deletions(-)
 delete mode 120000 srcpkgs/7kaa-data
 delete mode 100644 srcpkgs/7kaa/INSTALL.msg
 create mode 100644 srcpkgs/7kaa/patches/default-data.patch

diff --git a/srcpkgs/7kaa-data b/srcpkgs/7kaa-data
deleted file mode 120000
index 162eaa7fbbd..00000000000
--- a/srcpkgs/7kaa-data
+++ /dev/null
@@ -1 +0,0 @@
-7kaa
\ No newline at end of file
diff --git a/srcpkgs/7kaa/INSTALL.msg b/srcpkgs/7kaa/INSTALL.msg
deleted file mode 100644
index c3000a1c832..00000000000
--- a/srcpkgs/7kaa/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-The game data folder is set by the environment variable SKDATA.
-Set this variable to /usr/share/7kaa, ie:
-$ SKDATA=/usr/share/7kaa 7kaa
diff --git a/srcpkgs/7kaa/patches/default-data.patch b/srcpkgs/7kaa/patches/default-data.patch
new file mode 100644
index 00000000000..51f494edc16
--- /dev/null
+++ b/srcpkgs/7kaa/patches/default-data.patch
@@ -0,0 +1,11 @@
+--- src/OSYS.cpp.orig	2020-10-09 21:04:48.099663838 +0700
++++ src/OSYS.cpp	2020-10-09 21:06:49.111299505 +0700
+@@ -2777,6 +2777,8 @@
+ 
+    // test environment variable SKDATA for the path
+    env_data_path = getenv("SKDATA");
++   if (!env_data_path)
++      env_data_path = "/usr/share/7kaa";
+    if (env_data_path)
+    {
+       chdir(env_data_path);
diff --git a/srcpkgs/7kaa/template b/srcpkgs/7kaa/template
index 0c0cb4dd4f6..7aa6e152c8f 100644
--- a/srcpkgs/7kaa/template
+++ b/srcpkgs/7kaa/template
@@ -1,12 +1,11 @@
 # Template file for '7kaa'
 pkgname=7kaa
 version=2.15.4p1
-revision=1
+revision=2
 _v_7kaa_music=${version%.*}
 build_style=gnu-configure
 hostmakedepends="autoconf automake gettext-devel pkg-config tar"
 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"
@@ -15,18 +14,17 @@ distfiles="https://github.com/the3dfxdude/7kaa/releases/download/v${version}/${p
  https://www.7kfans.com/downloads/${pkgname}-music-${_v_7kaa_music}.tar.bz2"
 checksum="f0265c077025d77b435f1c10b8ba178bdb16329e51ab735330ebaa71a104fbf8
  b0d767b6e25719a14f5f34a93744a8022d7bc24af66275bee54dfc788695c1c3"
+replaces="7kaa-data>=0"
+
+post_extract() {
+	mv ../7kaa-music .
+}
 
 pre_configure() {
 	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
-		vlicense ../7kaa-music/COPYING-Music.txt
-	}
+post_install() {
+	vcopy 7kaa-music/MUSIC usr/share/7kaa
+	vlicense 7kaa-music/COPYING-Music.txt
 }