From 019aa08dff2bb818a0d87785e9925ce305fcf03c Mon Sep 17 00:00:00 2001
From: who-biz <37732338+who-biz@users.noreply.github.com>
Date: Thu, 30 Jul 2020 20:02:59 +0000
Subject: [PATCH] Remove ICU_LIBRARIES from linking

- Comments from Monero seem to indicate that these are necessary, otherwise linking errors will result
- Doesn't appear to be true, and compilation seems fine without them.
- We already weren't linking them in libwallet, and simplewallet runs fine
- Looks like on Windows there are some issues displaying non-english Locales, but relatively small problem compared to potential issues arising from use of unicode
---
 CMakeLists.txt                       |  5 -----
 contrib/depends/packages/icu4c.mk    | 32 ----------------------------
 contrib/depends/packages/packages.mk |  1 -
 src/simplewallet/CMakeLists.txt      |  1 -
 4 files changed, 39 deletions(-)
 delete mode 100644 contrib/depends/packages/icu4c.mk

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 185a2f11..f44b945b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -833,11 +833,6 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 if(MINGW)
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
   set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt)
-  if(DEPENDS)
-    set(ICU_LIBRARIES icuio icui18n icuuc icudata icutu iconv)
-  else()
-    set(ICU_LIBRARIES icuio icuin icuuc icudt icutu iconv)
-  endif()
 elseif(APPLE OR OPENBSD OR ANDROID)
   set(EXTRA_LIBRARIES "")
 elseif(FREEBSD)
diff --git a/contrib/depends/packages/icu4c.mk b/contrib/depends/packages/icu4c.mk
deleted file mode 100644
index dbccfbc2..00000000
--- a/contrib/depends/packages/icu4c.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-package=icu4c
-$(package)_version=55.2
-$(package)_download_path=https://github.com/unicode-org/icu/releases/download/release-55-2/
-$(package)_file_name=$(package)-55_2-src.tgz
-$(package)_sha256_hash=eda2aa9f9c787748a2e2d310590720ca8bcc6252adf6b4cfb03b65bef9d66759
-
-define $(package)_set_vars
-  $(package)_build_opts=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION -DU_COMBINED_IMPLEMENTATION -fPIC -DENABLE_STATIC=YES -DPGKDATA_MODE=static"
-endef
-
-define $(package)_config_cmds
-  mkdir builda &&\
-  mkdir buildb &&\
-  cd builda &&\
-  sh ../source/runConfigureICU Linux &&\
-  make &&\
-  cd ../buildb &&\
-  sh ../source/runConfigureICU MinGW --enable-static=yes --disable-shared --disable-layout --disable-layoutex --disable-tests --disable-samples --prefix=$(host_prefix) --with-cross-build=`pwd`/../builda &&\
-  $(MAKE) $($(package)_build_opts)
-endef
-
-
-#define $(package)_build_cmds
-#  cd source &&\
-#   $(MAKE) $($((package)_build_opts) `nproc`
-#endef
-
-define $(package)_stage_cmds
-  cd buildb &&\
-  $(MAKE) $($(package)_build_opts) DESTDIR=$($(package)_staging_dir) install lib/*
-endef
-
diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
index f1d8eeca..41b6a5e9 100644
--- a/contrib/depends/packages/packages.mk
+++ b/contrib/depends/packages/packages.mk
@@ -11,7 +11,6 @@ packages += unwind
 packages += sodium
 endif
 ifeq ($(host_os),mingw32)
-packages += icu4c
 packages += sodium
 endif
 
diff --git a/src/simplewallet/CMakeLists.txt b/src/simplewallet/CMakeLists.txt
index 91381950..7176a8d4 100644
--- a/src/simplewallet/CMakeLists.txt
+++ b/src/simplewallet/CMakeLists.txt
@@ -54,7 +54,6 @@ target_link_libraries(simplewallet
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_LOCALE_LIBRARY}
-    ${ICU_LIBRARIES}
     ${Boost_THREAD_LIBRARY}
     ${CMAKE_THREAD_LIBS_INIT}
     ${GNU_READLINE_LIBRARY}