From cf49e46a6d4f06d805ecedee7d206f36b597c35f Mon Sep 17 00:00:00 2001 From: loki5512344 Date: Sat, 11 Jul 2026 12:53:37 +0200 Subject: [PATCH] fix AUR PKGBUILD: add pkg-config, prepare(), fix deps --- dist/.SRCINFO | 12 ++++++++---- dist/PKGBUILD | 34 +++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dist/.SRCINFO b/dist/.SRCINFO index 64292cc..534f91d 100644 --- a/dist/.SRCINFO +++ b/dist/.SRCINFO @@ -3,19 +3,23 @@ pkgbase = wherry pkgver = 0.1.0 pkgrel = 1 url = https://github.com/loki5512344/Wherry - install = arch = x86_64 license = GPL3 makedepends = cargo - makedepends = rust + makedepends = pkg-config makedepends = patchelf - depends = webkit2gtk-4.1 + depends = gcc-libs depends = gtk3 + depends = webkit2gtk-4.1 depends = libsoup3 + depends = cairo + depends = gdk-pixbuf2 + depends = glib2 depends = librsvg + depends = openssl + depends = libssh2 depends = libappindicator-gtk3 depends = dbus - depends = openssl source = https://github.com/loki5512344/Wherry/archive/refs/tags/v0.1.0.tar.gz sha256sums = SKIP diff --git a/dist/PKGBUILD b/dist/PKGBUILD index a3f3511..2b94a3d 100644 --- a/dist/PKGBUILD +++ b/dist/PKGBUILD @@ -1,5 +1,4 @@ # Maintainer: loki5512344 -# Contributor: Your name pkgname=wherry pkgver=0.1.0 @@ -9,37 +8,42 @@ arch=('x86_64') url='https://github.com/loki5512344/Wherry' license=('GPL3') depends=( - 'webkit2gtk-4.1' + 'gcc-libs' 'gtk3' + 'webkit2gtk-4.1' 'libsoup3' + 'cairo' + 'gdk-pixbuf2' + 'glib2' 'librsvg' + 'openssl' + 'libssh2' 'libappindicator-gtk3' 'dbus' - 'openssl' -) -makedepends=( - 'cargo' - 'rust' - 'patchelf' ) +makedepends=('cargo' 'pkg-config' 'patchelf') source=("https://github.com/loki5512344/Wherry/archive/refs/tags/v$pkgver.tar.gz") sha256sums=('SKIP') _repodir="Wherry-$pkgver" prepare() { - cd "$srcdir/$_repodir/src" + cd "$srcdir/$_repodir" + export CARGO_TARGET_DIR="$srcdir/target" + cargo fetch --locked --target "$CARCH-unknown-linux-gnu" } build() { - cd "$srcdir/$_repodir/src" + cd "$srcdir/$_repodir" export CARGO_TARGET_DIR="$srcdir/target" - cargo build --release + export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER="/usr/bin/cc" + cargo build --release --frozen } package() { - 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 "$srcdir/$_repodir/dist/wherry.desktop" "$pkgdir/usr/share/applications/wherry.desktop" + cd "$srcdir/$_repodir" + install -Dm755 "$srcdir/target/release/wherry" "$pkgdir/usr/bin/wherry" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 src/icons/128x128.png "$pkgdir/usr/share/pixmaps/wherry.png" + install -Dm644 dist/wherry.desktop "$pkgdir/usr/share/applications/wherry.desktop" }