From f354f7800f6e1d9268570c7067ef7996a2c6500f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 17 Sep 2020 21:00:16 -0400
Subject: [PATCH] Switch to DFHack forks of lipzip and xlsxio, and update

libzip: upgraded to 1.7.3 (was between 1.7.1 and 1.7.2)
xlsxio: downgraded to latest release (0.2.29), which should be inconsequential: https://github.com/brechtsanders/xlsxio/compare/0.2.29...2d12a88
---
 .gitmodules    | 4 ++--
 depends/libzip | 2 +-
 depends/xlsxio | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index e24bfb707..97d01c993 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,11 +18,11 @@
 	url = ../../DFHack/jsoncpp.git
 [submodule "depends/xlsxio"]
 	path = depends/xlsxio
-	url = ../../brechtsanders/xlsxio.git
+	url = ../../DFHack/xlsxio.git
 	shallow = true
 [submodule "depends/libzip"]
 	path = depends/libzip
-	url = ../../nih-at/libzip.git
+	url = ../../DFHack/libzip.git
 	shallow = true
 [submodule "depends/libexpat"]
 	path = depends/libexpat
diff --git a/depends/libzip b/depends/libzip
index 29b881d28..66e496489 160000
--- a/depends/libzip
+++ b/depends/libzip
@@ -1 +1 @@
-Subproject commit 29b881d286f43189ff7392f609da78daa80c0606
+Subproject commit 66e496489bdae81bfda8b0088172871d8fda0032
diff --git a/depends/xlsxio b/depends/xlsxio
index 261d56815..cfd9ed517 160000
--- a/depends/xlsxio
+++ b/depends/xlsxio
@@ -1 +1 @@
-Subproject commit 261d56815b29908fc960fecb9cb3143db4b485ad
+Subproject commit cfd9ed517417000f5ffce428f2a4a7da0847c145