Initial commit for git version

Signed-off-by: riderius <riderius.help@gmail.com>

2 files changed, 24 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8afa3e9d04f6..87e4e3b47891 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = mcmap
+pkgbase = mcmap-git
 	pkgdesc = Pixel-art map visualizer for Minecraft. Maps are drawn from an isometric perspective.
-	pkgver = 3.0.2
-	pkgrel = 4
+	pkgver = 3.0.2.r18.ga897b49
+	pkgrel = 1
 	url = https://github.com/spoutn1k/mcmap
 	arch = x86_64
 	license = GPL3
@@ -17,9 +17,10 @@ pkgbase = mcmap
 	depends = qt5-tools
 	provides = mcmap
 	provides = mcmap-gui
-	source = mcmap::git+https://github.com/spoutn1k/mcmap.git#tag=v3.0.2
+	conflicts = mcmap
+	source = mcmap-git::git+https://github.com/spoutn1k/mcmap.git
 	source = mcmap.desktop
 	sha256sums = SKIP
 	sha256sums = 67dff6174f3ef3c072560b6b2c161470d5f76a6282bf9bf6afa9d14750459714
 
-pkgname = mcmap
+pkgname = mcmap-git
diff --git a/PKGBUILD b/PKGBUILD
index 91c8308ac93c..71f07f9ac1a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,31 @@
 # Maintainer: Riderius <riderius.help@gmail.com>
 
-pkgname=mcmap
-pkgver=3.0.2
-pkgrel=4
+_pkgname=mcmap
+pkgname="${_pkgname}-git"
+pkgver=3.0.2.r18.ga897b49
+pkgrel=1
 pkgdesc="Pixel-art map visualizer for Minecraft. Maps are drawn from an isometric perspective. "
 arch=('x86_64')
-url="https://github.com/spoutn1k/${pkgname}"
+url="https://github.com/spoutn1k/${_pkgname}"
 license=('GPL3')
 depends=('zlib' 'libpng' 'spdlog' 'fmt' 'qt5-tools')
 makedepends=('git' 'gcc' 'make' 'cmake')
 checkdepends=('gtest')
+conflicts=('mcmap')
 provides=('mcmap'
           'mcmap-gui')
 CFLAGS=('${CFLAGS} -U_GLIBCXX_ASSERTIONS')
 CXXFLAGS=('${CXXFLAGS} -U_GLIBCXX_ASSERTIONS')
-source=("${pkgname}::git+https://github.com/spoutn1k/${pkgname}.git#tag=v${pkgver}"
-        "${pkgname}.desktop")
+source=("${pkgname}::git+https://github.com/spoutn1k/${_pkgname}.git"
+        "${_pkgname}.desktop")
 sha256sums=('SKIP'
             '67dff6174f3ef3c072560b6b2c161470d5f76a6282bf9bf6afa9d14750459714')
 
+pkgver() {
+    cd "$pkgname"
+    git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | cut -c2-
+}
+
 build() {
     cd "${srcdir}/${pkgname}"
     mkdir -p "${srcdir}/${pkgname}/build"
@@ -34,9 +41,9 @@ check() {
 }
 
 package() {
-    install -Dm755 "${srcdir}/${pkgname}/build/bin/mcmap" "${pkgdir}/usr/bin/mcmap"
-    install -Dm755 "${srcdir}/${pkgname}/build/bin/mcmap-gui" "${pkgdir}/usr/bin/mcmap-gui"
-    install -Dm644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-    install -Dm644 "${srcdir}/${pkgname}/src/graphical/icons/grass_block.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm755 "${srcdir}/${pkgname}/build/bin/mcmap" "${pkgdir}/usr/bin/${_pkgname}"
+    install -Dm755 "${srcdir}/${pkgname}/build/bin/mcmap-gui" "${pkgdir}/usr/bin/${_pkgname}-gui"
+    install -Dm644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+    install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+    install -Dm644 "${srcdir}/${pkgname}/src/graphical/icons/grass_block.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
 }