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

1 files changed, 33 insertions, 33 deletions

diff --git a/patches/wownero/0010-polyseed.patch b/patches/wownero/0010-polyseed.patch
index e5f3112..e7711c9 100644
--- a/patches/wownero/0010-polyseed.patch
+++ b/patches/wownero/0010-polyseed.patch
@@ -1,7 +1,7 @@
-From 43eeedec72e5e2912118a51af5457ca7d489cdbb Mon Sep 17 00:00:00 2001
+From d1e443859c1b9e6845874fc30f7958da389846b3 Mon Sep 17 00:00:00 2001
 From: tobtoht <tob@featherwallet.org>
 Date: Tue, 12 Mar 2024 09:42:37 +0100
-Subject: [PATCH 10/14] polyseed
+Subject: [PATCH 10/17] polyseed
 
 Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net>
 ---
@@ -49,7 +49,7 @@ Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net>
  create mode 100644 src/polyseed/polyseed.hpp
 
 diff --git a/.gitmodules b/.gitmodules
-index b24855d..5896766 100644
+index b24855d9b..589676649 100644
 --- a/.gitmodules
 +++ b/.gitmodules
 @@ -20,3 +20,9 @@
@@ -64,7 +64,7 @@ index b24855d..5896766 100644
 +	url = https://github.com/tevador/polyseed.git
 \ No newline at end of file
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index abe44ec..85a62ef 100644
+index abe44eca5..85a62ef7b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -372,6 +372,8 @@ if(NOT MANUAL_SUBMODULES)
@@ -86,7 +86,7 @@ index abe44ec..85a62ef 100644
  if(APPLE)
    cmake_policy(SET CMP0042 NEW)
 diff --git a/contrib/depends/hosts/darwin.mk b/contrib/depends/hosts/darwin.mk
-index 83d8303..b14ee5c 100644
+index 83d83036b..b14ee5c5b 100644
 --- a/contrib/depends/hosts/darwin.mk
 +++ b/contrib/depends/hosts/darwin.mk
 @@ -8,6 +8,8 @@ endif
@@ -99,7 +99,7 @@ index 83d8303..b14ee5c 100644
  darwin_CXXFLAGS=$(darwin_CFLAGS)
  darwin_ARFLAGS=cr
 diff --git a/contrib/depends/hosts/linux.mk b/contrib/depends/hosts/linux.mk
-index 912fdb0..b79799f 100644
+index 912fdb03c..b79799f30 100644
 --- a/contrib/depends/hosts/linux.mk
 +++ b/contrib/depends/hosts/linux.mk
 @@ -11,15 +11,15 @@ linux_debug_CXXFLAGS=$(linux_debug_CFLAGS)
@@ -123,7 +123,7 @@ index 912fdb0..b79799f 100644
  x86_64_linux_RANLIB=ranlib
  x86_64_linux_NM=nm
 diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
-index d2d1eca..8783d49 100644
+index d2d1eca85..8783d4955 100644
 --- a/contrib/depends/packages/packages.mk
 +++ b/contrib/depends/packages/packages.mk
 @@ -1,4 +1,4 @@
@@ -134,7 +134,7 @@ index d2d1eca..8783d49 100644
  ifneq ($(GITIAN),1)
 diff --git a/contrib/depends/packages/polyseed.mk b/contrib/depends/packages/polyseed.mk
 new file mode 100644
-index 0000000..0071b20
+index 000000000..0071b20f3
 --- /dev/null
 +++ b/contrib/depends/packages/polyseed.mk
 @@ -0,0 +1,28 @@
@@ -167,7 +167,7 @@ index 0000000..0071b20
 +    $(MAKE) DESTDIR=$($(package)_staging_dir) install
 +endef
 diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/sodium.mk
-index 87b3459..68a5b48 100644
+index 87b34599e..68a5b48ba 100644
 --- a/contrib/depends/packages/sodium.mk
 +++ b/contrib/depends/packages/sodium.mk
 @@ -6,7 +6,7 @@ $(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e
@@ -181,7 +181,7 @@ index 87b3459..68a5b48 100644
  
 diff --git a/contrib/depends/patches/polyseed/0001-disable-soname.patch b/contrib/depends/patches/polyseed/0001-disable-soname.patch
 new file mode 100644
-index 0000000..bd97dd3
+index 000000000..bd97dd394
 --- /dev/null
 +++ b/contrib/depends/patches/polyseed/0001-disable-soname.patch
 @@ -0,0 +1,48 @@
@@ -235,7 +235,7 @@ index 0000000..bd97dd3
 +2.39.2
 diff --git a/contrib/depends/patches/polyseed/force-static-mingw.patch b/contrib/depends/patches/polyseed/force-static-mingw.patch
 new file mode 100644
-index 0000000..f05cb2b
+index 000000000..f05cb2b6a
 --- /dev/null
 +++ b/contrib/depends/patches/polyseed/force-static-mingw.patch
 @@ -0,0 +1,23 @@
@@ -263,7 +263,7 @@ index 0000000..f05cb2b
 + #else
 +     #ifdef POLYSEED_SHARED
 diff --git a/contrib/epee/include/wipeable_string.h b/contrib/epee/include/wipeable_string.h
-index 65977cd..594e15d 100644
+index 65977cd97..594e15de4 100644
 --- a/contrib/epee/include/wipeable_string.h
 +++ b/contrib/epee/include/wipeable_string.h
 @@ -34,6 +34,7 @@
@@ -288,7 +288,7 @@ index 65977cd..594e15d 100644
    private:
      void grow(size_t sz, size_t reserved = 0);
 diff --git a/contrib/epee/src/wipeable_string.cpp b/contrib/epee/src/wipeable_string.cpp
-index b016f2f..f2f365b 100644
+index b016f2f48..f2f365b1b 100644
 --- a/contrib/epee/src/wipeable_string.cpp
 +++ b/contrib/epee/src/wipeable_string.cpp
 @@ -261,4 +261,14 @@ wipeable_string &wipeable_string::operator=(const wipeable_string &other)
@@ -307,7 +307,7 @@ index b016f2f..f2f365b 100644
 +
  }
 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 88a7bb0..95be500 100644
