[Qt5] Update to 5.12.7 and add missing qt submodules

ports/cutelyst2/portfile.cmake

@@ -14,7 +14,7 @@ if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(BUILD_WIN_STATIC ON)
 endif()
 
-vcpkg_configure_cmake(
+vcpkg_configure_cmake( 
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS

ports/osg-qt/CONTROL

@@ -1,4 +1,4 @@
 Source: osg-qt
-Version: Qt4
-Description:  osgQt - Qt project for making use of OpenSceneGraph(OSG)
+Version: Qt4-1
+Description: osgQt - Qt project for making use of OpenSceneGraph(OSG) 
 Build-Depends: osg, protobuf, qt5-base

ports/osg-qt/portfile.cmake

@@ -1,15 +1,18 @@
-include(vcpkg_common_functions)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openscenegraph/osgQt
     REF Qt4
     SHA512 426a4ba88f680978d24817248b99c68cafa4517144e6e3d2480612870c4a224bb955539cacb438274d4ee1c93c36d94f8437d142070b2ecde2b81517bf357e71
     HEAD_REF master
-	PATCHES
+    PATCHES
         OsgMacroUtils.patch
 )
 
+if(VCPKG_TARGET_IS_OSX)
+    string(APPEND VCPKG_CXX_FLAGS " -stdlib=libc++")
+    string(APPEND VCPKG_C_FLAGS "") # both must be set
+endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -22,5 +25,5 @@ vcpkg_install_cmake()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle License
-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/osg-qt)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/osg-qt/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/osg-qt/copyright)
+file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)

ports/pango/CONTROL

@@ -2,4 +2,4 @@ Source: pango
 Version: 1.40.11-6
 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/
 Description: Text and font handling library.
-Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!(windows&static))
+Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!(windows&static)&!osx)

ports/qt5-3d/CONTROL

@@ -1,4 +1,4 @@
 Source: qt5-3d
-Version: 5.12.5-1
+Version: 5.12.7
 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
 Build-Depends:  qt5-base, qt5-declarative, qt5-imageformats, qt5-gamepad

ports/qt5-activeqt/CONTROL

@@ -1,5 +1,5 @@
 Source: qt5-activeqt
-Version: 5.12.5-1
+Version: 5.12.7
 Description: Qt5 ActiveQt Module - ActiveX components
 Build-Depends:  qt5-base
 Supports: windows

ports/qt5-androidextras/CONTROL

@@ -0,0 +1,5 @@
+Source: qt5-androidextras
+Version: 5.12.7
+Description: Qt5 androidextras Module; 
+Build-Depends:  qt5-base
+Supports: android

ports/qt5-androidextras/portfile.cmake

@@ -0,0 +1,2 @@
+include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+qt_submodule_installation()

ports/qt5-base/CONTROL

@@ -1,8 +1,8 @@
-Source: qt5-base
-Version: 5.12.5-11
-Homepage: https://www.qt.io/
-Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
-Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
-
-Feature: latest
-Description: Build latest qt version (5.13.1) instead of LTS
+Source: qt5-base
+Version: 5.12.7
+Homepage: https://www.qt.io/
+Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
+Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
+
+Feature: latest
+Description: Build latest qt version (5.13.1) instead of LTS

ports/qt5-base/cmake/configure_qt.cmake

@@ -77,8 +77,10 @@ function(configure_qt)
                 -extprefix ${CURRENT_INSTALLED_DIR}
                 ${EXT_BIN_DIR}
                 -hostprefix ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}}
+                #-hostprefix ${CURRENT_INSTALLED_DIR}/tools/qt5
                 -hostlibdir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}}/lib # could probably be move to manual-link
                 -hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}}/bin 
+                #-hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5/bin 
                 # Qt VS Plugin requires a /bin subfolder with the executables in the root dir. But to use the wizard a correctly setup lib folder is also required
                 # So with the vcpkg layout there is no way to make it work unless all dll are are copied to tools/qt5/bin and all libs to tools/qt5/lib
                 -archdatadir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}}

ports/qt5-base/cmake/qt_build_submodule.cmake

@@ -78,6 +78,51 @@ function(qt_build_submodule SOURCE_PATH)
     endforeach()
     if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt5/bin")
         file(COPY "${CURRENT_PACKAGES_DIR}/tools/qt5/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+        set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}")
+        set(CURRENT_INSTALLED_DIR "./../../.." ) # Making the qt.conf relative and not absolute
+        configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/qt.conf) # This makes the tools at least useable for release
+        set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}")
+
         vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
