Initial release of package

2 files changed, 29 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97462ce10dc1..8b30d4193366 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = fstl-git
 	pkgdesc = A viewer for .stl files
-	pkgver = 0.9.3.r136.2b6185b
+	pkgver = 0.10.0
 	pkgrel = 1
 	url = http://www.mattkeeter.com/projects/fstl/
-	arch = any
+	arch = x86_64
 	license = MIT
-	makedepends = cmake
 	makedepends = icoutils
+	makedepends = cmake
 	depends = qt5-base
-	source = fstl-git::git+https://github.com/mkeeter/fstl
+	source = fstl::git+https://github.com/fstl-app/fstl.git
 	source = fstl.desktop
 	sha256sums = SKIP
-	sha256sums = 1c08b873decc3fff335b476a9c0cc9ae65af038fca5360565e4f0b8beeea202b
+	sha256sums = 53d2a7911cacc1ca8e9fe823e8ecf2777c1158f51d2b909ebb106d976c70bec5
 
 pkgname = fstl-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 993050441875..bf3e00e92ad5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,34 @@
-# Maintainer: Érico Nogueira <ericonr at disroot dot org>
-pkgname=fstl-git
-pkgver=0.9.3.r136.2b6185b
+# Maintainer: cysp74 <cysp74@gmail.com>
+
+_name=fstl
+pkgname="${_name}-git"
+pkgver=0.9.4.r27.g9da758b
 pkgrel=1
 pkgdesc="A viewer for .stl files"
 url="http://www.mattkeeter.com/projects/fstl/"
-arch=('any')
+arch=('x86_64')
 license=('MIT')
 depends=('qt5-base')
-makedepends=('cmake' 'icoutils')
-source=("$pkgname::git+https://github.com/mkeeter/fstl"
-        "fstl.desktop")
-sha256sums=('SKIP'
-            '1c08b873decc3fff335b476a9c0cc9ae65af038fca5360565e4f0b8beeea202b')
+makedepends=("icoutils" "cmake")
+source=("${_name}::git+https://github.com/fstl-app/fstl.git" "fstl.desktop")
+sha256sums=('SKIP' '53d2a7911cacc1ca8e9fe823e8ecf2777c1158f51d2b909ebb106d976c70bec5')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
-  printf "0.9.3.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	git -C "${_name}" describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
-build() {
-    cd "${srcdir}/${pkgname}"
+prepare() {
+    cd "${srcdir}/${_name}"
+    # placeholder if anything needed in future
+}
 
-    mkdir -p build
-    pushd build
-    cmake ..
-    make
-    popd
+build() {
+	cd "${srcdir}/${_name}"
+    cmake -B build \
+    	-DCMAKE_BUILD_TYPE='None' \
+    	-DCMAKE_INSTALL_PREFIX='/usr' \
+    	-Wno-dev
+    cmake --build build
 
     sed -n '/Copyright/,/PROVIDED/p' README.md > LICENSE
 
@@ -35,16 +38,12 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    pushd "build"
-    make DESTDIR="${pkgdir}" install
-    install -Dm755 fstl "${pkgdir}/usr/bin/fstl"
-    popd
+    cd "${srcdir}/${_name}"
 
-    install -D -m644 fstl.png "${pkgdir}/usr/share/pixmaps/fstl.png"
+    DESTDIR="$pkgdir" cmake --install build
 
+    install -D -m644 fstl.png "${pkgdir}/usr/share/pixmaps/fstl.png"
     install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
     install -D -m644 "${srcdir}/fstl.desktop" "${pkgdir}/usr/share/applications/fstl.desktop"
 
 }