+index 88a7bb0b5..95be500b1 100644
 --- a/external/CMakeLists.txt
 +++ b/external/CMakeLists.txt
 @@ -73,4 +73,6 @@ add_subdirectory(db_drivers)
@@ -319,20 +319,20 @@ index 88a7bb0..95be500 100644
  add_subdirectory(randomwow EXCLUDE_FROM_ALL)
 diff --git a/external/polyseed b/external/polyseed
 new file mode 160000
-index 0000000..dfb05d8
+index 000000000..bd79f5014
 --- /dev/null
 +++ b/external/polyseed
 @@ -0,0 +1 @@
 +Subproject commit bd79f5014c331273357277ed8a3d756fb61b9fa1
 diff --git a/external/utf8proc b/external/utf8proc
 new file mode 160000
-index 0000000..3de4596
+index 000000000..3de4596fb
 --- /dev/null
 +++ b/external/utf8proc
 @@ -0,0 +1 @@
 +Subproject commit 3de4596fbe28956855df2ecb3c11c0bbc3535838
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9216bca..c043ba1 100644
+index 9216bcaa5..c043ba150 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -95,6 +95,7 @@ add_subdirectory(net)
@@ -344,7 +344,7 @@ index 9216bca..c043ba1 100644
  if(NOT IOS)
    add_subdirectory(serialization)
 diff --git a/src/cryptonote_basic/CMakeLists.txt b/src/cryptonote_basic/CMakeLists.txt
-index 1414be1..414936a 100644
+index 1414be1b2..414936a05 100644
 --- a/src/cryptonote_basic/CMakeLists.txt
 +++ b/src/cryptonote_basic/CMakeLists.txt
 @@ -71,6 +71,7 @@ target_link_libraries(cryptonote_basic
@@ -356,7 +356,7 @@ index 1414be1..414936a 100644
      ${Boost_PROGRAM_OPTIONS_LIBRARY}
      ${Boost_SERIALIZATION_LIBRARY}
 diff --git a/src/cryptonote_basic/account.cpp b/src/cryptonote_basic/account.cpp
-index 4e87d44..2d556f2 100644
+index 4e87d4477..2d556f285 100644
 --- a/src/cryptonote_basic/account.cpp
 +++ b/src/cryptonote_basic/account.cpp
 @@ -87,12 +87,16 @@ DISABLE_VS_WARNINGS(4244 4345)
@@ -409,7 +409,7 @@ index 4e87d44..2d556f2 100644
    {
      m_keys.m_account_address.m_spend_public_key = spend_public_key;
 diff --git a/src/cryptonote_basic/account.h b/src/cryptonote_basic/account.h
-index 93d1d28..1f76feb 100644
+index 93d1d28f0..1f76febce 100644
 --- a/src/cryptonote_basic/account.h
 +++ b/src/cryptonote_basic/account.h
 @@ -33,6 +33,7 @@
@@ -447,7 +447,7 @@ index 93d1d28..1f76feb 100644
      const account_keys& get_keys() const;
      std::string get_public_address_str(network_type nettype) const;
 diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
-index 8b5091a..d9151e8 100644
+index 8b5091a46..d9151e8d2 100644
 --- a/src/cryptonote_config.h
 +++ b/src/cryptonote_config.h
 @@ -219,6 +219,8 @@
@@ -461,7 +461,7 @@ index 8b5091a..d9151e8 100644
  // (1+32) + (1+1+16*32) + (1+16*32) = 1060
 diff --git a/src/polyseed/CMakeLists.txt b/src/polyseed/CMakeLists.txt
 new file mode 100644
-index 0000000..cca4eb7
+index 000000000..cca4eb746
 --- /dev/null
 +++ b/src/polyseed/CMakeLists.txt
 @@ -0,0 +1,25 @@
@@ -492,7 +492,7 @@ index 0000000..cca4eb7
 +)
 diff --git a/src/polyseed/pbkdf2.c b/src/polyseed/pbkdf2.c
 new file mode 100644
-index 0000000..1c45f47
+index 000000000..1c45f4708
 --- /dev/null
 +++ b/src/polyseed/pbkdf2.c
 @@ -0,0 +1,85 @@
@@ -584,7 +584,7 @@ index 0000000..1c45f47
 \ No newline at end of file
 diff --git a/src/polyseed/pbkdf2.h b/src/polyseed/pbkdf2.h
 new file mode 100644
-index 0000000..f6253b9
+index 000000000..f6253b9d7
 --- /dev/null
 +++ b/src/polyseed/pbkdf2.h
 @@ -0,0 +1,46 @@
@@ -637,7 +637,7 @@ index 0000000..f6253b9
 \ No newline at end of file
 diff --git a/src/polyseed/polyseed.cpp b/src/polyseed/polyseed.cpp
 new file mode 100644
-index 0000000..231a48a
+index 000000000..231a48a94
 --- /dev/null
 +++ b/src/polyseed/polyseed.cpp
 @@ -0,0 +1,182 @@
@@ -825,7 +825,7 @@ index 0000000..231a48a
 +}
 diff --git a/src/polyseed/polyseed.hpp b/src/polyseed/polyseed.hpp
 new file mode 100644
