diff --git a/PKGBUILD b/PKGBUILD index 70950b1..6cefb61 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=jjr-nheko -pkgver=0.9.1.r86.g8d52c17f +pkgver=0.9.3.r66.g7138c7a4 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") @@ -19,27 +19,21 @@ conflicts=("nheko" "nheko-git") source=($pkgname::git+https://github.com/Nheko-Reborn/nheko.git#branch=master) md5sums=("SKIP") -prepare() { - cd "$pkgname" -} - pkgver() { cd "$pkgname" git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd "$pkgname" + rm -f "$pkgname"/cmake/FindOlm.cmake - rm -f cmake/FindOlm.cmake - - cmake -H. -Bbuild \ + cmake -B build -S "$pkgname" -Wno-dev \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DHUNTER_ENABLED=OFF \ -DBUILD_SHARED_LIBS=OFF \ -DUSE_BUNDLED_MTXCLIENT=ON \ -DUSE_BUNDLED_COEURL=ON \ -DUSE_BUNDLED_LMDBXX=ON \ - -DCMAKE_INSTALL_PREFIX=.deps/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER_LAUNCHER=sccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=sccache @@ -47,23 +41,5 @@ build() { } package() { - # Creating needed directories - install -dm755 "$pkgdir/usr/bin" - install -dm755 "$pkgdir/usr/share/pixmaps/" - install -dm755 "$pkgdir/usr/share/applications/" - - # Program - install -Dm755 "$pkgname/build/nheko" "$pkgdir/usr/bin/nheko" - - # Desktop launcher - install -Dm644 "$srcdir/$pkgname/resources/nheko-256.png" "$pkgdir/usr/share/pixmaps/nheko.png" - install -Dm644 "$srcdir/$pkgname/resources/nheko.desktop" "$pkgdir/usr/share/applications/nheko.desktop" - - # Icons - local icon_size icon_dir - for icon_size in 16 32 48 64 128 256 512; do - icon_dir="$pkgdir/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps" - install -d "$icon_dir" - install -m644 "$srcdir/$pkgname/resources/nheko-${icon_size}.png" "$icon_dir/nheko.png" - done + DESTDIR="$pkgdir" cmake --install build }