macos fixes, wownero fixes, idk what else, please help me

1 files changed, 7 insertions, 76 deletions

diff --git a/patches/wownero/0016-include-locale-only-when-targeting-WIN32.patch b/patches/wownero/0016-include-locale-only-when-targeting-WIN32.patch
index f13aad0..725e1ff 100644
--- a/patches/wownero/0016-include-locale-only-when-targeting-WIN32.patch
+++ b/patches/wownero/0016-include-locale-only-when-targeting-WIN32.patch
@@ -1,87 +1,18 @@
-From 41f67e50f34cd5d7d909a5d7ec0b1e59463261f6 Mon Sep 17 00:00:00 2001
+From 5843cb6c653a65eab3aea5956b41150b7c94cb0a Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Mon, 18 Nov 2024 10:57:37 -0500
-Subject: [PATCH] include locale only when targeting WIN32
+Subject: [PATCH 16/17] include locale only when targeting WIN32
 
 ---
- CMakeLists.txt            | 25 ++++++++++---------------
- src/wallet/api/wallet.cpp |  2 ++
- 2 files changed, 12 insertions(+), 15 deletions(-)
+ CMakeLists.txt            | 5 ++++-
+ src/wallet/api/wallet.cpp | 2 ++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 763d240fc..ec5878005 100644
+index 763d240fc..1397bb217 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -96,8 +96,7 @@ enable_language(C ASM)
- set(CMAKE_C_STANDARD 11)
- set(CMAKE_C_STANDARD_REQUIRED ON)
- set(CMAKE_C_EXTENSIONS OFF)
--set(CMAKE_CXX_STANDARD 17)
--add_definitions(-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES) # boost: no template named 'unary_function' in namespace 'std'; did you mean '__unary_function'?
-+set(CMAKE_CXX_STANDARD 14)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
- set(CMAKE_CXX_EXTENSIONS OFF)
- 
-@@ -223,9 +222,9 @@ function(forbid_undefined_symbols)
- cmake_minimum_required(VERSION 3.1)
- project(test)
- option(EXPECT_SUCCESS "" ON)
--file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/incorrect_source.cpp" "void undefined_symbol(); void symbol() { undefined_symbol(); }")
-+file(WRITE "${CMAKE_SOURCE_DIR}/incorrect_source.cpp" "void undefined_symbol(); void symbol() { undefined_symbol(); }")
- if (EXPECT_SUCCESS)
--  file(APPEND "${CMAKE_CURRENT_SOURCE_DIR}/incorrect_source.cpp" " void undefined_symbol() {}; ")
-+  file(APPEND "${CMAKE_SOURCE_DIR}/incorrect_source.cpp" " void undefined_symbol() {}; ")
- endif()
- add_library(l0 SHARED incorrect_source.cpp)
- add_library(l1 MODULE incorrect_source.cpp)
-@@ -366,14 +365,11 @@ if(NOT MANUAL_SUBMODULES)
-     endfunction ()
-     
-     message(STATUS "Checking submodules")
--    #check_submodule(external/bc-ur)
-     check_submodule(external/miniupnp)
-     check_submodule(external/rapidjson)
-     #check_submodule(external/trezor-common)
-     check_submodule(external/randomwow)
-     check_submodule(external/supercop)
--    check_submodule(external/polyseed)
--    check_submodule(external/utf8proc)
-   endif()
- endif()
- 
-@@ -391,7 +387,7 @@ else()
- endif()
- 
- list(INSERT CMAKE_MODULE_PATH 0
--  "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-+  "${CMAKE_SOURCE_DIR}/cmake")
- 
- if (NOT DEFINED ENV{DEVELOPER_LOCAL_TOOLS})
-   message(STATUS "Could not find DEVELOPER_LOCAL_TOOLS in env (not required)")
-@@ -463,7 +459,7 @@ endif()
- # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
- #   set(BSDI TRUE)
- 
--include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include external/polyseed/include external/utf8proc)
-+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
- 
- if(APPLE)
-   cmake_policy(SET CMP0042 NEW)
-@@ -711,12 +707,8 @@ include_directories(${LMDB_INCLUDE})
- include_directories(${LIBUNWIND_INCLUDE})
- link_directories(${LIBUNWIND_LIBRARY_DIRS})
- 
--if (HIDAPI_DUMMY)
--  add_definitions(-DHIDAPI_DUMMY)
--endif()
--
- # Final setup for hid
--if (HIDAPI_FOUND)
-+if (HIDAPI_FOUND) 
-   message(STATUS "Using HIDAPI include dir at ${HIDAPI_INCLUDE_DIR}")
-   add_definitions(-DHAVE_HIDAPI)
-   include_directories(${HIDAPI_INCLUDE_DIR})
-@@ -1100,7 +1092,10 @@ if(STATIC)
+@@ -1100,7 +1100,10 @@ if(STATIC)
    set(Boost_USE_STATIC_LIBS ON)
    set(Boost_USE_STATIC_RUNTIME ON)
  endif()