4 files changed, 10 insertions, 36 deletions
diff --git a/ports/libiconv/0003-Fix-uwp.patch b/ports/libiconv/0003-Fix-uwp.patch
deleted file mode 100644
index 0b2444166..000000000
--- a/ports/libiconv/0003-Fix-uwp.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/libcharset/lib/localcharset.c b/libcharset/lib/localcharset.c
-index 3aceb42..dadd95a 100644
---- a/libcharset/lib/localcharset.c
-+++ b/libcharset/lib/localcharset.c
-@@ -455,7 +455,10 @@ locale_charset (void)
- # endif
- 
- #elif defined WIN32_NATIVE
--
-+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
-+  // GetACP() not available to UWP apps
-+  codeset = NULL;
-+#else
-   static char buf[2 + 10 + 1];
- 
-   /* Woe32 has a function returning the locale's codepage as a number:
-@@ -467,7 +470,7 @@ locale_charset (void)
-      encoding is the best bet.  */
-   sprintf (buf, "CP%u", GetACP ());
-   codeset = buf;
--
-+#endif
- #elif defined OS2
- 
-   const char *locale;
diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL
index c24bac49d..48688767a 100644
--- a/ports/libiconv/CONTROL
+++ b/ports/libiconv/CONTROL
@@ -1,4 +1,4 @@
 Source: libiconv
-Version: 1.15-5
+Version: 1.15-6
 Homepage: https://www.gnu.org/software/libiconv/
 Description: GNU Unicode text conversion
diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake
index 4b84ecc5f..488cc3b2f 100644
--- a/ports/libiconv/portfile.cmake
+++ b/ports/libiconv/portfile.cmake
@@ -21,7 +21,6 @@ vcpkg_extract_source_archive_ex(
     PATCHES
         0001-Add-export-definitions.patch
         0002-Config-for-MSVC.patch
-        0003-Fix-uwp.patch
 )
 
 #Since libiconv uses automake, make and configure, we use a custom CMake file
@@ -39,8 +38,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-iconv TARGET_PATH share/u
 
 vcpkg_copy_pdbs()
 
-# Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libiconv/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/libiconv/copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv)
diff --git a/ports/libiconv/unofficial-iconv-config.cmake b/ports/libiconv/unofficial-iconv-config.cmake
index 7d08ff5f5..94d65d2ff 100644
--- a/ports/libiconv/unofficial-iconv-config.cmake
+++ b/ports/libiconv/unofficial-iconv-config.cmake
@@ -1,6 +1,8 @@
-add_library(unofficial::iconv::libcharset INTERFACE IMPORTED)
-add_library(unofficial::iconv::libiconv INTERFACE IMPORTED)
-if(APPLE)
-    set_property(TARGET unofficial::iconv::libcharset PROPERTY INTERFACE_LINK_LIBRARIES "charset;unofficial::iconv::libiconv")
-    set_property(TARGET unofficial::iconv::libiconv PROPERTY INTERFACE_LINK_LIBRARIES "iconv")
-endif()
-\ No newline at end of file
+if (NOT TARGET unofficial::iconv::libiconv)
+    add_library(unofficial::iconv::libcharset INTERFACE IMPORTED)
+    add_library(unofficial::iconv::libiconv INTERFACE IMPORTED)
+    if(APPLE)
+        set_property(TARGET unofficial::iconv::libcharset PROPERTY INTERFACE_LINK_LIBRARIES "charset;unofficial::iconv::libiconv")
+        set_property(TARGET unofficial::iconv::libiconv PROPERTY INTERFACE_LINK_LIBRARIES "iconv")
+    endif()
+endif()