diff options
| author | cyan <cyjan@mrcyjanek.net> | 2025-04-18 00:10:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-18 00:10:47 +0200 |
| commit | 2e3405fa5729fbbdcc30eac07e83e0f572e178d9 (patch) | |
| tree | bad65570c2d9a1881c7d8c4450737cce4af8ee3b /patches | |
| parent | f3f792de0a1e39649df0ee6a161892738fce503d (diff) | |
sdk updates (#133)
* cmake: fix minimum required version
* fix: unary_function -> __unary_function
* fix it only where it's broken
* update zano to 400
* improve ci speed, update xcode
* update dockerfile, remove zano mingw
* 16.2
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/monero/0017-fix-unary_function-__unary_function.patch | 28 | ||||
| -rw-r--r-- | patches/wownero/0017-pr-9880.patch | 25 | ||||
| -rw-r--r-- | patches/wownero/0018-fix-unary_function-__unary_function.patch | 28 |
3 files changed, 81 insertions, 0 deletions
diff --git a/patches/monero/0017-fix-unary_function-__unary_function.patch b/patches/monero/0017-fix-unary_function-__unary_function.patch new file mode 100644 index 0000000..22e5275 --- /dev/null +++ b/patches/monero/0017-fix-unary_function-__unary_function.patch @@ -0,0 +1,28 @@ +From 0a3a2df040e177b5741706e0a0c76fac585f0356 Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto <cyjan@mrcyjanek.net> +Date: Thu, 10 Apr 2025 13:28:05 +0200 +Subject: [PATCH] fix: unary_function -> __unary_function + +--- + src/cryptonote_basic/cryptonote_basic_impl.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/cryptonote_basic/cryptonote_basic_impl.h b/src/cryptonote_basic/cryptonote_basic_impl.h +index b423573..a9aef7a 100644 +--- a/src/cryptonote_basic/cryptonote_basic_impl.h ++++ b/src/cryptonote_basic/cryptonote_basic_impl.h +@@ -40,7 +40,11 @@ namespace cryptonote { + /* */ + /************************************************************************/ + template<class t_array> ++#ifdef __APPLE__ ++ struct array_hasher: std::__unary_function<t_array&, std::size_t> ++#else + struct array_hasher: std::unary_function<t_array&, std::size_t> ++#endif + { + std::size_t operator()(const t_array& val) const + { +-- +2.49.0 + diff --git a/patches/wownero/0017-pr-9880.patch b/patches/wownero/0017-pr-9880.patch new file mode 100644 index 0000000..dbf604f --- /dev/null +++ b/patches/wownero/0017-pr-9880.patch @@ -0,0 +1,25 @@ +From 31ef09596a9d8d547905577823ff52d33e10a3d2 Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto <cyjan@mrcyjanek.net> +Date: Tue, 1 Apr 2025 11:30:45 +0200 +Subject: [PATCH] pr-9880 + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5938be6..1c47285 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -216,7 +216,7 @@ function(forbid_undefined_symbols) + file(MAKE_DIRECTORY "${TEST_PROJECT}") + file(WRITE "${TEST_PROJECT}/CMakeLists.txt" + [=[ +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + project(test) + option(EXPECT_SUCCESS "" ON) + file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/incorrect_source.cpp" "void undefined_symbol(); void symbol() { undefined_symbol(); }") +-- +2.49.0 + diff --git a/patches/wownero/0018-fix-unary_function-__unary_function.patch b/patches/wownero/0018-fix-unary_function-__unary_function.patch new file mode 100644 index 0000000..5fc385c --- /dev/null +++ b/patches/wownero/0018-fix-unary_function-__unary_function.patch @@ -0,0 +1,28 @@ +From e488eaa7397d388cee6e914e10d23790f005f6f7 Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto <cyjan@mrcyjanek.net> +Date: Thu, 10 Apr 2025 13:28:06 +0200 +Subject: [PATCH] fix: unary_function -> __unary_function + +--- + src/cryptonote_basic/cryptonote_basic_impl.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/cryptonote_basic/cryptonote_basic_impl.h b/src/cryptonote_basic/cryptonote_basic_impl.h +index b423573..a9aef7a 100644 +--- a/src/cryptonote_basic/cryptonote_basic_impl.h ++++ b/src/cryptonote_basic/cryptonote_basic_impl.h +@@ -40,7 +40,11 @@ namespace cryptonote { + /* */ + /************************************************************************/ + template<class t_array> ++#ifdef __APPLE__ ++ struct array_hasher: std::__unary_function<t_array&, std::size_t> ++#else + struct array_hasher: std::unary_function<t_array&, std::size_t> ++#endif + { + std::size_t operator()(const t_array& val) const + { +-- +2.49.0 + |