From 4746870785b3b4a77556cfc9cf260b4034724e10 Mon Sep 17 00:00:00 2001
From: jim wang <122244446+jimwang118@users.noreply.github.com>
Date: Tue, 9 May 2023 07:40:12 +0800
Subject: [PATCH] [qtbase] fix glib2 not found (#30379)

* fix glib2 no found

* update version

* update version

* update version

* update version

* update version

* update version

* update version

* update version

* update verion

* update verion

* merge master

* version

* fix new error

* update version

* update version

* update version

* Update qtbase.json

---------

Co-authored-by: Jim Wang (Beyondsoft Corporation) <v-wangjim@microsoft.com>
---
 ports/qtbase/GLIB2-static.patch               | 28 +++++++++++++++++++
 ports/qtbase/cmake/qt_install_submodule.cmake | 10 +++++++
 ports/qtbase/vcpkg.json                       |  2 +-
 versions/baseline.json                        |  2 +-
 versions/q-/qtbase.json                       |  5 ++++
 5 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/ports/qtbase/GLIB2-static.patch b/ports/qtbase/GLIB2-static.patch
index c384b741cef8b8..5bbcb289da4a03 100644
--- a/ports/qtbase/GLIB2-static.patch
+++ b/ports/qtbase/GLIB2-static.patch
@@ -73,3 +73,31 @@ index 24a194c..91c8e41 100644
  
  include(FeatureSummary)
  set_package_properties(GLIB2 PROPERTIES
+diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
+index 7d52f48..2b1b221 100644
+--- a/src/corelib/configure.cmake
++++ b/src/corelib/configure.cmake
+@@ -25,7 +25,7 @@ endif()
+ qt_find_package(WrapSystemDoubleConversion
+                 PROVIDED_TARGETS WrapSystemDoubleConversion::WrapSystemDoubleConversion
+                 MODULE_NAME core QMAKE_LIB doubleconversion)
+-qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE_NAME core QMAKE_LIB glib)
++qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE MODULE_NAME core QMAKE_LIB glib)
+ qt_find_package(ICU 50.1 COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data
+     MODULE_NAME core QMAKE_LIB icu)
+ 
+diff --git a/src/network/configure.cmake b/src/network/configure.cmake
+index aef7f15..21b0c1d 100644
+--- a/src/network/configure.cmake
++++ b/src/network/configure.cmake
+@@ -10,8 +10,8 @@
+ qt_find_package(WrapBrotli PROVIDED_TARGETS WrapBrotli::WrapBrotliDec MODULE_NAME network QMAKE_LIB brotli)
+ qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME network QMAKE_LIB libproxy)
+ qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI MODULE_NAME network QMAKE_LIB gssapi)
+-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE_NAME core QMAKE_LIB gobject)
+-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE_NAME core QMAKE_LIB gio)
++qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE MODULE_NAME core QMAKE_LIB gobject)
++qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE MODULE_NAME core QMAKE_LIB gio)
+ 
+ 
+ #### Tests
diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake
index c6393713a664f1..e8d1fb0a367257 100644
--- a/ports/qtbase/cmake/qt_install_submodule.cmake
+++ b/ports/qtbase/cmake/qt_install_submodule.cmake
@@ -192,6 +192,16 @@ function(qt_cmake_configure)
             QT_SYNCQT
             QT_NO_FORCE_SET_CMAKE_BUILD_TYPE
             ${_qarg_OPTIONS_MAYBE_UNUSED}
+            INPUT_bundled_xcb_xinput
+            INPUT_freetype
+            INPUT_harfbuzz
+            INPUT_libjpeg
+            INPUT_libmd4c
+            INPUT_libpng
+            INPUT_opengl
+            INPUT_openssl
+            INPUT_xcb
+            INPUT_xkbcommon
     )
     set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE)
 endfunction()
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index c7a66c307ed4a5..c2cd75d9c04ab7 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.5.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index 51011f65433256..c6b5c5427a6700 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6654,7 +6654,7 @@
     },
     "qtbase": {
       "baseline": "6.5.0",
-      "port-version": 1
+      "port-version": 2
     },
     "qtcharts": {
       "baseline": "6.5.0",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index a1285aee6ee3cf..1ebe8e2187e4c3 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8a00cef259fdf1a9198f95e0618c98b7f1b21527",
+      "version": "6.5.0",
+      "port-version": 2
+    },
     {
       "git-tree": "a66d81c3d9432499f24c76df346a4daf5725f90b",
       "version": "6.5.0",