Update to 0.18

2 files changed, 14 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0d78515ec73..b9972c545e5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
 pkgbase = diskscan
 	pkgdesc = CLI tool to scan block devices for unreadable sectors
-	pkgver = 0.17
+	pkgver = 0.18
 	pkgrel = 1
 	url = https://github.com/baruch/diskscan
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = ninja
-	makedepends = ctags
+	makedepends = cmake
 	depends = python-yaml
-	source = https://codeload.github.com/baruch/diskscan/tar.gz/0.17
-	source = patch-ninja
-	sha256sums = 92f99352d70dbfb7a806e5d706821a4b3ec2841b0ac7997c072a896e2da3a595
-	sha256sums = 2e92c4517e154d22319195f2486b4d6bfef856215ce8778dd698daa175fa9117
+	source = https://codeload.github.com/baruch/diskscan/tar.gz/0.18
+	sha256sums = af65400c3dc97c09434e885458684fc9fadcd327575f733c2dd657e94ff2e406
 
 pkgname = diskscan
 
diff --git a/PKGBUILD b/PKGBUILD
index 61ce7fef3aa3..4abc8025308f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,34 @@
 # Maintainer: jdn06 <jdn06.jdn06@outlook.fr>
 
 pkgname=diskscan
-pkgver=0.17
+pkgver=0.18
 pkgrel=1
 pkgdesc="CLI tool to scan block devices for unreadable sectors"
 arch=('i686' 'x86_64')
 url="https://github.com/baruch/diskscan"
 license=('GPL3')
 depends=('python-yaml')
-makedepends=('ninja' 'ctags')
+makedepends=('cmake')
 install=
-source=("https://codeload.github.com/baruch/$pkgname/tar.gz/$pkgver"
-	"patch-ninja")
-sha256sums=('92f99352d70dbfb7a806e5d706821a4b3ec2841b0ac7997c072a896e2da3a595' '2e92c4517e154d22319195f2486b4d6bfef856215ce8778dd698daa175fa9117')
-#sha256sums=(SKIP SKIP)
+source=("https://codeload.github.com/baruch/$pkgname/tar.gz/$pkgver")
+
+sha256sums=('af65400c3dc97c09434e885458684fc9fadcd327575f733c2dd657e94ff2e406')
+#sha256sums=(SKIP)
 
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure
-	#To fix build with ninja 1.6
-	patch build.ninja ../patch-ninja
-
-	#To fix a problem with python 3
-	sed -i 's/file(filename)/open(filename)/' libscsicmd/structs/ata_struct_2_h.py
+	cmake . -DCMAKE_INSTALL_PREFIX=/usr
 }
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	ninja
+	make
 }
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
-	mkdir -p "$pkgdir/usr/bin"
-	mkdir -p "$pkgdir/usr/share/man/man1"
+#	mkdir -p "$pkgdir/usr/bin"
+#	mkdir -p "$pkgdir/usr/share/man/man1"
 
 	make DESTDIR="$pkgdir/" PREFIX="/usr" install
 }