+        if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+            file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/*.dll")
+            string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/" "" DLL_DEPS_AVAIL "${DLL_DEPS_AVAIL}")
+            file(GLOB_RECURSE DLL_DEPS_NEEDED "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/*.dll")
+            string(REPLACE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" "" DLL_DEPS_NEEDED "${DLL_DEPS_NEEDED}")
+            if(DLL_DEPS_AVAIL AND DLL_DEPS_NEEDED)
+                list(REMOVE_ITEM DLL_DEPS_NEEDED ${DLL_DEPS_AVAIL})
+            endif()
+            foreach(dll_dep ${DLL_DEPS_NEEDED})
+                string(REGEX REPLACE "[^/]+$" "" dll_subpath "${dll_dep}")
+                file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/bin/${dll_subpath}")
+            endforeach()
+        endif()
     endif()
+
+    #This should be removed if somehow possible
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/tools/qt5/bin")
+        file(COPY "${CURRENT_PACKAGES_DIR}/debug/tools/qt5/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
+
+        set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}")
+        set(CURRENT_INSTALLED_DIR "./../../../.." ) # Making the qt.conf relative and not absolute
+        configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_debug.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/qt.conf) # This makes the tools at least useable for release
+        set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}")
+
+        vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin")
+        if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+            file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/debug/bin/*.dll")
+            string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/qt5/debug/bin/" "" DLL_DEPS_AVAIL "${DLL_DEPS_AVAIL}")
+            file(GLOB_RECURSE DLL_DEPS_NEEDED "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/*.dll")
+            string(REPLACE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" "" DLL_DEPS_NEEDED "${DLL_DEPS_NEEDED}")
+            if(DLL_DEPS_AVAIL AND DLL_DEPS_NEEDED)
+                list(REMOVE_ITEM DLL_DEPS_NEEDED ${DLL_DEPS_AVAIL})
+            endif()
+            foreach(dll_dep ${DLL_DEPS_NEEDED})
+                string(REGEX REPLACE "[^/]+$" "" dll_subpath "${dll_dep}")
+                file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin/${dll_subpath}")
+            endforeach()
+        endif()
+    endif()
+
 endfunction()

ports/qt5-base/cmake/qt_fix_cmake.cmake

@@ -1,25 +1,14 @@
 function(qt_fix_cmake PACKAGE_DIR_TO_FIX PORT_TO_FIX)
-    set(BACKUP_PATH "$ENV{PATH}")
-    #Find Python and add it to the path
-    vcpkg_find_acquire_program(PYTHON2)
-    get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
-    vcpkg_add_to_path("${PYTHON2_EXE_PATH}")
 
-    #Fix the cmake files if they exist
-    if(EXISTS ${PACKAGE_DIR_TO_FIX}/lib/cmake)
-        vcpkg_execute_required_process(
-            COMMAND ${PYTHON2} ${CURRENT_INSTALLED_DIR}/share/qt5/fixcmake.py ${PORT_TO_FIX}
-            WORKING_DIRECTORY ${PACKAGE_DIR_TO_FIX}/lib/cmake
-            LOGNAME fix-cmake
-        )
-    endif()
-    if(EXISTS ${PACKAGE_DIR_TO_FIX}/share/cmake)
-        vcpkg_execute_required_process(
-            COMMAND ${PYTHON2} ${CURRENT_INSTALLED_DIR}/share/qt5/fixcmake.py ${PORT_TO_FIX}
-            WORKING_DIRECTORY ${PACKAGE_DIR_TO_FIX}/share/cmake
-            LOGNAME fix-cmake
-        )
-    endif()
+    file(GLOB_RECURSE cmakefiles ${PACKAGE_DIR_TO_FIX}/share/cmake/*.cmake ${PACKAGE_DIR_TO_FIX}/lib/cmake/*.cmake)
+    foreach(cmakefile ${cmakefiles})
+        file(READ "${cmakefile}" _contents)
+        if(_contents MATCHES "_install_prefix}/tools/qt5/bin/([a-z0-9]+)") # there are only about 3 to 5 cmake files which require the fix in ports: qt5-tools qt5-xmlpattern at5-activeqt qt5-quick
+            string(REGEX REPLACE "_install_prefix}/tools/qt5/bin/([a-z0-9]+)" "_install_prefix}/tools/${PORT_TO_FIX}/bin/\\1" _contents "${_contents}")
+            file(WRITE "${cmakefile}" "${_contents}")
+        endif()
+    endforeach()
+
     #Install cmake files
     if(EXISTS ${PACKAGE_DIR_TO_FIX}/lib/cmake)
         file(MAKE_DIRECTORY ${PACKAGE_DIR_TO_FIX}/share)
@@ -29,5 +18,4 @@ function(qt_fix_cmake PACKAGE_DIR_TO_FIX PORT_TO_FIX)
     if(EXISTS ${PACKAGE_DIR_TO_FIX}/debug/lib/cmake)
         file(REMOVE_RECURSE ${PACKAGE_DIR_TO_FIX}/debug/lib/cmake)
     endif()
-    set(ENV{PATH} "${BACKUP_PATH}")
 endfunction()

ports/qt5-base/cmake/qt_install_copyright.cmake

@@ -11,6 +11,8 @@ function(qt_install_copyright SOURCE_PATH)
         set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3")
     elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT")
         set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT")
+    elseif(EXISTS "${SOURCE_PATH}/LICENSE.FDL")
+        set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.FDL")
     endif()
     file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 endfunction()