update archlinux package:

* disable peer stats
* remove sqlite3 as dep
* correct package name of systemd dev libs
* add fmt and spdlog as dep (fixes #1980)
* add nhlomann-json as dep so we do not have to use submodule

contrib/archlinux/PKGBUILD

@@ -1,12 +1,12 @@
 # Maintainer: jason <jason@oxen.io>
 pkgname=lokinet
 pkgver=0.9.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Anonymous, decentralized and IP based overlay network for the internet."
 arch=('x86_64' 'aarch64')
 url="https://lokinet.org"
 license=('GPL3')
-depends=('libuv' 'libsodium' 'curl' 'unbound' 'sqlite' 'jemalloc' 'libsystemd' 'zeromq')
+depends=('libuv' 'libsodium' 'curl' 'unbound' 'jemalloc' 'systemd-libs' 'zeromq' 'nlohmann-json' 'spdlog' 'fmt')
 makedepends=('git' 'cmake' 'pkgconf')
 conflicts=('lokinet-bin')
 source=("$pkgname::git+https://github.com/oxen-io/lokinet#branch=makepkg")
@@ -18,10 +18,7 @@ prepare() {
 }
 
 build() {
-    cd "$srcdir/$pkgname"
-
-    rm -rf build && mkdir build && cd build
-    cmake \
+    cmake -G "Unix Makefiles" \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_C_FLAGS="$CFLAGS" \
@@ -31,16 +28,16 @@ build() {
         -DWITH_TESTS=OFF \
         -DWITH_SYSTEMD=ON \
         -DWITH_SETCAP=OFF \
+        -DWITH_PEERSTATS_BACKEND=OFF \
         -DBUILD_LIBLOKINET=OFF \
-        ..
-    make
+        -S "$srcdir/$pkgname" -B build
+    make -C build
 }
 
 package() {
-    cd "$srcdir/$pkgname"
-    install -D -m 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-    cd build
-    make DESTDIR="$pkgdir" install
+
+    install -D -m 644 "$srcdir/$pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    make DESTDIR="$pkgdir" install -C build
 
     install -D -m 644 "$srcdir/$pkgname/contrib/archlinux/lokinet.service"                "$pkgdir/usr/lib/systemd/system/lokinet.service"
     install -D -m 644 "$srcdir/$pkgname/contrib/archlinux/lokinet-vpn@.service"           "$pkgdir/usr/lib/systemd/system/lokinet-vpn@.service"
@@ -52,4 +49,4 @@ package() {
     install -D -m 644 "$srcdir/$pkgname/contrib/systemd-resolved/lokinet.pkla"            "$pkgdir/var/lib/polkit-1/localauthority/10-vendor.d/lokinet.pkla"
     install -D -m 750 -d "$pkgdir/usr/share/polkit-1/rules.d"
     install -D -m 644 "$srcdir/$pkgname/contrib/systemd-resolved/lokinet.rules"           "$pkgdir/usr/share/polkit-1/rules.d/lokinet.rules"
-}
+}

external/CMakeLists.txt

@@ -71,6 +71,7 @@ system_or_submodule(NLOHMANN nlohmann_json nlohmann_json>=3.7.0 nlohmann)
 if (STATIC OR FORCE_SPDLOG_SUBMODULE OR FORCE_FMT_SUBMODULE)
     set(OXEN_LOGGING_FORCE_SUBMODULES ON CACHE INTERNAL "")
 endif()
+
 set(OXEN_LOGGING_SOURCE_ROOT "${PROJECT_SOURCE_DIR}" CACHE INTERNAL "")
 add_subdirectory(oxen-logging)