cleaned up versioning, fixed compile errors

4 files changed, 88 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43905edb61f7..7ab119d1311c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = freeablo
 	pkgdesc = Modern, FLOSS reimplementation of the Diablo 1 game engine
-	pkgver = 0.4+191+g921ac20b
-	pkgrel = 1
+	pkgver = 0.4
+	pkgrel = 2
 	url = https://freeablo.org/
 	install = freeablo.install
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
-	makedepends = git
 	depends = sdl2_image
 	depends = sdl2_mixer
 	depends = zlib
@@ -15,11 +14,11 @@ pkgbase = freeablo
 	depends = bzip2
 	depends = libgl
 	depends = qt5-base
-	source = git+https://github.com/wheybags/freeablo.git#commit=921ac20be95828460ccc184a9de11eca5c7c0519
-	source = https://github.com/wheybags/freeablo/pull/500/commits/1ec095873d725b44f4e0f5616625722de1f85dce.patch
+	source = https://github.com/wheybags/freeablo/archive/refs/tags/v0.4.tar.gz
+	source = freeablo.patch
 	source = https://github.com/wheybags/freeablo/pull/504/commits/ae952ca143aa0313b2f9018dc33f7f07047fad0a.patch
-	sha256sums = SKIP
-	sha256sums = 31d0455fb4b3ef37b6f9569990d344fa9501ca37d86ba41be1f44fbd028c576a
+	sha256sums = 322a06bebf6c522ebac1195f48962abd330050f447ea3a9ee977cd2d60b1258f
+	sha256sums = bbff90626c0dbe278b2c39553ee307a66e3a1c5645454046c687b45f0d8ef78f
 	sha256sums = a8b6601d684a0ed6697a3eedb50889645c5557911b7a137767eef830944cb469
 
 pkgname = freeablo
diff --git a/PKGBUILD b/PKGBUILD
index b49bfd570285..a0dda5416549 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,35 @@
-# Maintainer: 
+# Maintainer: Amber <amber@mail.cyborgtrees.com>
 # Contributor: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
 # Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=freeablo
-pkgver=0.4+191+g921ac20b
-pkgrel=1
+pkgver=0.4
+pkgrel=2
 pkgdesc="Modern, FLOSS reimplementation of the Diablo 1 game engine"
 arch=(x86_64)
 url="https://freeablo.org/"
 license=(GPL3)
 depends=(sdl2_image sdl2_mixer zlib enet bzip2 libgl qt5-base)
-makedepends=(cmake git)
+makedepends=(cmake)
 install=freeablo.install
-source=("git+https://github.com/wheybags/freeablo.git#commit=921ac20be95828460ccc184a9de11eca5c7c0519"
-        "https://github.com/wheybags/freeablo/pull/500/commits/1ec095873d725b44f4e0f5616625722de1f85dce.patch"
+source=("https://github.com/wheybags/freeablo/archive/refs/tags/v${pkgver}.tar.gz"
+		"freeablo.patch"
         "https://github.com/wheybags/freeablo/pull/504/commits/ae952ca143aa0313b2f9018dc33f7f07047fad0a.patch")
-sha256sums=('SKIP'
-            '31d0455fb4b3ef37b6f9569990d344fa9501ca37d86ba41be1f44fbd028c576a'
+sha256sums=('322a06bebf6c522ebac1195f48962abd330050f447ea3a9ee977cd2d60b1258f'
+            'bbff90626c0dbe278b2c39553ee307a66e3a1c5645454046c687b45f0d8ef78f'
             'a8b6601d684a0ed6697a3eedb50889645c5557911b7a137767eef830944cb469')
 
-pkgver() {
-  cd "${srcdir}/${pkgname}"
-  git describe --long --tags | sed 's/-/+/g;s/^v//'
-}
 
 prepare() {
-  cd "${srcdir}/${pkgname}"
-  mkdir -p build
-  patch -Np1 -i ../1ec095873d725b44f4e0f5616625722de1f85dce.patch
-  patch -Np1 -i ../ae952ca143aa0313b2f9018dc33f7f07047fad0a.patch
+  cd "${srcdir}"
+  patch -s -p0 < freeablo.patch
+  mkdir -p "${pkgname}-${pkgver}/build"
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 -i ../ae952ca143aa0313b2f9018dc33f7f07047fad0a.patch #fixes a libpng vuln
 }
 
 build() {
-  cd "${srcdir}/${pkgname}/build"
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
   cmake .. -Wno-dev \
     -DVIDEO_OPENGLES:BOOL=OFF \
     -DVIDEO_RPI:BOOL=OFF \
@@ -46,9 +43,13 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}/build"
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
   make DESTDIR=${pkgdir} install
   install -Dm644 ../readme.md "${pkgdir}/usr/share/doc/freeablo/readme.md"
 
-  install -D "${srcdir}/freeablo/resources/launcher/play.png" "${pkgdir}/usr/share/pixmaps/freeablo.png"
-}
+  install -D "${srcdir}/${pkgname}-${pkgver}/resources/launcher/play.png" "${pkgdir}/usr/share/pixmaps/freeablo.png"
+  cd "${pkgdir}/usr"
+  pwd
+  mkdir -p "share/${pkgname}"
+  mv resources "share/${pkgname}/"
+  }
diff --git a/freeablo.install b/freeablo.install
index badd6a878586..5aa5bbc24c6a 100644
--- a/freeablo.install
+++ b/freeablo.install
@@ -7,7 +7,7 @@ post_install() {
   echo "To launch it, use this:"
   echo "$ cd ~/.freeablo && freeablo"
 }
