[qtwebengine] Fix build, add features for pdf and webengine

ports/qt/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "qt",
   "version": "6.8.3",
+  "port-version": 1,
   "description": "A cross-platform application and UI framework.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -175,6 +176,10 @@
         "qml"
       ]
     },
+    {
+      "name": "qtwebengine",
+      "default-features": false
+    },
     {
       "name": "qtwebengine",
       "default-features": false,
@@ -183,7 +188,7 @@
         "spellchecker",
         "webchannel"
       ],
-      "platform": "!static & !(windows & arm)"
+      "platform": "(linux | osx | (windows & x64)) & !static"
     },
     {
       "name": "qtwebsockets",

ports/qtwebengine/cross-build.diff

@@ -0,0 +1,22 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 789f15bc6..be3ea630d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -167,7 +167,7 @@ endif()
+ #  HOST PROJECT
+ ##
+
+-if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS)
++if(0)
+
+     if(NOT Gn_FOUND)
+         message(FATAL_ERROR "\nHost gn not found - cross compilation not possible")
+@@ -198,7 +198,7 @@ if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS)
+ endif()
+
+ # install gn for cross build
+-if((LINUX OR MACOS OR WIN32) AND INSTALL_GN)
++if(NOT CMAKE_CROSSCOMPILING AND INSTALL_GN)
+     if(NOT QT_WILL_INSTALL)
+         set(copyOutput
+             ${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/gn${CMAKE_EXECUTABLE_SUFFIX}

ports/qtwebengine/disable-host-pkgconfig.diff

@@ -0,0 +1,12 @@
+diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
+index 8d5a97777..08296e504 100644
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -724,6 +724,7 @@ endfunction()
+ function(create_pkg_config_wrapper wrapperName wrapperCmd)
+     file(WRITE ${wrapperName}
+         "#!/bin/sh\n"
++        "exit 0\n"
+         "unset PKG_CONFIG_LIBDIR\n"
+         "unset PKG_CONFIG_PATH\n"
+         "unset PKG_CONFIG_SYSROOT_DIR\n"

ports/qtwebengine/osx-sdk-info.diff

@@ -0,0 +1,90 @@
+diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
+index 8d5a97777..239eaa1dd 100644
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -401,7 +401,7 @@ function(add_archiver_options target buildDir completeStatic)
+     get_target_property(cmakeTarget ${target} CMAKE_TARGET)
+     set(objects_out "${buildDir}/${cmakeTarget}_objects.o")
+     add_library(GnObject_${cmakeTarget}_${config} OBJECT IMPORTED GLOBAL)
+-    target_link_libraries(${cmakeTarget} PRIVATE $<$<CONFIG:${config}>:GnObject_${cmakeTarget}_${config}>)
++    target_link_libraries(${cmakeTarget} PRIVATE $<BUILD_LOCAL_INTERFACE:$<$<CONFIG:${config}>:GnObject_${cmakeTarget}_${config}>>)
+     set_property(TARGET GnObject_${cmakeTarget}_${config} PROPERTY IMPORTED_OBJECTS_${cfg} ${objects_out})
+ endfunction()
+
+@@ -947,6 +947,10 @@ macro(append_compiler_linker_sdk_setup)
+                 use_libcxx=true
+             )
+             _qt_internal_get_apple_sdk_version(apple_sdk_version)
++            list(APPEND gnArgArg
++                CMAKE_OSX_SYSROOT="${CMAKE_OSX_SYSROOT}"
++                apple_sdk_version="${apple_sdk_version}"
++            )
+             if (apple_sdk_version LESS 13.2)
+                 list(APPEND gnArgArg
+                     use_sck=false
+diff --git a/src/3rdparty/chromium/build/config/apple/sdk_info.py b/src/3rdparty/chromium/build/config/apple/sdk_info.py
+index 81b06d438..03af4f2db 100755
+--- a/src/3rdparty/chromium/build/config/apple/sdk_info.py
++++ b/src/3rdparty/chromium/build/config/apple/sdk_info.py
+@@ -59,8 +59,11 @@ def FillXcodeVersion(settings, developer_dir):
+     settings['xcode_build'] = version_plist['ProductBuildVersion']
+     return
+
+-  lines = subprocess.check_output(['xcodebuild',
++  try:
++    lines = subprocess.check_output(['xcodebuild',
+                                    '-version']).decode('UTF-8').splitlines()
++  except:
++    lines = [ 'Required: 12', 'Actual: unknown' ]
+   settings['xcode_version'] = FormatVersion(lines[0].split()[-1])
+   settings['xcode_version_int'] = int(settings['xcode_version'], 10)
+   settings['xcode_build'] = lines[-1].split()[-1]
+@@ -86,10 +89,13 @@ def FillSDKPathAndVersion(settings, platform, xcode_version):
+   settings['sdk_build'] = subprocess.check_output(
+       ['xcrun', '-sdk', platform,
+        '--show-sdk-build-version']).decode('UTF-8').strip()
+-  settings['toolchains_path'] = os.path.join(
++  try:
++    settings['toolchains_path'] = os.path.join(
+       subprocess.check_output(['xcode-select',
+                                '-print-path']).decode('UTF-8').strip(),
+       'Toolchains/XcodeDefault.xctoolchain')
++  except:
++    settings['toolchains_path'] = ''
+
+
+ def CreateXcodeSymlinkAt(src, dst, root_build_dir):
+diff --git a/src/3rdparty/chromium/build/config/mac/mac_sdk.gni b/src/3rdparty/chromium/build/config/mac/mac_sdk.gni
+index 00588459e..48b4a0102 100644
+--- a/src/3rdparty/chromium/build/config/mac/mac_sdk.gni
++++ b/src/3rdparty/chromium/build/config/mac/mac_sdk.gni
+@@ -15,6 +15,8 @@ assert(
+     (current_os == "ios" && current_toolchain == "${default_toolchain}_blink"))
+
+ declare_args() {
++  apple_sdk_version = ""
++  CMAKE_OSX_SYSROOT = ""
+   # The following two variables control the minimum supported version for
+   # macOS:
+   #
+@@ -115,6 +117,7 @@ if (mac_sdk_path == "" && use_system_xcode &&
+ }
+
+ if (use_system_xcode) {
++ if (CMAKE_OSX_SYSROOT == "") {
+   # The tool will print the SDK path on the first line, and the version on the
+   # second line.
+   find_sdk_args = [
+@@ -133,6 +136,12 @@ if (use_system_xcode) {
+   } else {
+     mac_bin_path = find_sdk_lines[1]
+   }
++ } else {
++  mac_sdk_version = apple_sdk_version
++  mac_sdk_build_version = ""
++  mac_sdk_path = CMAKE_OSX_SYSROOT
++  mac_bin_path = ""
++ }
+ } else {
+   mac_sdk_version = mac_sdk_official_version
+   mac_sdk_build_version = mac_sdk_official_build_version

ports/qtwebengine/pdf-system-libjpeg.diff

@@ -0,0 +1,15 @@
+diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt
+index 95931a261..61806ee08 100644
+--- a/src/pdf/CMakeLists.txt
++++ b/src/pdf/CMakeLists.txt
+@@ -215,6 +215,10 @@ foreach(arch ${archs})
+             ARGS pdfium_use_system_libtiff
+             CONDITION QT_FEATURE_webengine_system_libtiff
+         )
++        extend_gn_list(gnArgArg
++            ARGS use_system_libjpeg
++            CONDITION QT_FEATURE_webengine_system_libjpeg
++        )
+         extend_gn_list(gnArgArg
+             ARGS use_qt_libjpeg
+             CONDITION QT_FEATURE_webengine_qt_libjpeg

ports/qtwebengine/pdf-system-libpng.diff

@@ -0,0 +1,12 @@
+diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt
+index 61806ee08..00621491e 100644
+--- a/src/pdf/CMakeLists.txt
++++ b/src/pdf/CMakeLists.txt
+@@ -205,6 +205,7 @@ foreach(arch ${archs})
+         )
+         extend_gn_list(gnArgArg
+             ARGS pdfium_use_system_libpng use_system_libpng
++                 skia_use_system_libpng
+             CONDITION QT_FEATURE_webengine_system_libpng
+         )
+         extend_gn_list(gnArgArg

ports/qtwebengine/pkg-config.diff

@@ -0,0 +1,13 @@
+diff --git a/src/3rdparty/chromium/build/config/linux/pkg_config.gni b/src/3rdparty/chromium/build/config/linux/pkg_config.gni
+index 0d873903c..09bf2e874 100644
+--- a/src/3rdparty/chromium/build/config/linux/pkg_config.gni
++++ b/src/3rdparty/chromium/build/config/linux/pkg_config.gni
+@@ -54,7 +54,7 @@ pkg_config_script = "//build/config/linux/pkg-config.py"
+ pkg_config_args = []
+
+ common_pkg_config_args = []
+-if (sysroot != "") {
++if (sysroot != "" && !is_android) {
+   # Pass the sysroot if we're using one (it requires the CPU arch also).
+   common_pkg_config_args += [
+     "-s",