-index 0000000..2c8c777
+index 000000000..2c8c777a7
 --- /dev/null
 +++ b/src/polyseed/polyseed.hpp
 @@ -0,0 +1,167 @@
@@ -998,7 +998,7 @@ index 0000000..2c8c777
 +#endif //POLYSEED_HPP
 \ No newline at end of file
 diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
-index 375edb4..0d78536 100644
+index 375edb4f1..0d785360a 100644
 --- a/src/wallet/api/wallet.cpp
 +++ b/src/wallet/api/wallet.cpp
 @@ -728,6 +728,28 @@ bool WalletImpl::recoverFromDevice(const std::string &path, const std::string &p
@@ -1086,7 +1086,7 @@ index 375edb4..0d78536 100644
  {
      return m_wallet->get_seed_language();
 diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
-index 4e9c21e..32e1228 100644
+index 4e9c21ecb..32e12284b 100644
 --- a/src/wallet/api/wallet.h
 +++ b/src/wallet/api/wallet.h
 @@ -79,9 +79,19 @@ public:
@@ -1110,7 +1110,7 @@ index 4e9c21e..32e1228 100644
      void setSeedLanguage(const std::string &arg) override;
      // void setListener(Listener *) {}
 diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h
-index 53ec4ab..be1c370 100644
+index 53ec4abfc..be1c3704e 100644
 --- a/src/wallet/api/wallet2_api.h
 +++ b/src/wallet/api/wallet2_api.h
 @@ -709,6 +709,10 @@ struct Wallet
@@ -1153,7 +1153,7 @@ index 53ec4ab..be1c370 100644
       * \brief Closes wallet. In case operation succeeded, wallet object deleted. in case operation failed, wallet object not deleted
       * \param wallet        previously opened / created wallet instance
 diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp
-index e81b8f8..c79fe25 100644
+index e81b8f83a..c79fe25d6 100644
 --- a/src/wallet/api/wallet_manager.cpp
 +++ b/src/wallet/api/wallet_manager.cpp
 @@ -156,6 +156,15 @@ Wallet *WalletManagerImpl::createWalletFromDevice(const std::string &path,
@@ -1173,7 +1173,7 @@ index e81b8f8..c79fe25 100644
  {
      WalletImpl * wallet_ = dynamic_cast<WalletImpl*>(wallet);
 diff --git a/src/wallet/api/wallet_manager.h b/src/wallet/api/wallet_manager.h
-index a223e1d..28fcd36 100644
+index a223e1df9..28fcd36c9 100644
 --- a/src/wallet/api/wallet_manager.h
 +++ b/src/wallet/api/wallet_manager.h
 @@ -75,6 +75,16 @@ public:
@@ -1194,7 +1194,7 @@ index a223e1d..28fcd36 100644
      bool walletExists(const std::string &path) override;
      bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool no_spend_key, uint64_t kdf_rounds = 1) const override;
 diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
-index 671fa52..3e49c21 100644
+index 671fa5298..3e49c21f8 100644
 --- a/src/wallet/wallet2.cpp
 +++ b/src/wallet/wallet2.cpp
 @@ -92,6 +92,7 @@ using namespace epee;
@@ -1384,7 +1384,7 @@ index 671fa52..3e49c21 100644
    uint64_t height_min = 0;
    uint64_t height_max = get_daemon_blockchain_height(err) - 1;
 diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
-index 80ff069..c26349c 100644
+index 80ff0698d..c26349ce3 100644
 --- a/src/wallet/wallet2.h
 +++ b/src/wallet/wallet2.h
 @@ -72,6 +72,7 @@