From 84daa4ea17a3450bb04be7a48e7dfc2a894b9a5a Mon Sep 17 00:00:00 2001
From: ptrcnull <git@ptrcnull.me>
Date: Sat, 22 Jun 2024 23:14:07 +0200
Subject: [PATCH] testing/wasmtime: upgrade to 22.0.0

---
 testing/wasmtime/APKBUILD          |  6 +--
 testing/wasmtime/system-zstd.patch | 66 +++---------------------------
 2 files changed, 9 insertions(+), 63 deletions(-)

diff --git a/testing/wasmtime/APKBUILD b/testing/wasmtime/APKBUILD
index 4ef7664e0c1..681ba225461 100644
--- a/testing/wasmtime/APKBUILD
+++ b/testing/wasmtime/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Patrycja Rosa <alpine@ptrcnull.me>
 # Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
 pkgname=wasmtime
-pkgver=18.0.3
+pkgver=22.0.0
 pkgrel=0
 pkgdesc="Fast and secure runtime for WebAssembly"
 url="https://wasmtime.dev/"
@@ -69,6 +69,6 @@ libwasmtime() {
 }
 
 sha512sums="
-de00e97c7075b6b0bf1dc7b1189512bd47cad60cae30d4885bedd070d2efabeb2fb5bf3409b49ad2713e2f8cc141186811bcb0527fc92cb4c9c278aea8713af5  wasmtime-v18.0.3-src.tar.gz
-5441687022cee3a4774052cf81aef786bfb6385f0474c13964320c529b9f82128063f088c6a6e3e3f2883b592b118f13e0dacb309697d0e8d8e2d9670e33bba7  system-zstd.patch
+a689e95e892c1488bd331b432a2f4b94c2c523c4ae1c8608028d41a5439bb4f74d43260c7fb9cc48c5ccf48525d7c00e63b410218c08fbeab364f9275968901e  wasmtime-v22.0.0-src.tar.gz
+86f5254142cbe0adb6fd573169a89bbf40d60f5690944f8b29be4d89ee714a1d7745b8e7742326507f28dbf193e0a813dec0fa095c8da1d1215e0556b7ecb9c3  system-zstd.patch
 "
diff --git a/testing/wasmtime/system-zstd.patch b/testing/wasmtime/system-zstd.patch
index 7dbdf11eebb..e15292da3a4 100644
--- a/testing/wasmtime/system-zstd.patch
+++ b/testing/wasmtime/system-zstd.patch
@@ -1,67 +1,13 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index f5a3e5e..dc23e54 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2272,6 +2272,12 @@ dependencies = [
-  "zeroize",
- ]
- 
-+[[package]]
-+name = "pkg-config"
-+version = "0.3.26"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-+
- [[package]]
- name = "plotters"
- version = "0.3.1"
-@@ -4641,18 +4647,18 @@ dependencies = [
- 
- [[package]]
- name = "zstd"
--version = "0.11.1+zstd.1.5.2"
-+version = "0.12.3+zstd.1.5.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "77a16b8414fde0414e90c612eba70985577451c4c504b99885ebed24762cb81a"
-+checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
- dependencies = [
-  "zstd-safe",
- ]
- 
- [[package]]
- name = "zstd-safe"
--version = "5.0.1+zstd.1.5.2"
-+version = "6.0.4+zstd.1.5.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7c12659121420dd6365c5c3de4901f97145b79651fb1d25814020ed2ed0585ae"
-+checksum = "7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543"
- dependencies = [
-  "libc",
-  "zstd-sys",
-@@ -4660,10 +4666,11 @@ dependencies = [
- 
- [[package]]
- name = "zstd-sys"
--version = "2.0.1+zstd.1.5.2"
-+version = "2.0.8+zstd.1.5.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
-+checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
- dependencies = [
-  "cc",
-  "libc",
-+ "pkg-config",
- ]
 diff --git a/crates/cache/Cargo.toml b/crates/cache/Cargo.toml
-index b7fb059..1d9419f 100644
+index bd6b571..442ac5c 100644
 --- a/crates/cache/Cargo.toml
 +++ b/crates/cache/Cargo.toml
-@@ -18,7 +18,7 @@ log = { workspace = true }
- serde = { version = "1.0.94", features = ["derive"] }
+@@ -21,7 +21,7 @@ serde = { workspace = true }
+ serde_derive = { workspace = true }
  sha2 = "0.10.2"
- toml = "0.5.5"
--zstd = { version = "0.11.1", default-features = false }
-+zstd = { version = "0.12", default-features = false, features = ["pkg-config"] }
+ toml = { workspace = true }
+-zstd = { version = "0.13.0", default-features = false }
++zstd = { version = "0.13.0", default-features = false, features = ["pkg-config"] }
  
  [target.'cfg(target_os = "windows")'.dependencies.windows-sys]
  workspace = true