Update to ananicy-cpp v1.0.2

2 files changed, 51 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1d61f11e934..f8c15c396d25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,23 @@
 pkgbase = ananicy-cpp-nosystemd
 	pkgdesc = Ananicy rewritten in C++ for much lower CPU and memory usage.
-	pkgver = 1.0.0.rc5
-	pkgrel = 2
+	pkgver = 1.0.2
+	pkgrel = 0
 	url = https://gitlab.com/ananicy-cpp/ananicy-cpp/
 	arch = x86_64
 	arch = i386
+	arch = aarch64
 	arch = armv7h
 	license = GPLv3
 	makedepends = cmake
-	makedepends = nlohmann-json
+	makedepends = git
 	depends = fmt
 	depends = spdlog
+	depends = nlohmann-json
 	optdepends = ananicy-rules-git: community rules
 	conflicts = ananicy-cpp
-	source = https://gitlab.com/ananicy-cpp/ananicy-cpp/-/archive/v1.0.0-rc5/ananicy-cpp-v1.0.0-rc5.tar.gz
-	sha256sums = 90f4b7ddb49246db2329cfdf5727c1f2caa22285dcbc5b7cdaba6bcf2c946676
+	source = https://gitlab.com/ananicy-cpp/ananicy-cpp/-/archive/v1.0.2/ananicy-cpp-v1.0.2.tar.gz
+	source = https://gitlab.com/ananicy-cpp/stl-polyfills/std-format/-/archive/dfa4fdc87c7cb9bb1683125009baa7278bb85901/std-format-dfa4fdc87c7cb9bb1683125009baa7278bb85901.tar.gz
+	sha256sums = a809fe61e7c6b1322ebc52278ad33ea4a653721c2a42fe566fdec8f00e0bec85
+	sha256sums = a9a98ba8ff2b3f7e12f2ac75361018a9ba42f9298aa7e8f6bad3613a03591bc0
 
 pkgname = ananicy-cpp-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index 6ff495057df2..e0d5e5fa35b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,57 @@
 
 _pkgname=ananicy-cpp
 pkgname=ananicy-cpp-nosystemd
-_pkgver=1.0.0-rc5
+_pkgver=1.0.2
 pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=0
 pkgdesc="Ananicy rewritten in C++ for much lower CPU and memory usage."
 url="https://gitlab.com/ananicy-cpp/ananicy-cpp/"
 license=(GPLv3)
-source=(
-	"https://gitlab.com/ananicy-cpp/${_pkgname}/-/archive/v${_pkgver}/${_pkgname}-v${_pkgver}.tar.gz")
-sha256sums=('90f4b7ddb49246db2329cfdf5727c1f2caa22285dcbc5b7cdaba6bcf2c946676')
-arch=(x86_64 i386 armv7h)
-depends=(fmt spdlog)
-makedepends=(cmake nlohmann-json)
+source=("https://gitlab.com/ananicy-cpp/${_pkgname}/-/archive/v${_pkgver}/${_pkgname}-v${_pkgver}.tar.gz")
+sha256sums=('a809fe61e7c6b1322ebc52278ad33ea4a653721c2a42fe566fdec8f00e0bec85'
+            'a9a98ba8ff2b3f7e12f2ac75361018a9ba42f9298aa7e8f6bad3613a03591bc0')
+declare -g -A externals
+externals['std-format']="dfa4fdc87c7cb9bb1683125009baa7278bb85901"
+
+for external in "${!externals[@]}"; do
+    source+=(https://gitlab.com/ananicy-cpp/stl-polyfills/${external}/-/archive/${externals[$external]}/${external}-${externals[$external]}.tar.gz)
+done
+arch=(x86_64 i386 aarch64 armv7h)
+depends=(fmt spdlog nlohmann-json)
+makedepends=(cmake git)
 optdepends=("ananicy-rules-git: community rules")
 conflicts=(ananicy-cpp)
 
+prepare() {
+    cd "${_pkgname}-v${_pkgver}"
+
+    echo Externals: "${!externals[@]}"
+    for external in "${!externals[@]}"; do
+      [ -d "external/${external}" ] && rm -rf "external/${external}"/*
+      mv -v "../${external}-${externals[$external]}/"* external/${external}/
+    done
+
+    cmake -B "build" . \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            -DUSE_EXTERNAL_SPDLOG=ON \
+            -DUSE_EXTERNAL_JSON=ON \
+            -DUSE_EXTERNAL_FMTLIB=ON \
+            -DENABLE_SYSTEMD=OFF \
+            -DVERSION=${_pkgver}
+}
+
 build() {
-	cmake -B "build" \
-        -S "$_pkgname-v${_pkgver}" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DUSE_EXTERNAL_SPDLOG=ON \
-		-DUSE_EXTERNAL_JSON=ON \
-		-DUSE_EXTERNAL_FMTLIB=ON \
-		-DENABLE_SYSTEMD=OFF \
-		-DVERSION=${_pkgver}
-	cmake --build build
+    cd "${_pkgname}-v${_pkgver}"
+
+    cmake --build build
 }
 
 package() {
-	DESTDIR="$pkgdir" cmake --install build
+    cd "${_pkgname}-v${_pkgver}"
+
+    export DESTDIR="$pkgdir"
+    cmake --install build --component Runtime
+
+    install -m755 -d "$pkgdir/etc/ananicy.d"
 }