hurrycurry 2.3.3 and standalone files package

7 files changed, 43 insertions, 24 deletions

diff --git a/hurrycurry-client-git/PKGBUILD b/hurrycurry-client-git/PKGBUILD
index 4ff5a16..38f5618 100644
--- a/hurrycurry-client-git/PKGBUILD
+++ b/hurrycurry-client-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-client-git
-pkgver=r2205.a2238fc2
+pkgver=r2216.44ca1fe3
 pkgrel=1
 pkgdesc="A game about cooking (client)"
 arch=('any')
diff --git a/hurrycurry-client-web-git/PKGBUILD b/hurrycurry-client-web-git/PKGBUILD
index 3d6851d..741411b 100644
--- a/hurrycurry-client-web-git/PKGBUILD
+++ b/hurrycurry-client-web-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-client-web-git
-pkgver=r2205.a2238fc2
+pkgver=r2216.44ca1fe3
 pkgrel=1
 pkgdesc="A game about cooking (web client)"
 arch=('any')
diff --git a/hurrycurry-client-web/PKGBUILD b/hurrycurry-client-web/PKGBUILD
index f93e7e1..6c2dfba 100644
--- a/hurrycurry-client-web/PKGBUILD
+++ b/hurrycurry-client-web/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-client-web
-pkgver=2.3.2
+pkgver=2.3.3
 pkgrel=1
 pkgdesc="A game about cooking (web client)"
 arch=('any')
