From d5ba5231f47f5e11a2cbdf693f9d1169d5aa2362 Mon Sep 17 00:00:00 2001
From: jongough <2803240+jongough@users.noreply.github.com>
Date: Tue, 14 Jan 2025 15:43:21 +1100
Subject: [PATCH 1/6] Fix typo

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d07505..115dc79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,7 +218,7 @@ endif()
 #        "${CMAKE_BINARY_DIR}/zlib/src/zlib-build${LIBDIR}/${ZLIB}"
 #        "${CMAKE_BINARY_DIR}/${ZLIB}"
 #    BUILD_ALWAYS TRUE
-)
+#)
 ExternalProject_Add(jansson
     PREFIX ${CMAKE_BINARY_DIR}/jansson
     SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/jansson

From de350c12b73e2192e4360eed4a2dbe08d523c815 Mon Sep 17 00:00:00 2001
From: jongough <2803240+jongough@users.noreply.github.com>
Date: Tue, 14 Jan 2025 15:47:00 +1100
Subject: [PATCH 2/6] Reapply "Bugfix for macos"

This reverts commit b24f6dca167a45a3a1580ee18a8a9c1e873bc6c5.
---
 CMakeLists.txt          | 6 +++---
 cmake/fix-macos-libs.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 115dc79..9dcc119 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,9 +64,9 @@ set(LONG_DESCRIPTION
 
 set(VERSION_MAJOR "0")
 set(VERSION_MINOR "1")
-set(VERSION_PATCH "162")
-set(VERSION_TWEAK "1")
-set(VERSION_DATE "14/01/2025") # DD/MM/YYYY format
+set(VERSION_PATCH "163")
+set(VERSION_TWEAK "0")
+set(VERSION_DATE "11/12/2024") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov58")
 
 set(OCPN_API_VERSION_MAJOR "1")
diff --git a/cmake/fix-macos-libs.sh b/cmake/fix-macos-libs.sh
index 725ebb9..acac030 100755
--- a/cmake/fix-macos-libs.sh
+++ b/cmake/fix-macos-libs.sh
@@ -6,7 +6,7 @@
 
 readonly RUNTIME_PATH="@executable_path/../Frameworks/"
 
-plugin=$(find . -maxdepth 1 -name '*.dylib')
+plugin=$(find . -name '*.dylib')
 for lib in $(otool -L "$plugin" | awk ' /wx/ {print $1}'); do
     libdir=${lib%/*}
     if [ "$libdir" = "$lib" ]; then

From dc6488260fb0b438419bfe865e8345714fac1697 Mon Sep 17 00:00:00 2001
From: jongough <2803240+jongough@users.noreply.github.com>
Date: Tue, 14 Jan 2025 15:51:21 +1100
Subject: [PATCH 3/6] update to remove zlib

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dcc119..578ee6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,9 +64,9 @@ set(LONG_DESCRIPTION
 
 set(VERSION_MAJOR "0")
 set(VERSION_MINOR "1")
-set(VERSION_PATCH "163")
+set(VERSION_PATCH "164")
 set(VERSION_TWEAK "0")
-set(VERSION_DATE "11/12/2024") # DD/MM/YYYY format
+set(VERSION_DATE "14/01/2025") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov58")
 
 set(OCPN_API_VERSION_MAJOR "1")
@@ -273,7 +273,7 @@ target_link_libraries(${PACKAGE_NAME} "${CMAKE_BINARY_DIR}/${AVROLIB}")
 target_link_libraries(${PACKAGE_NAME} "${CMAKE_BINARY_DIR}/${JANSSONLIB}")
 target_link_libraries(${PACKAGE_NAME} "${CMAKE_BINARY_DIR}/${ZLIB}")
 add_dependencies(${PACKAGE_NAME} avro)
-add_dependencies(avro zlib)
+#add_dependencies(avro zlib)
 add_dependencies(avro jansson)
 add_dependencies(avro liblzma)
 

From c565773a086a038b76f479a16d9e3c1c775d34c2 Mon Sep 17 00:00:00 2001
From: jongough <2803240+jongough@users.noreply.github.com>
Date: Tue, 14 Jan 2025 17:16:28 +1100
Subject: [PATCH 4/6] Add new line

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 578ee6e..9a871c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,6 +219,7 @@ endif()
 #        "${CMAKE_BINARY_DIR}/${ZLIB}"
 #    BUILD_ALWAYS TRUE
 #)
+
 ExternalProject_Add(jansson
     PREFIX ${CMAKE_BINARY_DIR}/jansson
     SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/jansson

From 147a6a15b2b971e764e0b399be7825ce0855348c Mon Sep 17 00:00:00 2001
From: jongough <2803240+jongough@users.noreply.github.com>
Date: Tue, 14 Jan 2025 17:25:29 +1100
Subject: [PATCH 5/6] put back in zlib

---
 CMakeLists.txt | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a871c6..e0decdc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -206,20 +206,19 @@ else()
     set(AVROLIB "libavro.a")
 endif()
 
-#ExternalProject_Add(zlib
-#    PREFIX ${CMAKE_BINARY_DIR}/zlib
-#    SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/zlib
-#    CMAKE_ARGS
-#        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-#        -DCMAKE_CXX_FLAGS="-fPIC"
-#        -DCMAKE_C_FLAGS="-fPIC"
-#        -DBUILD_SHARED_LIBS=OFF
-#    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy
-#        "${CMAKE_BINARY_DIR}/zlib/src/zlib-build${LIBDIR}/${ZLIB}"
-#        "${CMAKE_BINARY_DIR}/${ZLIB}"
-#    BUILD_ALWAYS TRUE
-#)
-
+ExternalProject_Add(zlib
+    PREFIX ${CMAKE_BINARY_DIR}/zlib
+    SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/zlib
+    CMAKE_ARGS
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+        -DCMAKE_CXX_FLAGS="-fPIC"
+        -DCMAKE_C_FLAGS="-fPIC"
+        -DBUILD_SHARED_LIBS=OFF
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy
+        "${CMAKE_BINARY_DIR}/zlib/src/zlib-build${LIBDIR}/${ZLIB}"
+        "${CMAKE_BINARY_DIR}/${ZLIB}"
+    BUILD_ALWAYS TRUE
+)
 ExternalProject_Add(jansson
     PREFIX ${CMAKE_BINARY_DIR}/jansson
     SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/jansson
@@ -274,7 +273,7 @@ target_link_libraries(${PACKAGE_NAME} "${CMAKE_BINARY_DIR}/${AVROLIB}")
 target_link_libraries(${PACKAGE_NAME} "${CMAKE_BINARY_DIR}/${JANSSONLIB}")
 target_link_libraries(${PACKAGE_NAME} "${CMAKE_BINARY_DIR}/${ZLIB}")
 add_dependencies(${PACKAGE_NAME} avro)
-#add_dependencies(avro zlib)
+add_dependencies(avro zlib)
 add_dependencies(avro jansson)
 add_dependencies(avro liblzma)
 

From b858f24b528f0b36cb11fa040ea812d5adff52b9 Mon Sep 17 00:00:00 2001
From: jongough <2803240+jongough@users.noreply.github.com>
Date: Tue, 14 Jan 2025 17:33:41 +1100
Subject: [PATCH 6/6] Update submodule init

---
 ci/circleci-build-macos-universal.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/circleci-build-macos-universal.sh b/ci/circleci-build-macos-universal.sh
index 3bacba4..78057d6 100755
--- a/ci/circleci-build-macos-universal.sh
+++ b/ci/circleci-build-macos-universal.sh
@@ -16,7 +16,7 @@ set -x
 # Load local environment if it exists i. e., this is a local build
 if [ -f ~/.config/local-build.rc ]; then source ~/.config/local-build.rc; fi
 
-git submodule update --init opencpn-libs
+git submodule update --init
 
 # If applicable,  restore /usr/local from cache.
 if [[ -n "$CI" && -f /tmp/local.cache.tar ]]; then