From 3465d5f90d2e35f5bf8f654372670d72ec395ecf Mon Sep 17 00:00:00 2001 From: Brad Date: Sun, 31 Aug 2025 15:35:18 +0100 Subject: [PATCH] fix pkgbuild - use gcc & disable lto also add and use _pkgname in many places --- PKGBUILD | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index a0f28a51ced7..e9903efc4e5c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,26 +1,28 @@ # Maintainer: yobson pkgname=deadlock-modmanager-git +_pkgname=${pkgname%-git} pkgdesc='A mod manager for the Valve game Deadlock' -pkgver=0.4.0.r3.gcf375c7 +pkgver=0.5.0.r1.gcf09652 pkgrel=1 arch=('x86_64') -url='https://github.com/Stormix/deadlock-modmanager' +url="https://github.com/Stormix/$_pkgname" license=('GPL-3.0-or-later') -makedepends=('git' 'cargo' 'cargo-tauri' 'pnpm' 'lld' 'clang') +makedepends=('git' 'cargo' 'cargo-tauri' 'pnpm' 'lld' 'gcc') depends=('webkit2gtk-4.1' 'cairo' 'gdk-pixbuf2' 'glib2' 'gtk3' 'libsoup3' 'pango' 'openssl' 'bzip2' 'hicolor-icon-theme') -source=('git+https://github.com/Stormix/deadlock-modmanager.git' 'deadlock-modmanager.desktop') +source=("git+https://github.com/Stormix/$_pkgname.git" 'deadlock-modmanager.desktop') sha256sums=('SKIP' '0e5b83e284a6a02291a6c25c56c9d7568f95f3274c6a35b8ddde4783ff3edaf4') -provides=('deadlock-modmanager') +provides=("$_pkgname") +options=('!lto') pkgver() { - cd "$srcdir/deadlock-modmanager" + cd "$srcdir/$_pkgname" git describe --tags --long --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { export RUSTUP_TOOLCHAIN=stable - cd "$srcdir/deadlock-modmanager/apps/desktop" + cd "$srcdir/$_pkgname/apps/desktop" pnpm install cd "src-tauri" @@ -29,25 +31,25 @@ prepare() { build() { export RUSTFLAGS="${RUSTFLAGS} -C link-arg=-fuse-ld=lld" - export CC=clang - export CXX=clang++ + export CC=gcc + export CXX=g++ export RUSTUP_TOOLCHAIN=stable export CARGO_TARGET_DIR=target export VITE_API_URL="https://api.deadlockmods.app" - cd "$srcdir/deadlock-modmanager/apps/desktop" - cargo tauri build --no-bundle -- --frozen + cd "$srcdir/$_pkgname/apps/desktop" + env -u RUSTFLAGS cargo tauri build --no-bundle -- --frozen } package() { - install -Dm644 "$srcdir/deadlock-modmanager.desktop" "$pkgdir/usr/share/applications/deadlock-modmanager.desktop" + install -Dm644 "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/$_pkgname.desktop" - cd "$srcdir/deadlock-modmanager/apps/desktop" + cd "$srcdir/$_pkgname/apps/desktop" - install -Dm755 "src-tauri/target/release/desktop" "$pkgdir/usr/bin/deadlock-modmanager" - install -Dm644 "src-tauri/icons/32x32.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/deadlock-modmanager.png" - install -Dm644 "src-tauri/icons/128x128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/deadlock-modmanager.png" - install -Dm644 "src-tauri/icons/128x128@2x.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/deadlock-modmanager.png" + install -Dm755 "src-tauri/target/release/desktop" "$pkgdir/usr/bin/$_pkgname" + install -Dm644 "src-tauri/icons/32x32.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/$_pkgname.png" + install -Dm644 "src-tauri/icons/128x128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/$_pkgname.png" + install -Dm644 "src-tauri/icons/128x128@2x.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/$_pkgname.png" } post_install() {