From e41960b9062b7fb7e4acd172eb33e6c1b8acfa04 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Fri, 6 Dec 2024 09:52:53 -0600
Subject: fix patch location, update tor-connect

---
 monero_libwallet2_api_c/CMakeLists.txt             |  9 ++++++---
 ...ade-cmake-version-so-LIB_DEPENDS-shows-up.patch | 22 ----------------------
 patches/zano/0004-update-tor-connect.patch         |  2 +-
 ...ade-cmake-version-so-LIB_DEPENDS-shows-up.patch | 22 ++++++++++++++++++++++
 4 files changed, 29 insertions(+), 26 deletions(-)
 delete mode 100644 patches/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch
 create mode 100644 patches/zano/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch

diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt
index cab6f43..4252015 100644
--- a/monero_libwallet2_api_c/CMakeLists.txt
+++ b/monero_libwallet2_api_c/CMakeLists.txt
@@ -115,14 +115,14 @@ elseif(${MONERO_FLAVOR} STREQUAL "zano")
     find_package(Boost 1.71 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options)
     find_package(OpenSSL REQUIRED)
     set(WALLET_TARGETS 
-        zlibstatic
         wallet
         general
         tor-connect
         crypto
         currency_core
         common    
-        
+        zlibstatic
+
         ${Boost_LIBRARIES}
         ${OpenSSL_LIBRARIES})
 endif()
@@ -137,7 +137,10 @@ endif()
 #foreach (_variableName ${_variableNames})
 #    message(STATUS "${_variableName}=${${_variableName}}")
 #endforeach()
-# message(SEND_ERROR "${Boost_LIBRARIES}")
+#message(SEND_ERROR "${Boost_LIBRARIES}")
+#message(SEND_ERROR "${WALLET_TARGETS}
+#                        ${EXTRA_LIBS_WOWNEROSEED}
+#                        ${EXTRA_LIBS_ANDROID}")
 
 target_link_libraries(  wallet2_api_c
 
diff --git a/patches/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch b/patches/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch
deleted file mode 100644
index 0ac7e50..0000000
--- a/patches/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e6201106cd09416f96c8d83270c94565583cd356 Mon Sep 17 00:00:00 2001
-From: Czarek Nakamoto <cyjan@mrcyjanek.net>
-Date: Thu, 5 Dec 2024 09:36:34 -0600
-Subject: [PATCH] downgrade cmake version so LIB_DEPENDS shows up
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6ded9711..47d24a81 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.16)
-+cmake_minimum_required(VERSION 3.5)
- 
- PROJECT(Zano)
- 
--- 
-2.39.5 (Apple Git-154)
-
diff --git a/patches/zano/0004-update-tor-connect.patch b/patches/zano/0004-update-tor-connect.patch
index e1b7d2b..76cc59d 100644
--- a/patches/zano/0004-update-tor-connect.patch
+++ b/patches/zano/0004-update-tor-connect.patch
@@ -27,7 +27,7 @@ index b589edb1..cc445b2f 160000
 +++ b/contrib/tor-connect
 @@ -1 +1 @@
 -Subproject commit b589edb1906dccb387cfeded6ed12286c5f0405f
-+Subproject commit cc445b2f4850cb1713911f6002a869fd2853e48f
++Subproject commit cd7f0c4b583488a7fe9b50de8e533a9853b6a5c7
 -- 
 2.39.5 (Apple Git-154)
 
diff --git a/patches/zano/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch b/patches/zano/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch
new file mode 100644
index 0000000..0ac7e50
--- /dev/null
+++ b/patches/zano/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch
@@ -0,0 +1,22 @@
+From e6201106cd09416f96c8d83270c94565583cd356 Mon Sep 17 00:00:00 2001
+From: Czarek Nakamoto <cyjan@mrcyjanek.net>
+Date: Thu, 5 Dec 2024 09:36:34 -0600
+Subject: [PATCH] downgrade cmake version so LIB_DEPENDS shows up
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6ded9711..47d24a81 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.16)
++cmake_minimum_required(VERSION 3.5)
+ 
+ PROJECT(Zano)
+ 
+-- 
+2.39.5 (Apple Git-154)
+
-- 
cgit v1.2.3