@@ -9,7 +9,7 @@ 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=('28139ca81711a2d324182a7bf62783cd33d2d4872078f63cd68db382f3167cce')
+sha256sums=('cbad7db09db129cfc79ee7464d83b29daae3ff71c4cc33432b91d317242f9ddf')
 
 build() {
     cd "hurrycurry"
diff --git a/hurrycurry-client/PKGBUILD b/hurrycurry-client/PKGBUILD
index 6ac8f05..f5e38a6 100644
--- a/hurrycurry-client/PKGBUILD
+++ b/hurrycurry-client/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-client
-pkgver=2.3.2
+pkgver=2.3.3
 pkgrel=3
 pkgdesc="A game about cooking (client)"
 arch=('any')
@@ -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=('28139ca81711a2d324182a7bf62783cd33d2d4872078f63cd68db382f3167cce'
+sha256sums=('cbad7db09db129cfc79ee7464d83b29daae3ff71c4cc33432b91d317242f9ddf'
             '2853345b64837352f576397aac7659aa0306e03ca7de4cdd04bb64bab9c8706c'
             '2607233a774b1f74f10deb0ef1c594e418554c4b5701d0e700016368e6d59718')
 
diff --git a/hurrycurry-server-git/PKGBUILD b/hurrycurry-server-git/PKGBUILD
index 45a6dae..efe4e13 100644
--- a/hurrycurry-server-git/PKGBUILD
+++ b/hurrycurry-server-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-server-git
-pkgver=r2205.a2238fc2
+pkgver=r2216.44ca1fe3
 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 74fba5c..d9152db 100644
--- a/hurrycurry-server/PKGBUILD
+++ b/hurrycurry-server/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-server
-pkgver=2.3.2
+pkgver=2.3.3
 pkgrel=7
 pkgdesc="A game about cooking (server)"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -14,7 +14,7 @@ source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/a
         "hurrycurry.yaml"
         "tmpfiles.conf"
         "sysusers.conf")
-sha256sums=('28139ca81711a2d324182a7bf62783cd33d2d4872078f63cd68db382f3167cce'
+sha256sums=('cbad7db09db129cfc79ee7464d83b29daae3ff71c4cc33432b91d317242f9ddf'
             '2e10c8882ef4847586f03ac5feb469294c1b2304928f8df41db12a1d84569eb7'
             'dec75b020f3a0bfc5c22f0fa013fe03d06feab608f9d4a42fb46d05dbed56844'
             'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
diff --git a/hurrycurry-standalone-files/PKGBUILD b/hurrycurry-standalone-files/PKGBUILD
index d09dae6..d0e5ebe 100644
--- a/hurrycurry-standalone-files/PKGBUILD
+++ b/hurrycurry-standalone-files/PKGBUILD
@@ -1,27 +1,38 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-standalone-files
-pkgver=2.3.2
+pkgver=2.3.3
 pkgrel=1
 pkgdesc="A game about cooking (standalone files)"
 arch=('any')
 url="https://codeberg.org/hurrycurry/hurrycurry"
 license=('AGPL3')
-makedepends=('rustup' 'deno' 'graphviz' 'godot' 'esbuild' 'typst')
+makedepends=(
+    'rustup'
+    'deno'
+    'graphviz'
+    'godot'
+    'esbuild'
+    'typst'
+    '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=('28139ca81711a2d324182a7bf62783cd33d2d4872078f63cd68db382f3167cce')
+sha256sums=('cbad7db09db129cfc79ee7464d83b29daae3ff71c4cc33432b91d317242f9ddf')
 
-_targets=("x86_64-unknown-linux-gnu"
-    # "aarch64-unknown-linux-gnu"
+_targets=(
+    "x86_64-unknown-linux-gnu"
+    "aarch64-unknown-linux-gnu"
     # "armv7-unknown-linux-gnueabi"
-    # "i686-unknown-linux-gnu"
-    # "x86_64-pc-windows-gnu"
-    # "i686-pc-windows-gnu"
-    # "aarch64-linux-android"
-    # "armv7-linux-androideabi"
-    # "i686-linux-android"
-    # "x86_64-linux-android"
-    )
+    "i686-unknown-linux-gnu"
+    "x86_64-pc-windows-gnu"
+    "i686-pc-windows-gnu"
+    "aarch64-linux-android"
+    "armv7-linux-androideabi"
+    "i686-linux-android"
+    "x86_64-linux-android"
+)
 
 _target_suf() {
     if echo "$t" | grep -q android; then
@@ -35,13 +46,17 @@ prepare() {
     cd "hurrycurry"
     rustup default nightly
     for t in "${_targets[@]}"; do
+        rustup target add --toolchain "$(cat rust-toolchain)" "$t"
         cargo fetch --locked --target "$t"
     done
 }
 build() {
-    export GODOT_ANDROID_KEYSTORE_RELEASE_PATH="$HOME/infra/misc/hurrycurry/hurrycurry-android.keystore" # this wont work on your machine :)
+    export GODOT_ANDROID_KEYSTORE_RELEASE_PATH="$HOME/infra/misc/hurrycurry/hurrycurry.keystore" # this wont work on your machine :)
     export GODOT_ANDROID_KEYSTORE_RELEASE_USER="hurrycurry"
     export GODOT_ANDROID_KEYSTORE_RELEASE_PASSWORD="hurrycurry"
+    export CXXFLAGS=
+    export LDFLAGS=
+    export CFLAGS=
 
     mkdir -p out
     cd "hurrycurry"
@@ -61,7 +76,9 @@ build() {
     done
 
     for t in "${_targets[@]}"; do
-        local suf
+        if echo "$t" | grep -q android; then echo skip "$t"; continue; fi
+        if echo "$t" | grep -q windows; then echo skip "$t"; continue; fi
+        echo build "$t"
         cargo build --release --target "$t" --bin hurrycurry-server
         cargo build --release --target "$t" --bin hurrycurry-discover
         cargo build --release --target "$t" --bin hurrycurry-replaytool
@@ -76,6 +93,8 @@ package() {
         local suf
         suf=$(_target_suf "$t")
         install -Dvm644 "out/client-$t$suf" "$out/client-$t$suf"
+        if echo "$t" | grep -q android; then continue; fi
+        if echo "$t" | grep -q windows; then continue; fi
         install -Dvm644 "hurrycurry/target/$t/release/hurrycurry-server$suf" "$out/server-$t$suf"
         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"