From 1d0cc3a1ccb34d96156bf327b737fb5d6334007b Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sun, 28 Jun 2026 12:55:28 -0400
Subject: [PATCH 1/3] Update Corrosion version to 0.6.1

---
 external/CMakeLists.txt | 19 +++++++++++--------
 zone.xiv.umbra.yml      |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index cbb95a5..3e2c2be 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -7,14 +7,17 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 set(BUILD_SHARED_LIBS OFF)
 set(BUILD_TESTS OFF)
 
-include(FetchContent)
-FetchContent_Declare(
-        Corrosion
-        GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
-        GIT_TAG v0.5.2
-)
-
-FetchContent_MakeAvailable(Corrosion)
+find_package(Corrosion QUIET)
+if (NOT Corrosion_FOUND)
+    include(FetchContent)
+    FetchContent_Declare(
+            Corrosion
+            GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
+            GIT_TAG v0.6.1
+    )
+
+    FetchContent_MakeAvailable(Corrosion)
+endif()
 
 corrosion_import_crate(MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/Cargo.toml
         NO_DEFAULT_FEATURES
diff --git a/zone.xiv.umbra.yml b/zone.xiv.umbra.yml
index 4caac3f..e830fcd 100644
--- a/zone.xiv.umbra.yml
+++ b/zone.xiv.umbra.yml
@@ -66,8 +66,8 @@ modules:
       - /app
     sources:
       - type: archive
-        url: https://github.com/corrosion-rs/corrosion/archive/refs/tags/v0.5.2.tar.gz
-        sha256: 6bc02411e29183a896aa60c58db6819ec6cf57c08997481d0b0da9029356b529
+        url: https://github.com/corrosion-rs/corrosion/archive/refs/tags/v0.6.1.tar.gz
+        sha256: e9e95b1ee2bad52681f347993fb1a5af5cce458c5ce8a2636c9e476e4babf8e3
   - name: umbra
     buildsystem: cmake-ninja
     config-opts:

From 7b3ff59fe73f2ed7a8ae6f8e5abddd7824e186db Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sun, 28 Jun 2026 13:07:40 -0400
Subject: [PATCH 2/3] Update Rust submodules to fix linking

---
 external/libkrasis | 2 +-
 external/libphysis | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/libkrasis b/external/libkrasis
index e38a591..f101763 160000
--- a/external/libkrasis
+++ b/external/libkrasis
@@ -1 +1 @@
-Subproject commit e38a591a8ae52f0186d4a2e8b9fadafa4d197cf2
+Subproject commit f1017630acbcd2ee467a2df65fff973dcfd94139
diff --git a/external/libphysis b/external/libphysis
index 6448bc9..7cb23c6 160000
--- a/external/libphysis
+++ b/external/libphysis
@@ -1 +1 @@
-Subproject commit 6448bc9286e85943b6510eadef1dc3603d97ac54
+Subproject commit 7cb23c625776f85bee7439c18349cadf080975f3

From 37aae0f1c1298728efa3ff2eb86acfaf66b8bf93 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sun, 28 Jun 2026 13:16:35 -0400
Subject: [PATCH 3/3] Update libkrasis to fix ARM64 build

---
 external/libkrasis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/libkrasis b/external/libkrasis
index f101763..dfb517c 160000
--- a/external/libkrasis
+++ b/external/libkrasis
@@ -1 +1 @@
-Subproject commit f1017630acbcd2ee467a2df65fff973dcfd94139
+Subproject commit dfb517ce0294e6bb2a3c19a30c1bbc48a9473775