Skip to content

Commit

Permalink
Fix ios builds
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCyjaneK committed Jan 13, 2025
1 parent 7b3ada4 commit e5204e8
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 26 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7e2f4fdd645bfb344496b7ea71431e1b86fef656 Mon Sep 17 00:00:00 2001
From 6ebd4546355d3d6ed82e3d30a45ecb06310b958e Mon Sep 17 00:00:00 2001
From: j-berman <[email protected]>
Date: Thu, 13 Oct 2022 18:33:33 -0700
Subject: [PATCH 01/15] wallet: background sync with just the view key
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2c8742e5a4658bc723e8f879312ce3ab7d6539a6 Mon Sep 17 00:00:00 2001
From 4828befb3843764eaaa5e5ea489cde6d101d71ce Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <[email protected]>
Date: Wed, 23 Oct 2024 15:18:21 +0200
Subject: [PATCH 02/15] fix missing ___clear_cache when targetting iOS
Expand All @@ -8,12 +8,12 @@ Subject: [PATCH 02/15] fix missing ___clear_cache when targetting iOS
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/randomwow b/external/randomwow
index 27b099b6d..c00685dad 160000
index 27b099b6d..6f30d4b92 160000
--- a/external/randomwow
+++ b/external/randomwow
@@ -1 +1 @@
-Subproject commit 27b099b6dd6fef6e17f58c6dfe00009e9c5df587
+Subproject commit c00685dad575137caf4a9100ba08e77be376fa98
+Subproject commit 6f30d4b924fecb231e5b683915cc75d18b3b5866
--
2.48.0

