diff options
Diffstat (limited to 'patches/wownero/0012-add-monero-submodule-support.patch')
| -rw-r--r-- | patches/wownero/0012-add-monero-submodule-support.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/patches/wownero/0012-add-monero-submodule-support.patch b/patches/wownero/0012-add-monero-submodule-support.patch new file mode 100644 index 0000000..6380cd2 --- /dev/null +++ b/patches/wownero/0012-add-monero-submodule-support.patch @@ -0,0 +1,79 @@ +From 733d8fa11a455ff144d29a6a5fad384212d1931a Mon Sep 17 00:00:00 2001 +From: cyan <cyjan@mrcyjanek.net> +Date: Thu, 7 Nov 2024 16:46:24 +0000 +Subject: [PATCH 12/16] add monero submodule support + +--- + CMakeLists.txt | 6 +++--- + cmake/CheckLinkerFlag.cmake | 2 +- + cmake/FindCcache.cmake | 2 +- + src/wallet/wallet_rpc_server.cpp | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0007b5ea9..caa1d5e33 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -223,9 +223,9 @@ function(forbid_undefined_symbols) + cmake_minimum_required(VERSION 3.5) + project(test) + option(EXPECT_SUCCESS "" ON) +-file(WRITE "${CMAKE_SOURCE_DIR}/incorrect_source.cpp" "void undefined_symbol(); void symbol() { undefined_symbol(); }") ++file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/incorrect_source.cpp" "void undefined_symbol(); void symbol() { undefined_symbol(); }") + if (EXPECT_SUCCESS) +- file(APPEND "${CMAKE_SOURCE_DIR}/incorrect_source.cpp" " void undefined_symbol() {}; ") ++ file(APPEND "${CMAKE_CURRENT_SOURCE_DIR}/incorrect_source.cpp" " void undefined_symbol() {}; ") + endif() + add_library(l0 SHARED incorrect_source.cpp) + add_library(l1 MODULE incorrect_source.cpp) +@@ -391,7 +391,7 @@ else() + endif() + + list(INSERT CMAKE_MODULE_PATH 0 +- "${CMAKE_SOURCE_DIR}/cmake") ++ "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + + if (NOT DEFINED ENV{DEVELOPER_LOCAL_TOOLS}) + message(STATUS "Could not find DEVELOPER_LOCAL_TOOLS in env (not required)") +diff --git a/cmake/CheckLinkerFlag.cmake b/cmake/CheckLinkerFlag.cmake +index 69eefe810..89fb9d167 100644 +--- a/cmake/CheckLinkerFlag.cmake ++++ b/cmake/CheckLinkerFlag.cmake +@@ -6,7 +6,7 @@ macro(CHECK_LINKER_FLAG flag VARIABLE) + message(STATUS "Looking for ${flag} linker flag") + endif() + +- set(_cle_source ${monero_SOURCE_DIR}/cmake/CheckLinkerFlag.c) ++ set(_cle_source ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CheckLinkerFlag.c) + + set(saved_CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) + set(CMAKE_C_FLAGS "${flag}") +diff --git a/cmake/FindCcache.cmake b/cmake/FindCcache.cmake +index d3f5f829b..68e4851cb 100644 +--- a/cmake/FindCcache.cmake ++++ b/cmake/FindCcache.cmake +@@ -47,7 +47,7 @@ if (CCACHE_FOUND) + cmake_minimum_required(VERSION 3.5) + project(test) + option (CCACHE "") +-file(WRITE "${CMAKE_SOURCE_DIR}/test.cpp" "int main() { return 0; }") ++file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/test.cpp" "int main() { return 0; }") + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE}") + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE}") + add_executable(main test.cpp) +diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp +index d4167e8cb..f7a07ca26 100644 +--- a/src/wallet/wallet_rpc_server.cpp ++++ b/src/wallet/wallet_rpc_server.cpp +@@ -1261,7 +1261,7 @@ namespace tools + { + uint64_t mixin = m_wallet->adjust_mixin(req.ring_size ? req.ring_size - 1 : 0); + uint32_t priority = m_wallet->adjust_priority(req.priority); +- std::vector<wallet2::pending_tx> ptx_vector = m_wallet->create_transactions_2(dsts, mixin, priority, extra, req.account_index, req.subaddr_indices, req.subtract_fee_from_outputs); ++ std::vector<wallet2::pending_tx> ptx_vector = m_wallet->create_transactions_2(dsts, mixin, priority, extra, req.account_index, req.subaddr_indices, {}, req.subtract_fee_from_outputs); + + if (ptx_vector.empty()) + { +-- +2.51.0 + |