Revert "[glib] hunt down every mention of libiconv"

This reverts commit 6a3b19b.

ports/glib/CMakeLists.txt

@@ -25,6 +25,9 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
     set(PCRE_SUFFIX d)
 endif()
 find_library(PCRE_LIBRARY pcre${PCRE_SUFFIX})
+# libiconv
+find_path(ICONV_INCLUDE_DIR iconv.h)
+find_library(ICONV_LIBRARY NAMES iconv libiconv)
 # libffi
 find_path(FFI_INCLUDE_DIR ffi.h)
 find_library(FFI_LIBRARY NAMES ffi libffi)
@@ -62,8 +65,8 @@ extract_vcproj_sources(build/win32/vs14/glib.vcxproj GLIB_SOURCES)
 list(APPEND GLIB_SOURCES glib/libcharset/localcharset.c) # modified internal version with prefixed symbols
 add_library(glib ${GLIB_SOURCES})
 target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE ${GLIB_EXPORT_MACRO} GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR)
-target_link_libraries(glib ws2_32 winmm ${PCRE_LIBRARY} ${LIBINTL_LIBRARY})
-target_include_directories(glib PRIVATE ${PCRE_INCLUDE_DIR})
+target_link_libraries(glib ws2_32 winmm ${PCRE_LIBRARY} ${ICONV_LIBRARY} ${LIBINTL_LIBRARY})
+target_include_directories(glib PRIVATE ${PCRE_INCLUDE_DIR} ${ICONV_INCLUDE_DIR})
 target_include_directories(glib PUBLIC  ${LIBINTL_INCLUDE_DIR})
 list(APPEND GLIB_TARGETS glib)
 
@@ -153,5 +156,6 @@ endif()
 message(STATUS "Link-time dependencies:")
 message(STATUS "  " ${ZLIB_LIBRARIES})
 message(STATUS "  " ${PCRE_LIBRARY})
+message(STATUS "  " ${ICONV_LIBRARY})
 message(STATUS "  " ${FFI_LIBRARY})
 message(STATUS "  " ${LIBINTL_LIBRARY})

ports/glib/CONTROL

@@ -1,4 +1,4 @@
 Source: glib
 Version: 2.50.2
 Description: Portable, general-purpose utility library.
-Build-Depends: zlib, pcre, libffi, gettext
+Build-Depends: zlib, pcre, libffi, gettext, libiconv