diff --git a/.gitignore b/.gitignore index b067d7d..64b968a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ src/ pkg/ zshell/ *.tar.zst +settings.json diff --git a/PKGBUILD b/PKGBUILD index 2423943..048e634 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,15 +7,18 @@ url='https://git.zach-dev.cc/zach/z-bar-qt' license=('GPL-3.0-only') depends=('python' 'python-pillow' 'python-materialyoucolor' 'libnotify' 'swappy' 'dart-sass' 'app2unit' 'wl-clipboard' 'dconf' 'cliphist' 'python-typer') -makedepends=('python-build' 'python-installer' 'python-hatch' 'python-hatch-vcs') -source=("$pkgname::git+$url.git#branch=main") +makedepends=('python-build' 'python-installer' 'python-hatch' 'python-hatch-vcs' 'cargo' 'rust' 'cmake' 'ninja') +source=("$pkgname::git+$url.git#branch=screenshot-tool") sha256sums=('SKIP') build() { cd "${srcdir}/${pkgname}/cli" python -m build --wheel --no-isolation - cd .. + cd "${srcdir}/${pkgname}/zshell-img-tools" + cargo build --release + + cd "${srcdir}/${pkgname}" cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/ cmake --build build } @@ -24,6 +27,10 @@ package() { cd "${srcdir}/${pkgname}/cli" python -m installer --destdir="$pkgdir" dist/*.whl - cd .. + cd "${srcdir}/${pkgname}" DESTDIR="$pkgdir" cmake --install build + + install -Dm755 \ + "${srcdir}/${pkgname}/zshell-img-tools/target/release/zshell-img-tools" \ + "${pkgdir}/usr/bin/zshell-img-tools" }