2 changes: 1 addition & 1 deletion patches/wownero/0003-fix-is_trivially_copyable.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f74520269181ae435ca7d724a0fbcb73290e2609 Mon Sep 17 00:00:00 2001
From d4d406961073b5f9d3cc46a6cedaf73a378e1ea6 Mon Sep 17 00:00:00 2001
From: cyan <[email protected]>
Date: Tue, 22 Oct 2024 10:23:18 +0000
Subject: [PATCH 03/15] fix is_trivially_copyable
Expand Down
12 changes: 2 additions & 10 deletions patches/wownero/0004-store-crash-fix.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a7593f9adebe1a2e97c30885fbac11fd3402337e Mon Sep 17 00:00:00 2001
From 799d1825696483da743ff2f92a773fcfbef08557 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <[email protected]>
Date: Sat, 11 May 2024 16:25:10 +0200
Subject: [PATCH 04/15] store crash fix
Expand Down Expand Up @@ -36,20 +36,12 @@ would just wait for it to finish before actually storing).
Also imo store() functin should store the wallet, no matter
the current state.
---
external/randomwow | 2 +-
src/wallet/api/wallet.cpp | 25 ++++++++++++-------------
src/wallet/api/wallet.h | 1 -
src/wallet/wallet2.cpp | 12 +++++++++++-
src/wallet/wallet2.h | 3 +++
5 files changed, 27 insertions(+), 16 deletions(-)
4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/external/randomwow b/external/randomwow
index c00685dad..27b099b6d 160000
--- a/external/randomwow
+++ b/external/randomwow
@@ -1 +1 @@
-Subproject commit c00685dad575137caf4a9100ba08e77be376fa98
+Subproject commit 27b099b6dd6fef6e17f58c6dfe00009e9c5df587
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index e868fa039..899ef044a 100644
--- a/src/wallet/api/wallet.cpp
Expand Down
2 changes: 1 addition & 1 deletion patches/wownero/0005-uint64_t-missing-definition-fix.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From be58d7233efb6b5782931563fdb3dc780a30caea Mon Sep 17 00:00:00 2001
From 5a9148c10ea29a42d8aa08d69e2f4559c8611655 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <[email protected]>
Date: Mon, 2 Sep 2024 16:40:31 +0200
Subject: [PATCH 05/15] uint64_t missing definition fix
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a80b8f629790f624f3b8fa826927fcace348448b Mon Sep 17 00:00:00 2001
From ee6aa49179833c930c1ec10ae2e877aeb87eb8c8 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <[email protected]>
Date: Mon, 24 Jun 2024 10:49:12 +0200
Subject: [PATCH 06/15] use proper error handling in get_seed
Expand Down
2 changes: 1 addition & 1 deletion patches/wownero/0007-UR-functions.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0ae5d66901100f99ed96a671153afd2bb1091696 Mon Sep 17 00:00:00 2001
From 031df7de0d75d93f78be732d5cac702b0ab193f0 Mon Sep 17 00:00:00 2001
From: tobtoht <[email protected]>
Date: Tue, 12 Mar 2024 10:09:50 +0100
Subject: [PATCH 07/15] UR functions
Expand Down
2 changes: 1 addition & 1 deletion patches/wownero/0008-add-dummy-device-for-ledger.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5a2a40bff969b67c518b0ecff262344a4b09d710 Mon Sep 17 00:00:00 2001
From 221fb7ed81aff1830b4bc2d7f9b73c94eb36924a Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <[email protected]>
Date: Wed, 26 Jun 2024 15:04:38 +0200
Subject: [PATCH 08/15] add dummy device for ledger
Expand Down
2 changes: 1 addition & 1 deletion patches/wownero/0009-polyseed.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 15be57d287c9009215d1b88e5fe7f3f366efb260 Mon Sep 17 00:00:00 2001
From d146c6c1e23e1bf3762449e72a3aab847b3c0412 Mon Sep 17 00:00:00 2001
From: tobtoht <[email protected]>
Date: Tue, 12 Mar 2024 09:42:37 +0100
Subject: [PATCH 09/15] polyseed
Expand Down
2 changes: 1 addition & 1 deletion patches/wownero/0010-coin-control.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4ad736ed770a1d307e57f89d7154c0ad29ffac83 Mon Sep 17 00:00:00 2001
From edc33fa98da3bc9e8e746a59f5e62b9001afb230 Mon Sep 17 00:00:00 2001
From: tobtoht <[email protected]>
Date: Tue, 12 Mar 2024 11:07:57 +0100
Subject: [PATCH 10/15] coin control
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 572afcf8a0125418d11addd6f847ab85a58a9c7e Mon Sep 17 00:00:00 2001
From 96911b156ad9cfef2ebf2809a393492e87ab7607 Mon Sep 17 00:00:00 2001
From: M <[email protected]>
Date: Fri, 21 Apr 2023 15:43:47 -0400
Subject: [PATCH 11/15] Add hex encoding and tx key getter for
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From aa69cd570e4a6f3ed184eb2ccbd537a429a8220c Mon Sep 17 00:00:00 2001
From ad28016bf3cfd11242dc14472389f7a006c73dcf Mon Sep 17 00:00:00 2001
From: Konstantin Ullrich <[email protected]>
Date: Wed, 11 Oct 2023 16:47:59 +0200
Subject: [PATCH 12/15] Add recoverDeterministicWalletFromSpendKey
Expand Down
2 changes: 1 addition & 1 deletion patches/wownero/0013-add-monero-submodule-support.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8eaefc7cbe488aca7f0f726ac9a0bdb00508517b Mon Sep 17 00:00:00 2001
From f8b3055a79c929dc167d20d4874ab20b0a51d49d Mon Sep 17 00:00:00 2001
From: cyan <[email protected]>
Date: Thu, 7 Nov 2024 16:46:24 +0000
Subject: [PATCH 13/15] add monero submodule support
Expand Down
2 changes: 1 addition & 1 deletion patches/wownero/0014-fix-iOS-depends-build.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c164b53648c8203882212e92a95b767ff9d3de92 Mon Sep 17 00:00:00 2001
From a707d5fc2aa9d387857381e7ebc4a68c1d245a00 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <[email protected]>
Date: Thu, 21 Nov 2024 06:05:03 -0500
Subject: [PATCH 14/15] fix iOS depends build
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7bd25d3540a96169ac8e0ac7438d76c0b10046fc Mon Sep 17 00:00:00 2001
From eeb059ab8bff7e8614531565259ca66f6e6a8c7d Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <[email protected]>
Date: Mon, 18 Nov 2024 10:57:37 -0500
Subject: [PATCH 15/15] include locale only when targeting WIN32
Expand Down

0 comments on commit e5204e8

Please sign in to comment.