From 233925ec754a30b179d4d508690d90b0226368b6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 31 Jan 2021 12:10:00 -0500
Subject: [PATCH 1/3] Bump to 0.47.05-alpha0, update xml

---
 CMakeLists.txt | 6 +++---
 library/xml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3de10ea2a..f17d8e6d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,9 +184,9 @@ if(NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhack
 endif()
 
 # set up versioning.
-set(DF_VERSION "0.47.04")
-set(DFHACK_RELEASE "r5")
-set(DFHACK_PRERELEASE FALSE)
+set(DF_VERSION "0.47.05")
+set(DFHACK_RELEASE "alpha0")
+set(DFHACK_PRERELEASE TRUE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 
diff --git a/library/xml b/library/xml
index be0444cc1..ee1ea04d1 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit be0444cc165a1abff053d5893dc1f780f06526b7
+Subproject commit ee1ea04d1cc0f5d80da78b7872dba8b58eab55a5

From 353b8b71f528966c275dc1d2a33ea65678292a97 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 31 Jan 2021 13:24:21 -0500
Subject: [PATCH 2/3] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index ee1ea04d1..b7222848d 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit ee1ea04d1cc0f5d80da78b7872dba8b58eab55a5
+Subproject commit b7222848dbfd4391d8acafc926303bc4f6253d24

From 06cd0c843741ab42a45c6a926f6279675e07c56e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 1 Feb 2021 23:23:19 -0500
Subject: [PATCH 3/3] Make libz.dylib optional on macOS

Thurin reports that the path specified does not exist on macOS 11.2, and DFHack links successfully without it.

CMake output from the find_package(ZLib) call in /CMakeLists.txt:
Found ZLIB: /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk/usr/lib/libz.tbd (found suitable version "1.2.11", minimum required is "1.1.2")
---
 library/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 776a7de76..fd6c1c460 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -406,7 +406,10 @@ if(APPLE)
     set(ZIP_LIBRARY /usr/lib/libz.dylib)
     target_link_libraries(dfhack ${SDL_LIBRARY})
     target_link_libraries(dfhack ${CXX_LIBRARY})
-    target_link_libraries(dfhack ${ZIP_LIBRARY})
+    if(EXISTS ${ZIP_LIBRARY})
+        # doesn't exist on macOS 11, but DFHack seems to find the right library there
+        target_link_libraries(dfhack ${ZIP_LIBRARY})
+    endif()
     target_link_libraries(dfhack ncurses)
     set_target_properties(dfhack PROPERTIES VERSION 1.0.0)
     set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0)