[intl/gettext/fontconfig] update to native build system (#11776)

* [fontconfig] update fontconfig

* [libiconv] update to make

* [gettext] update to make

* [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig

* [fontconfig] make it work on windows

* Remove install of unofficial cmake config

* add function get_cmake_vars

* fine tuning.

* apply to make based ports.

* add log suffix on not windows platforms

* fix c&p error

* add previous LINK env

* setup env on windows and extract cpp flags correctly.

* update glib and libxml2

* fix windows regressions

* Apply suggestions from code review

* add windres wrapper to invoke RC.

* remove wrong fi

* fix libintl.

* try fixing uwp

* other things to update

* exiv2 fix

* libtool does not like -RTC1

* pass the /RTC<x> flag directly to the compiler

* trust cmake instead of adding extra flags

* fix expat

* fix iconv wrapper install

* change fontconfig intl linkage.

* add appcontainer back in which is required for UWP. Why is this not in the cmake flags?

* fix pkg-config in vcpkg_configure_make

* fix json-c pkg-config installation

* remove remnoved config

* comment out debug messages + bit of tuning

* finally fontconfig

* comment debug messages

* expat apply extra patches.

* Switch back to -E instead of -EP in cpp

* commit changes from fontconfig PR

* [expat] fix expat details

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* cleanup docs

* update osx pipeline so that fontconfig actually builds

* fix expat the lazy way by using a higher commit than release

* fix a barage of regressions due to the use of unofficial targets

* [expat] use a higher commit hash with a better stabilized cmake build

* forgot freexl regression

* more unofficial fixes

* fix downstream expat usage

* fix wxwidgets

* fix gcdm regression

* [vtk] fix the regression due to expat

* add uwp cl flags back in. Somehow those are not set by cmake

* add a few other configure options for full gettext build

* fix cmake regression

* fix a few regressions

* fix static gettext build

* fix gettext static

* fix libxml2 wrapper for cmake

* some more regressions fixes

* add conversion from somelib.lib to -lsomelib

* add a few option to libiconv.

* get logs from CI

* add missing ar-lib wrapper

* add missing ar-lib wrapper

* add fatal error to gettext

* remove uuid from the list of LIBS since it seems to not exist in CI?

* small but important regex correction

* fix regex and add debug message for libs

* remove error and only build libintl.

* add uuid dependency to fontconfig in qt5-base

* osx install gettext for autopoint

* fix io2d regression by saying the port is broken .....
(which it is; upstream needs to learn proper cmake)

* restore the old libxml2 wrapper with minor modifications

* fix xmlsec regression

* install wrapper correctly

* try actual fixing io2d

* improve iconv wrapper

* add latest changes from update_fontconfig PR

* Apply suggestions from code review

first set which don't need special attention

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* Apply suggestions from code review

one more simple change

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* [x264] set env AS

* fix bugs due to refactor

* use subpath everywhere

* apply changes from CR

* fix fontconfig build.

* only change libs in static builds

* remove unnecessary lines 41 & 44

* remove flag transformation

* reintroduce the flag / to - transformation for MSVC

* trying to figure out autopoint issue.
using wrong (windows) find.exe instead of msys

* add correct working_dir to subpath

* escape stupid env paths.

* fix typo

* add findutils
remove debug messages

* add error if libtool chokes

* add file to msys

* pass lt_cv_deplibs_check_method=pass_all on windows
(couldn't get file.exe to work so that libtool correctly ids the passed libs)

* add bzip2 to msys

* reenable libtool check. Lets see if CI agrees

* unbreak linux
try to figure out where uuid should be on windows.

* add -L flag and help libtool ?

* try to get ci to find uuid.

* try to use cygpath

* update controls

* cleanup merge mistakes

* correct merge issues

* determine cmake vars if not done before.

* move adding of -l earlier

* more merge cleanup

* fix uwp builds by not transforming libs

* fix patches in io2d

* fix xz download error

* apply code review changes manually

* fix the typos left behind in CR

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

3 files changed, 16 insertions, 19 deletions

diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt
index 231542073..cc24a2f63 100644
--- a/ports/glib/CMakeLists.txt
+++ b/ports/glib/CMakeLists.txt
@@ -31,7 +31,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
 endif()
 find_library(PCRE_LIBRARY NAMES pcre${PCRE_SUFFIX} pcre)
 # libiconv
-find_package(unofficial-iconv REQUIRED)
+find_package(Iconv REQUIRED)
 # libffi
 find_path(FFI_INCLUDE_DIR ffi.h)
 find_library(FFI_LIBRARY NAMES ffi libffi)
@@ -45,11 +45,7 @@ endif()
 
 if(WIN32 OR APPLE)
     # libintl(gettext)
-    find_path(LIBINTL_INCLUDE_DIR libintl.h)
-    find_library(LIBINTL_LIBRARY NAMES intl libintl)
-else()
-    set(LIBINTL_INCLUDE_DIR)
-    set(LIBINTL_LIBRARY)
+    find_package(Intl REQUIRED)
 endif()
 
 if(WIN32)
@@ -139,7 +135,7 @@ if(NOT WIN32)
 endif()
 add_library(glib ${GLIB_SOURCES})
 target_compile_definitions(glib PRIVATE GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR="")
-target_link_libraries(glib PRIVATE ${PCRE_LIBRARY} unofficial::iconv::libiconv unofficial::iconv::libcharset ${LIBINTL_LIBRARY})
+target_link_libraries(glib PRIVATE ${PCRE_LIBRARY} Iconv::Iconv ${Intl_LIBRARIES})
 if(WIN32)
     target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE)
     target_link_libraries(glib PRIVATE ws2_32 winmm advapi32 ole32 shell32)
@@ -149,7 +145,7 @@ else()
     target_link_libraries(glib PRIVATE Threads::Threads ${CMAKE_DL_LIBS})
 endif()
 target_include_directories(glib PRIVATE ${PCRE_INCLUDE_DIR} ${ICONV_INCLUDE_DIR})
-target_include_directories(glib PUBLIC $<BUILD_INTERFACE:${LIBINTL_INCLUDE_DIR}> $<INSTALL_INTERFACE:include>)
+target_include_directories(glib PUBLIC $<BUILD_INTERFACE:${Intl_INCLUDE_DIRS}> $<INSTALL_INTERFACE:include>)
 list(APPEND GLIB_TARGETS glib)
 if(NOT GLIB_SKIP_HEADERS)
     install(FILES glib/glib.h glib/glib-object.h ${CMAKE_BINARY_DIR}/config/glib/glibconfig.h DESTINATION include)
@@ -165,8 +161,8 @@ endif()
 # gthread
 add_library(gthread gthread/gthread-impl.c)
 target_compile_definitions(gthread PRIVATE G_LOG_DOMAIN="GThread")
-target_link_libraries(gthread PRIVATE glib ${LIBINTL_LIBRARY})
-target_include_directories(gthread PRIVATE ${LIBINTL_INCLUDE_DIR})
+target_link_libraries(gthread PRIVATE glib ${Intl_LIBRARIES})
+target_include_directories(gthread PRIVATE ${Intl_INCLUDE_DIRS})
 list(APPEND GLIB_TARGETS gthread)
 
 # gobject
@@ -185,9 +181,9 @@ endif()
 # gmodule
 add_library(gmodule gmodule/gmodule.c)
 target_compile_definitions(gmodule PRIVATE G_LOG_DOMAIN="GModule")
-target_link_libraries(gmodule PRIVATE glib ${LIBINTL_LIBRARY})
+target_link_libraries(gmodule PRIVATE glib ${Intl_LIBRARIES})
 target_include_directories(gmodule PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gmodule>)
-target_include_directories(gmodule PRIVATE ${LIBINTL_INCLUDE_DIR} PUBLIC $<INSTALL_INTERFACE:include>)
+target_include_directories(gmodule PRIVATE ${Intl_INCLUDE_DIRS} PUBLIC $<INSTALL_INTERFACE:include>)
 list(APPEND GLIB_TARGETS gmodule)
 if(NOT GLIB_SKIP_HEADERS)
     install(FILES gmodule/gmodule.h DESTINATION include)
@@ -254,7 +250,7 @@ if(NOT GLIB_SKIP_HEADERS)
 endif()
 add_library(gio ${GIO_SOURCES})
 target_compile_definitions(gio PRIVATE GIO_COMPILATION G_LOG_DOMAIN="GLib-GIO")
-target_link_libraries(gio PRIVATE glib gmodule gobject ZLIB::ZLIB ${LIBRESOLV_LIBRARY} ${LIBINTL_LIBRARY})
+target_link_libraries(gio PRIVATE glib gmodule gobject ZLIB::ZLIB ${LIBRESOLV_LIBRARY} ${Intl_LIBRARIES})
 target_include_directories(gio PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gio> $<INSTALL_INTERFACE:include/gio>)
 if(WIN32)
     target_link_libraries(gio PRIVATE ws2_32 shlwapi dnsapi iphlpapi advapi32 shell32)
@@ -280,9 +276,9 @@ endforeach()
 macro(add_glib_tool TOOL_NAME)
     add_executable(${TOOL_NAME} ${ARGN})
     if(WIN32)
-        target_link_libraries(${TOOL_NAME} glib ${LIBINTL_LIBRARY} shell32)
+        target_link_libraries(${TOOL_NAME} glib ${Intl_LIBRARIES} shell32)
     else()
-        target_link_libraries(${TOOL_NAME} glib ${LIBINTL_LIBRARY})
+        target_link_libraries(${TOOL_NAME} glib ${Intl_LIBRARIES})
     endif()
     target_compile_definitions(${TOOL_NAME} PRIVATE GLIB_COMPILATION)
     list(APPEND GLIB_TOOLS ${TOOL_NAME})
@@ -290,7 +286,7 @@ endmacro()
 
 macro(add_gio_tool TOOL_NAME)
     add_executable(${TOOL_NAME} ${ARGN})
-    target_link_libraries(${TOOL_NAME} PRIVATE glib gio gobject gmodule ${LIBINTL_LIBRARY})
+    target_link_libraries(${TOOL_NAME} PRIVATE glib gio gobject gmodule ${Intl_LIBRARIES})
     target_include_directories(${TOOL_NAME} PRIVATE gmodule gio)
     target_compile_definitions(${TOOL_NAME} PRIVATE GIO_COMPILATION)
     list(APPEND GLIB_TOOLS ${TOOL_NAME})
@@ -359,7 +355,7 @@ message(STATUS "  " ${PCRE_LIBRARY})
 message(STATUS "  " ${ICONV_LIBRARY})
 message(STATUS "  " ${CHARSET_LIBRARY})
 message(STATUS "  " ${FFI_LIBRARY})
-message(STATUS "  " ${LIBINTL_LIBRARY})
+message(STATUS "  " ${Intl_LIBRARIES})
 
 set(prefix ${CMAKE_INSTALL_PREFIX})
 set(exec_prefix ${CMAKE_INSTALL_PREFIX})
diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL
index 14c896e59..8d74d5613 100644
--- a/ports/glib/CONTROL
+++ b/ports/glib/CONTROL
@@ -1,5 +1,6 @@
 Source: glib
-Version: 2.52.3-14-7
+Version: 2.52.3
+Port-Version: 23
 Homepage: https://developer.gnome.org/glib/
 Description: Portable, general-purpose utility library.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv
diff --git a/ports/glib/cmake/unofficial-glib-config.in.cmake b/ports/glib/cmake/unofficial-glib-config.in.cmake
index ea87ea0b2..6edc8348b 100644
--- a/ports/glib/cmake/unofficial-glib-config.in.cmake
+++ b/ports/glib/cmake/unofficial-glib-config.in.cmake
@@ -1,5 +1,5 @@
 include(CMakeFindDependencyMacro)

-find_dependency(unofficial-iconv)

+find_dependency(Iconv)

 if(NOT WIN32)

     find_dependency(Threads)

 endif()