Update to 0.4.1 and rename harmonist-tk

0.4.0 version changed its dependency from TK to SDL 2 so I had to rename
harmonist-tk to harmonist-tiles.

3 files changed, 42 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c077b4e6f44..3575b6cdcf34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = harmonist
 	pkgdesc = A stealth coffee-break roguelike game.
-	pkgver = 0.3.0
+	pkgver = 0.4.1
 	pkgrel = 1
 	url = https://harmonist.tuxfamily.org/index.html
 	arch = x86_64
 	license = ISC
 	makedepends = go
-	depends = tk
-	source = https://download.tuxfamily.org/harmonist/releases/harmonist-0.3.0.tar.gz
-	source = harmonist-tk.desktop
-	sha256sums = 95a294ea9a3d96d81e6a137f72411cdf05e426d58b0c9b0267fceb83ff277099
-	sha256sums = 9c2fd2630d6db891b975c4ceb2eaa0be1d84af714f7506ca3df8e081f47d24f0
+	depends = sdl2
+	source = https://download.tuxfamily.org/harmonist/releases/harmonist-0.4.1.tar.gz
+	source = harmonist-tiles.desktop
+	sha256sums = 9adbef7629b408db5d33efd55368fe144da82e9b744f3d7fb4d4daf47fc54ba5
+	sha256sums = d9bc5d56e9209ae19504185f9aea92ea47d6a9009f242041f5a3be9973c37e26
 
 pkgname = harmonist
 	depends = glibc
 
-pkgname = harmonist-tk
-	pkgdesc = A stealth coffee-break roguelike game. (Graphical version)
+pkgname = harmonist-tiles
+	pkgdesc = A stealth coffee-break roguelike game. (Tiles version)
+	replaces = harmonist-tk
 
diff --git a/PKGBUILD b/PKGBUILD
index 9e1750124241..47f949aa942e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,52 @@
 # Maintainer: GalaxyLJGD <pentestian [at] airmail [dot] com>
-pkgname=('harmonist' 'harmonist-tk')
+pkgname=('harmonist' 'harmonist-tiles')
 pkgbase=harmonist
-pkgver=0.3.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="A stealth coffee-break roguelike game."
 arch=('x86_64')
 url='https://harmonist.tuxfamily.org/index.html'
 license=('ISC')
-depends=('tk')
+depends=('sdl2')
 makedepends=('go')
-source=("https://download.tuxfamily.org/harmonist/releases/harmonist-$pkgver.tar.gz"
-        'harmonist-tk.desktop')
-sha256sums=('95a294ea9a3d96d81e6a137f72411cdf05e426d58b0c9b0267fceb83ff277099'
-            '9c2fd2630d6db891b975c4ceb2eaa0be1d84af714f7506ca3df8e081f47d24f0')
+source=("https://download.tuxfamily.org/${pkgbase}/releases/${pkgbase}-${pkgver}.tar.gz"
+        "${pkgname[1]}.desktop")
+sha256sums=('9adbef7629b408db5d33efd55368fe144da82e9b744f3d7fb4d4daf47fc54ba5'
+            'd9bc5d56e9209ae19504185f9aea92ea47d6a9009f242041f5a3be9973c37e26')
 
 prepare() {
-  mkdir -p "$srcdir/harmonist-$pkgver/build"
+    mkdir -p "$srcdir/${pkgbase}-$pkgver/build"
 }
 
 build() {
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS='-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw'
-  export GOPATH="$srcdir"
+    export GO_EXTLINK_ENABLED=1
+    export CGO_CPPFLAGS="${CPPFLAGS}"
+    export CGO_CFLAGS="${CFLAGS}"
+    export CGO_CXXFLAGS="${CXXFLAGS}"
+    export CGO_LDFLAGS="${LDFLAGS}"
+    export GOFLAGS="-buildmode=pie -trimpath -ldflags=-extldflags=$LDFLAGS -mod=readonly -modcacherw"
+    export GOPATH="$srcdir"
 
-  go get github.com/nsf/{gothic,termbox-go} github.com/mattn/go-runewidth
-
-  cd "$srcdir/harmonist-$pkgver"
-  go build -o build/harmonist ./...
-  go build -o build/harmonist-tk --tags tk ./...
+    cd "$srcdir/${pkgbase}-$pkgver"
+    go build -o build/$pkgbase ./...
+    go build -o build/${pkgname[1]} --tags sdl ./...
 }
 
 package_harmonist() {
-  depends=('glibc')
-  cd "$srcdir/harmonist-$pkgver"
-  install -Dm644 harmonist.6 "$pkgdir/usr/share/man/man6/harmonist.6"
-  install -Dm755 build/harmonist "$pkgdir/usr/bin/harmonist"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    depends=('glibc')
+    cd "$srcdir/${pkgbase}-$pkgver"
+    install -Dm644 ${pkgbase}.6 "$pkgdir/usr/share/man/man6/${pkgbase}.6"
+    install -Dm755 build/$pkgbase "$pkgdir/usr/bin/$pkgbase"
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgbase/LICENSE"
 }
 
-package_harmonist-tk() {
-  pkgdesc="$pkgdesc (Graphical version)"
-  cd "$srcdir/harmonist-$pkgver"
-  install -Dm644 harmonist.6 "$pkgdir/usr/share/man/man6/harmonist-tk.6"
-  install -Dm755 build/harmonist-tk "$pkgdir/usr/bin/harmonist-tk"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm644 "$srcdir/harmonist-tk.desktop" "$pkgdir/usr/share/applications/harmonist-tk.desktop"
+package_harmonist-tiles() {
+    pkgdesc="$pkgdesc (Tiles version)"
+    replaces=('harmonist-tk')
+    cd "$srcdir/${pkgbase}-$pkgver"
+    install -Dm644 ${pkgbase}.6 "$pkgdir/usr/share/man/man6/${pkgbase}.6"
+    install -Dm755 build/${pkgname[1]} "$pkgdir/usr/bin/${pkgname[1]}"
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname[1]}/LICENSE"
+    install -Dm644 "$srcdir/${pkgname[1]}.desktop" \
+             "$pkgdir/usr/share/applications/${pkgname[1]}.desktop"
 }
diff --git a/harmonist-tk.desktop b/harmonist-tiles.desktop
index 6f2bb132a60d..5480ee087026 100644
--- a/harmonist-tk.desktop
+++ b/harmonist-tiles.desktop
@@ -4,5 +4,5 @@ Version=1.0
 Type=Application
 Name=Harmonist
 Comment=A stealth coffee-break roguelike game.
-Exec=/usr/bin/harmonist-tk
+Exec=/usr/bin/harmonist-tiles
 Categories=Game;AdventureGame