Switch to clang; include utf8proc as submodule

2 files changed, 15 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a5c80c382e5..2a126d37551a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = securefs
 	pkgdesc = A better transparent encryption filesystem
 	pkgver = 0.12.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/netheril96/securefs
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = cmake
 	makedepends = git
+	makedepends = python
 	depends = fuse
-	depends = gcc-libs
+	depends = clang
 	source = git+https://github.com/netheril96/securefs.git#tag=0.12.0
-	source = git+https://github.com/JuliaStrings/utf8proc.git
-	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = securefs
diff --git a/PKGBUILD b/PKGBUILD
index b66c50cf44e9..5481d1fa2135 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,27 @@
 
 pkgname=securefs
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A better transparent encryption filesystem"
 arch=('i686' 'x86_64')
 url=https://github.com/netheril96/securefs
 license=('MIT')
-depends=('fuse' 'gcc-libs')
-makedepends=('cmake' 'git')
-source=("git+${url}.git#tag=${pkgver}" "git+https://github.com/JuliaStrings/utf8proc.git")
-sha256sums=('SKIP'
-            'SKIP')
+depends=('fuse' 'clang')
+makedepends=('cmake' 'git' 'python')
+source=("git+${url}.git#tag=${pkgver}")
+sha256sums=('SKIP')
+
+prepare() {
+    cd "$pkgname"
+    git submodule init && git submodule update
+}
 
 build() {
-    mv utf8proc securefs/external/
     cd "$pkgname"
     mkdir -p build && cd build
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -Dlibdir=/usr/lib ..
+    CC=clang CXX=clang++ cmake -DCMAKE_INSTALL_PREFIX=/usr -Dlibdir=/usr/lib ..
     make
+    ctest
 }
 
 package() {