From 4e76a216d67a3dd24cf8ad9faf20d43fb290a8a9 Mon Sep 17 00:00:00 2001
From: Greg Pfeil <greg@z.cash>
Date: Thu, 1 Dec 2022 20:51:45 -0700
Subject: [PATCH] Put utf8.h in the correct place

Both CMake and Nix want it to be here, so I obliged.
---
 depends/packages/utfcpp.mk | 3 ++-
 src/wallet/rpcwallet.cpp   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/depends/packages/utfcpp.mk b/depends/packages/utfcpp.mk
index 2a0620e21..85b99402b 100644
--- a/depends/packages/utfcpp.mk
+++ b/depends/packages/utfcpp.mk
@@ -6,5 +6,6 @@ $(package)_download_file=v$($(package)_version).tar.gz
 $(package)_sha256_hash=8d6aa7d77ad0abb35bb6139cb9a33597ac4c5b33da6a004ae42429b8598c9605
 
 define $(package)_stage_cmds
-  cp -a ./source $($(package)_staging_dir)$(host_prefix)/include
+  mkdir -p $($(package)_staging_dir)$(host_prefix)/include && \
+  cp -a ./source $($(package)_staging_dir)$(host_prefix)/include/utf8cpp
 endef
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index dc6dd72db..81ce755b9 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -46,7 +46,7 @@
 
 #include <boost/assign/list_of.hpp>
 #include <boost/algorithm/string/trim.hpp>
-#include <utf8.h>
+#include <utf8cpp/utf8.h>
 
 #include <univalue.h>