diff --git a/.gitignore b/.gitignore index b18b79a..dee2aa7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ dist/*.zip dist/*.deb dist/*.rpm dist/pkg/ +dist/src/ target/ .tauri/ src/target/ diff --git a/dist/.SRCINFO b/dist/.SRCINFO index 8b0fe0c..64292cc 100644 --- a/dist/.SRCINFO +++ b/dist/.SRCINFO @@ -11,12 +11,12 @@ pkgbase = wherry makedepends = patchelf depends = webkit2gtk-4.1 depends = gtk3 - depends = libsoup-3.0 + depends = libsoup3 depends = librsvg depends = libappindicator-gtk3 - depends = libdbus-1 + depends = dbus depends = openssl - source = wherry-0.1.0.tar.gz::https://github.com/loki5512344/Wherry/archive/refs/tags/v0.1.0.tar.gz + source = https://github.com/loki5512344/Wherry/archive/refs/tags/v0.1.0.tar.gz sha256sums = SKIP pkgname = wherry diff --git a/dist/PKGBUILD b/dist/PKGBUILD index a5afdc0..a3f3511 100644 --- a/dist/PKGBUILD +++ b/dist/PKGBUILD @@ -11,10 +11,10 @@ license=('GPL3') depends=( 'webkit2gtk-4.1' 'gtk3' - 'libsoup-3.0' + 'libsoup3' 'librsvg' 'libappindicator-gtk3' - 'libdbus-1' + 'dbus' 'openssl' ) makedepends=( @@ -22,22 +22,24 @@ makedepends=( 'rust' 'patchelf' ) -source=("$pkgname-$pkgver.tar.gz::https://github.com/loki5512344/Wherry/archive/refs/tags/v$pkgver.tar.gz") +source=("https://github.com/loki5512344/Wherry/archive/refs/tags/v$pkgver.tar.gz") sha256sums=('SKIP') +_repodir="Wherry-$pkgver" + prepare() { - cd "$srcdir/$pkgname-$pkgver/src" + cd "$srcdir/$_repodir/src" } build() { - cd "$srcdir/$pkgname-$pkgver/src" + cd "$srcdir/$_repodir/src" export CARGO_TARGET_DIR="$srcdir/target" - cargo build --release --frozen + cargo build --release } package() { - cd "$srcdir/$pkgname-$pkgver/src" + cd "$srcdir/$_repodir/src" install -Dm755 target/release/wherry "$pkgdir/usr/bin/wherry" install -Dm644 icons/128x128.png "$pkgdir/usr/share/pixmaps/wherry.png" - install -Dm644 dist/wherry.desktop "$pkgdir/usr/share/applications/wherry.desktop" + install -Dm644 "$srcdir/$_repodir/dist/wherry.desktop" "$pkgdir/usr/share/applications/wherry.desktop" }