From 044d5d2aba1852100e811fe31d075bd1cf3db1c6 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 19 Jul 2025 22:47:08 +0200 Subject: hurrycurry 2.3.4 --- hurrycurry-client-git/PKGBUILD | 4 +-- hurrycurry-client-web-git/PKGBUILD | 2 +- hurrycurry-client-web/PKGBUILD | 6 ++--- hurrycurry-client/PKGBUILD | 6 ++--- hurrycurry-server-git/PKGBUILD | 2 +- hurrycurry-server/PKGBUILD | 6 ++--- hurrycurry-standalone-files-git/PKGBUILD | 17 +++++++----- hurrycurry-standalone-files/PKGBUILD | 46 ++++++++++++++++++++++++++++---- isdad-git/PKGBUILD | 2 +- isdaw-git/PKGBUILD | 4 +-- 10 files changed, 68 insertions(+), 27 deletions(-) diff --git a/hurrycurry-client-git/PKGBUILD b/hurrycurry-client-git/PKGBUILD index c83667b..811ed87 100644 --- a/hurrycurry-client-git/PKGBUILD +++ b/hurrycurry-client-git/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: metamuffin pkgname=hurrycurry-client-git -pkgver=r2237.34f6723c -pkgrel=2 +pkgver=r2276.0a930e28 +pkgrel=1 pkgdesc="A game about cooking (client)" arch=('any') url="https://codeberg.org/hurrycurry/hurrycurry" diff --git a/hurrycurry-client-web-git/PKGBUILD b/hurrycurry-client-web-git/PKGBUILD index 912e53c..3dae9ef 100644 --- a/hurrycurry-client-web-git/PKGBUILD +++ b/hurrycurry-client-web-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin pkgname=hurrycurry-client-web-git -pkgver=r2237.34f6723c +pkgver=r2276.0a930e28 pkgrel=1 pkgdesc="A game about cooking (web client)" arch=('any') diff --git a/hurrycurry-client-web/PKGBUILD b/hurrycurry-client-web/PKGBUILD index 4ff0b2f..c1fedff 100644 --- a/hurrycurry-client-web/PKGBUILD +++ b/hurrycurry-client-web/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: metamuffin pkgname=hurrycurry-client-web -pkgver=2.3.3 -pkgrel=2 +pkgver=2.3.4 +pkgrel=1 pkgdesc="A game about cooking (web client)" arch=('any') url="https://codeberg.org/hurrycurry/hurrycurry" license=('AGPL3') makedepends=('godot' 'rustup') source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/archive/v$pkgver.tar.gz") -sha256sums=('cbad7db09db129cfc79ee7464d83b29daae3ff71c4cc33432b91d317242f9ddf') +sha256sums=('060f5851038c3af2eeff20289205bf52f6ac11545d3ae3aea289c2ad8d46e8dd') build() { cd "hurrycurry" diff --git a/hurrycurry-client/PKGBUILD b/hurrycurry-client/PKGBUILD index 53d683a..a459c41 100644 --- a/hurrycurry-client/PKGBUILD +++ b/hurrycurry-client/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: metamuffin pkgname=hurrycurry-client -pkgver=2.3.3 -pkgrel=4 +pkgver=2.3.4 +pkgrel=1 pkgdesc="A game about cooking (client)" arch=('any') url="https://codeberg.org/hurrycurry/hurrycurry" @@ -12,7 +12,7 @@ makedepends=('godot' 'ffmpeg') source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/archive/v$pkgver.tar.gz" "hurrycurry-client" "hurrycurry-client.desktop") -sha256sums=('cbad7db09db129cfc79ee7464d83b29daae3ff71c4cc33432b91d317242f9ddf' +sha256sums=('060f5851038c3af2eeff20289205bf52f6ac11545d3ae3aea289c2ad8d46e8dd' '2853345b64837352f576397aac7659aa0306e03ca7de4cdd04bb64bab9c8706c' '2607233a774b1f74f10deb0ef1c594e418554c4b5701d0e700016368e6d59718') diff --git a/hurrycurry-server-git/PKGBUILD b/hurrycurry-server-git/PKGBUILD index b45dd8f..b239cca 100644 --- a/hurrycurry-server-git/PKGBUILD +++ b/hurrycurry-server-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin pkgname=hurrycurry-server-git -pkgver=r2236.e4a1afec +pkgver=r2276.0a930e28 pkgrel=1 pkgdesc="A game about cooking (server)" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') diff --git a/hurrycurry-server/PKGBUILD b/hurrycurry-server/PKGBUILD index d9152db..00de651 100644 --- a/hurrycurry-server/PKGBUILD +++ b/hurrycurry-server/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: metamuffin pkgname=hurrycurry-server -pkgver=2.3.3 -pkgrel=7 +pkgver=2.3.4 +pkgrel=1 pkgdesc="A game about cooking (server)" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') url="https://codeberg.org/hurrycurry/hurrycurry" @@ -14,7 +14,7 @@ source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/a "hurrycurry.yaml" "tmpfiles.conf" "sysusers.conf") -sha256sums=('cbad7db09db129cfc79ee7464d83b29daae3ff71c4cc33432b91d317242f9ddf' +sha256sums=('060f5851038c3af2eeff20289205bf52f6ac11545d3ae3aea289c2ad8d46e8dd' '2e10c8882ef4847586f03ac5feb469294c1b2304928f8df41db12a1d84569eb7' 'dec75b020f3a0bfc5c22f0fa013fe03d06feab608f9d4a42fb46d05dbed56844' 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' diff --git a/hurrycurry-standalone-files-git/PKGBUILD b/hurrycurry-standalone-files-git/PKGBUILD index 94d2d45..691e42c 100644 --- a/hurrycurry-standalone-files-git/PKGBUILD +++ b/hurrycurry-standalone-files-git/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: metamuffin pkgname=hurrycurry-standalone-files-git -pkgver=r2237.34f6723c -pkgrel=2 +pkgver=r2276.0a930e28 +pkgrel=1 pkgdesc="A game about cooking (standalone files (git))" arch=('any') url="https://codeberg.org/hurrycurry/hurrycurry" @@ -77,8 +77,6 @@ build() { pushd "hurrycurry" git reset --hard - sed -i "s/^const DISTRIBUTION := .*/const DISTRIBUTION := \"standalone\"/" client/global.gd - sed -i "s/^const VERSION := .*/const VERSION := \"$pkgver-$pkgrel\"/" client/global.gd make client make -C data all @@ -88,12 +86,19 @@ build() { tar --zstd -cvf ../out/data.tar.zst "${datafiles[@]}" zip ../out/data.zip "${datafiles[@]}" + sed -i "s/^const DISTRIBUTION := .*/const DISTRIBUTION := \"standalone\"/" client/global.gd + sed -i "s/^const VERSION := .*/const VERSION := \"$pkgver-$pkgrel\"/" client/global.gd + godot --headless --export-pack wasm32-unknown-unknown ../../out/client-any.pck client/project.godot godot --headless --export-release wasm32-unknown-unknown ../../out/client-wasm32-unknown-unknown.html client/project.godot for t in "${_targets[@]}"; do godot --headless --export-release "$t" "../../out/client-$t$(_target_suf "$t")" client/project.godot done + sed -i "s/^const DISTRIBUTION := .*/const DISTRIBUTION := \"windows-installer\"/" client/global.gd + godot --headless --export-release "x86_64-pc-windows-gnu" "../../out/client-windows-installer-64.exe" client/project.godot + godot --headless --export-release "i686-pc-windows-gnu" "../../out/client-windows-installer-32.exe" client/project.godot + for t in "${_targets[@]}"; do if echo "$t" | grep -q android; then echo skip "$t"; continue; fi echo build "$t" @@ -110,8 +115,8 @@ build() { make \ NSIFLAGS="-DVERSION=$pkgver-$pkgrel" \ DATA=../out/data.tar.zst \ - CLIENT_64=../out/client-x86_64-pc-windows-gnu.exe \ - CLIENT_32=../out/client-i686-pc-windows-gnu.exe \ + CLIENT_64=../out/client-windows-installer-64.exe \ + CLIENT_32=../out/client-windows-installer-32.exe \ SERVER_64=../hurrycurry/target/x86_64-pc-windows-gnu/release/hurrycurry-server.exe \ SERVER_32=../hurrycurry/target/i686-pc-windows-gnu/release/hurrycurry-server.exe \ DISCOVER_64=../hurrycurry/target/x86_64-pc-windows-gnu/release/hurrycurry-discover.exe \ diff --git a/hurrycurry-standalone-files/PKGBUILD b/hurrycurry-standalone-files/PKGBUILD index 4fa6ef8..c680e5c 100644 --- a/hurrycurry-standalone-files/PKGBUILD +++ b/hurrycurry-standalone-files/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: metamuffin pkgname=hurrycurry-standalone-files -pkgver=2.3.3 -pkgrel=2 +pkgver=2.3.4 +pkgrel=1 pkgdesc="A game about cooking (standalone files)" arch=('any') url="https://codeberg.org/hurrycurry/hurrycurry" @@ -14,12 +14,20 @@ makedepends=( 'godot' 'esbuild' 'typst' + 'nsis' 'mingw-w64-gcc' 'mingw-w64-binutils' 'lib32-rust-libs' ) -source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/archive/v$pkgver.tar.gz") -sha256sums=('cbad7db09db129cfc79ee7464d83b29daae3ff71c4cc33432b91d317242f9ddf') + +_inst_version=2.3.4 +_website_version=2.3.4 +source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/archive/v$pkgver.tar.gz" + "hurrycurry-windows-installer-$_inst_version.tar.gz::https://codeberg.org/hurrycurry/windows-installer/archive/v$_inst_version.tar.gz" + "hurrycurry-website-$_website_version.tar.gz::https://codeberg.org/hurrycurry/website/archive/v$_website_version.tar.gz") +sha256sums=('060f5851038c3af2eeff20289205bf52f6ac11545d3ae3aea289c2ad8d46e8dd' + 'd071e15ca639ea481ccd96e3585a46acc8fb5f71a8d73124a7d98ff22eb40043' + '5c63e7db9ff2fbb2f7f82ef04b63412913beb276e75b755a4c91967a390c2fea') _targets=( "x86_64-unknown-linux-gnu" @@ -65,7 +73,9 @@ build() { export CFLAGS= mkdir -p out - cd "hurrycurry" + pushd "hurrycurry" + + git reset --hard make client make -C data all @@ -75,12 +85,19 @@ build() { tar --zstd -cvf ../out/data.tar.zst "${datafiles[@]}" zip ../out/data.zip "${datafiles[@]}" + sed -i "s/^const DISTRIBUTION := .*/const DISTRIBUTION := \"standalone\"/" client/global.gd + sed -i "s/^const VERSION := .*/const VERSION := \"$pkgver-$pkgrel\"/" client/global.gd + godot --headless --export-pack wasm32-unknown-unknown ../../out/client-any.pck client/project.godot godot --headless --export-release wasm32-unknown-unknown ../../out/client-wasm32-unknown-unknown.html client/project.godot for t in "${_targets[@]}"; do godot --headless --export-release "$t" "../../out/client-$t$(_target_suf "$t")" client/project.godot done + sed -i "s/^const DISTRIBUTION := .*/const DISTRIBUTION := \"windows-installer\"/" client/global.gd + godot --headless --export-release "x86_64-pc-windows-gnu" "../../out/client-windows-installer-64.exe" client/project.godot + godot --headless --export-release "i686-pc-windows-gnu" "../../out/client-windows-installer-32.exe" client/project.godot + for t in "${_targets[@]}"; do if echo "$t" | grep -q android; then echo skip "$t"; continue; fi echo build "$t" @@ -88,6 +105,23 @@ build() { cargo build --release --target "$t" --bin hurrycurry-discover cargo build --release --target "$t" --bin hurrycurry-replaytool done + + popd + pushd windows-installer + + ln -svfT ../hurrycurry main + ln -svfT ../website website + make \ + NSIFLAGS="-DVERSION=$pkgver-$pkgrel" \ + DATA=../out/data.tar.zst \ + CLIENT_64=../out/client-windows-installer-64.exe \ + CLIENT_32=../out/client-windows-installer-32.exe \ + SERVER_64=../hurrycurry/target/x86_64-pc-windows-gnu/release/hurrycurry-server.exe \ + SERVER_32=../hurrycurry/target/i686-pc-windows-gnu/release/hurrycurry-server.exe \ + DISCOVER_64=../hurrycurry/target/x86_64-pc-windows-gnu/release/hurrycurry-discover.exe \ + DISCOVER_32=../hurrycurry/target/i686-pc-windows-gnu/release/hurrycurry-discover.exe + + popd } package() { out="$pkgdir/usr/share/hurrycurry/standalone-files" @@ -103,4 +137,6 @@ package() { install -Dvm644 "hurrycurry/target/$t/release/hurrycurry-discover$suf" "$out/discover-$t$suf" install -Dvm644 "hurrycurry/target/$t/release/hurrycurry-replaytool$suf" "$out/replaytool-$t$suf" done + install -Dvm644 "windows-installer/hurrycurry-install-x86_64.exe" "$out/windows-installer-x86_64.exe" + install -Dvm644 "windows-installer/hurrycurry-install-i686.exe" "$out/windows-installer-i686.exe" } diff --git a/isdad-git/PKGBUILD b/isdad-git/PKGBUILD index 387f2c1..21abf44 100644 --- a/isdad-git/PKGBUILD +++ b/isdad-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin pkgname=isdad-git -pkgver=r50.f1d857b +pkgver=r51.34a9a34 pkgrel=1 pkgdesc="Task queue server for isda" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') diff --git a/isdaw-git/PKGBUILD b/isdaw-git/PKGBUILD index 1a0ed11..8517629 100644 --- a/isdaw-git/PKGBUILD +++ b/isdaw-git/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: metamuffin pkgname=isdaw-git -pkgver=r50.f1d857b -pkgrel=2 +pkgver=r51.34a9a34 +pkgrel=1 pkgdesc="Worker scripts for isda" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') url="https://codeberg.org/metamuffin/isda" -- cgit v1.2.3-70-g09d2