-
+# TODO: move to /opt and replace /usr/bin/freeable with a shell script
 post_upgrade() {
   post_install
 }
diff --git a/freeablo.patch b/freeablo.patch
new file mode 100644
index 000000000000..02ec8ccad754
--- /dev/null
+++ b/freeablo.patch
@@ -0,0 +1,60 @@
+diff --color -bur freeablo-0.4/apps/freeablo/fagui/menu/menuscreen.cpp freeablo-0.4-edit/apps/freeablo/fagui/menu/menuscreen.cpp
+--- freeablo-0.4/apps/freeablo/fagui/menu/menuscreen.cpp	2020-03-06 12:40:04.000000000 -0600
++++ freeablo-0.4-edit/apps/freeablo/fagui/menu/menuscreen.cpp	2022-04-24 14:53:15.605222217 -0500
+@@ -2,6 +2,7 @@
+ #include "../../engine/inputobserverinterface.h"
+ #include "../../farender/renderer.h"
+ #include "../menuhandler.h"
++#include <stdint.h>
+ 
+ namespace FAGui
+ {
+diff --color -bur freeablo-0.4/apps/freeablo/fagui/menu/menuscreen.h freeablo-0.4-edit/apps/freeablo/fagui/menu/menuscreen.h
+--- freeablo-0.4/apps/freeablo/fagui/menu/menuscreen.h	2020-03-06 12:40:04.000000000 -0600
++++ freeablo-0.4-edit/apps/freeablo/fagui/menu/menuscreen.h	2022-04-24 14:56:34.061338500 -0500
+@@ -2,6 +2,7 @@
+ #include <functional>
+ #include <queue>
+ #include <vector>
++#include <stdint.h>
+ 
+ struct nk_context;
+ 
+diff --color -bur freeablo-0.4/apps/freeablo/fagui/menu/pausemenuscreen.cpp freeablo-0.4-edit/apps/freeablo/fagui/menu/pausemenuscreen.cpp
+--- freeablo-0.4/apps/freeablo/fagui/menu/pausemenuscreen.cpp	2020-03-06 12:40:04.000000000 -0600
++++ freeablo-0.4-edit/apps/freeablo/fagui/menu/pausemenuscreen.cpp	2022-04-24 14:57:37.347830705 -0500
+@@ -1,3 +1,4 @@
++#include <stdint.h>
+ #include "pausemenuscreen.h"
+ #include "../../engine/enginemain.h"
+ #include "../../farender/animationplayer.h"
+diff --color -bur freeablo-0.4/apps/freeablo/farender/fontinfo.cpp freeablo-0.4-edit/apps/freeablo/farender/fontinfo.cpp
+--- freeablo-0.4/apps/freeablo/farender/fontinfo.cpp	2020-03-06 12:40:04.000000000 -0600
++++ freeablo-0.4-edit/apps/freeablo/farender/fontinfo.cpp	2022-04-24 14:41:38.360563331 -0500
+@@ -4,6 +4,7 @@
+ #include "faio/fafileobject.h"
+ #include "render/levelobjects.h"
+ #include <numeric>
++#include <string>
+ 
+ namespace FARender
+ {
+diff --color -bur freeablo-0.4/apps/freeablo/farender/fontinfo.h freeablo-0.4-edit/apps/freeablo/farender/fontinfo.h
+--- freeablo-0.4/apps/freeablo/farender/fontinfo.h	2020-03-06 12:40:04.000000000 -0600
++++ freeablo-0.4-edit/apps/freeablo/farender/fontinfo.h	2022-04-24 14:48:30.682690760 -0500
+@@ -1,6 +1,7 @@
+ #pragma once
+ #include "fa_nuklear.h"
+ #include <array>
++#include <string>
+ 
+ namespace DiabloExe
+ {
+diff --color -bur freeablo-0.4/apps/freeablo/faworld/actor/statemachine.cpp freeablo-0.4-edit/apps/freeablo/faworld/actor/statemachine.cpp
+--- freeablo-0.4/apps/freeablo/faworld/actor/statemachine.cpp	2020-03-06 12:40:04.000000000 -0600
++++ freeablo-0.4-edit/apps/freeablo/faworld/actor/statemachine.cpp	2022-04-24 14:32:32.322352759 -0500
+@@ -1,3 +1,4 @@
++#include <string>
+ #include "statemachine.h"
+ #include "../../fasavegame/gameloader.h"
+ #include "../world.h"