From 29be953b1f0ace51f42acb3029ff693b32521712 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Sun, 23 Oct 2022 18:47:52 +0200
Subject: [PATCH 01/18] [qtbase] support for android

---
 ports/qtbase/portfile.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index 0c923dab304c57..ddec8221abc0d8 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -31,6 +31,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES)
     message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" )
 endif()
 
+if(VCPKG_TARGET_IS_LINUX AND NOT ANDROID_SDK_ROOT)
+    message(FATAL_ERROR "${PORT} requires ANDROID_SDK_ROOT to be set. Consider adding it to the triplet." )
+endif()
 # Features can be found via searching for qt_feature in all configure.cmake files in the source:
 # The files also contain information about the Platform for which it is searched
 # Always use FEATURE_<feature> in vcpkg_cmake_configure
@@ -274,6 +277,7 @@ qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                         -DFEATURE_debug:BOOL=ON
                      CONFIGURE_OPTIONS_MAYBE_UNUSED
                         FEATURE_appstore_compliant # only used for android/ios
+                        -DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
                     )
 
 # Install CMake helper scripts

From 1108003612f343ce984a72416e6ac60fce8a6858 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Mon, 24 Oct 2022 08:21:58 +0200
Subject: [PATCH 02/18] Fix opengl on android

---
 ports/qtbase/portfile.cmake |  8 +++++---
 ports/qtbase/vcpkg.json     | 11 +++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index ddec8221abc0d8..65ca0f7acf58a8 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -31,7 +31,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES)
     message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" )
 endif()
 
-if(VCPKG_TARGET_IS_LINUX AND NOT ANDROID_SDK_ROOT)
+if(VCPKG_TARGET_IS_ANDROID AND NOT ANDROID_SDK_ROOT)
     message(FATAL_ERROR "${PORT} requires ANDROID_SDK_ROOT to be set. Consider adding it to the triplet." )
 endif()
 # Features can be found via searching for qt_feature in all configure.cmake files in the source:
@@ -196,7 +196,9 @@ list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libdrm:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_gbm:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libinput:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Mtdev:BOOL=ON)
-list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GLESv2:BOOL=ON) # only used if INPUT_opengl is correctly set
+if(NOT VCPKG_TARGET_IS_ANDROID)
+    list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GLESv2:BOOL=ON) # only used if INPUT_opengl is correctly set
+endif()
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON)
 # sql-drivers features:
 
@@ -272,12 +274,12 @@ qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                         -DINPUT_bundled_xcb_xinput:STRING=no
                         -DFEATURE_force_debug_info:BOOL=ON
                         -DFEATURE_relocatable:BOOL=ON
+                        -DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                         -DFEATURE_debug:BOOL=ON
                      CONFIGURE_OPTIONS_MAYBE_UNUSED
                         FEATURE_appstore_compliant # only used for android/ios
-                        -DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
                     )
 
 # Install CMake helper scripts
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 787bdb96ad364e..16023c750ca485 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -121,6 +121,17 @@
             "xrender"
           ],
           "platform": "linux"
+        },
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "fontconfig",
+            "xcb",
+            "xcb-xlib",
+            "xrender"
+          ],
+          "platform": "android"
         }
       ]
     },

From a45973a316ee211da359ccdbe0b038c555e1d694 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Mon, 24 Oct 2022 09:05:58 +0200
Subject: [PATCH 03/18] Make gles a feature

---
 ports/qtbase/portfile.cmake | 4 +---
 ports/qtbase/vcpkg.json     | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index 65ca0f7acf58a8..f9b76f8fc86287 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -164,6 +164,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
     INVERTED_FEATURES
     "vulkan"              CMAKE_DISABLE_FIND_PACKAGE_Vulkan
     "egl"                 CMAKE_DISABLE_FIND_PACKAGE_EGL
+    "gles"                CMAKE_DISABLE_FIND_PACKAGE_GLESv2
     "fontconfig"          CMAKE_DISABLE_FIND_PACKAGE_Fontconfig
     #"freetype"            CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated
     "harfbuzz"            CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz
@@ -196,9 +197,6 @@ list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libdrm:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_gbm:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libinput:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Mtdev:BOOL=ON)
-if(NOT VCPKG_TARGET_IS_ANDROID)
-    list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GLESv2:BOOL=ON) # only used if INPUT_opengl is correctly set
-endif()
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON)
 # sql-drivers features:
 
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 16023c750ca485..6a9b1ca4f67ca3 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -126,6 +126,7 @@
           "name": "qtbase",
           "default-features": false,
           "features": [
+            "gles",
             "fontconfig",
             "xcb",
             "xcb-xlib",
@@ -147,6 +148,9 @@
         "egl-registry"
       ]
     },
+    "gles": {
+      "description": "GLES"
+    },
     "fontconfig": {
       "description": "Use fontconfig",
       "dependencies": [

From d36f61121e36806ad08945281e5730247f99bd99 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Mon, 24 Oct 2022 21:40:18 +0200
Subject: [PATCH 04/18] Adjust android dependencies

---
 ports/qtbase/vcpkg.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 6a9b1ca4f67ca3..c0273a06e26e11 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.3.2",
-  "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,
@@ -127,10 +127,7 @@
           "default-features": false,
           "features": [
             "gles",
-            "fontconfig",
-            "xcb",
-            "xcb-xlib",
-            "xrender"
+            "egl"
           ],
           "platform": "android"
         }

From 13fc829ede159a17a0be73c974da28ced50d5af6 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Mon, 24 Oct 2022 21:42:38 +0200
Subject: [PATCH 05/18] v.db

---
 ports/qtbase/vcpkg.json | 10 +++++-----
 versions/baseline.json  |  2 +-
 versions/q-/qtbase.json |  5 +++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index c0273a06e26e11..b8c4f8e835a352 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -126,8 +126,8 @@
           "name": "qtbase",
           "default-features": false,
           "features": [
-            "gles",
-            "egl"
+            "egl",
+            "gles"
           ],
           "platform": "android"
         }
@@ -145,9 +145,6 @@
         "egl-registry"
       ]
     },
-    "gles": {
-      "description": "GLES"
-    },
     "fontconfig": {
       "description": "Use fontconfig",
       "dependencies": [
@@ -174,6 +171,9 @@
         }
       ]
     },
+    "gles": {
+      "description": "GLES"
+    },
     "glib": {
       "description": "GLib",
       "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 32b4280b1759e8..39f76e9c1df1a2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6210,7 +6210,7 @@
     },
     "qtbase": {
       "baseline": "6.3.2",
-      "port-version": 1
+      "port-version": 2
     },
     "qtcharts": {
       "baseline": "6.3.2",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 485b73889718e8..37bbf0c7437f59 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4e4cb7e313bfe162ad327407cc6757ceb7ed039f",
+      "version": "6.3.2",
+      "port-version": 2
+    },
     {
       "git-tree": "02656542bbdef8469f5a461b1523c4111f0841b3",
       "version": "6.3.2",

From db991661bc28a6d597a727d29b737a620bbb6ab6 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Mon, 24 Oct 2022 22:53:56 +0200
Subject: [PATCH 06/18] Make ANDROID_SDK_ROOT available to all qt* ports

---
 ports/qtbase/cmake/qt_install_submodule.cmake | 5 +++++
 ports/qtbase/portfile.cmake                   | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake
index d5bd93f847d7a6..539444f2b464c9 100644
--- a/ports/qtbase/cmake/qt_install_submodule.cmake
+++ b/ports/qtbase/cmake/qt_install_submodule.cmake
@@ -8,6 +8,10 @@ if(NOT DEFINED QT6_DIRECTORY_PREFIX)
     set(QT6_DIRECTORY_PREFIX "Qt6/")
 endif()
 
+if(VCPKG_TARGET_IS_ANDROID AND NOT ANDROID_SDK_ROOT)
+    message(FATAL_ERROR "${PORT} requires ANDROID_SDK_ROOT to be set. Consider adding it to the triplet." )
+endif()
+
 function(qt_download_submodule_impl)
     cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "SUBMODULE" "PATCHES")
 
@@ -123,6 +127,7 @@ function(qt_cmake_configure)
             -DINSTALL_LIBEXECDIR:STRING=bin
             -DINSTALL_PLUGINSDIR:STRING=${qt_plugindir}
             -DINSTALL_QMLDIR:STRING=${qt_qmldir}
+            -DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
             ${_qarg_OPTIONS}
         OPTIONS_RELEASE
             ${_qarg_OPTIONS_RELEASE}
diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index f9b76f8fc86287..d3640c925e6b2c 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -31,9 +31,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES)
     message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" )
 endif()
 
-if(VCPKG_TARGET_IS_ANDROID AND NOT ANDROID_SDK_ROOT)
-    message(FATAL_ERROR "${PORT} requires ANDROID_SDK_ROOT to be set. Consider adding it to the triplet." )
-endif()
 # Features can be found via searching for qt_feature in all configure.cmake files in the source:
 # The files also contain information about the Platform for which it is searched
 # Always use FEATURE_<feature> in vcpkg_cmake_configure
@@ -272,7 +269,6 @@ qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                         -DINPUT_bundled_xcb_xinput:STRING=no
                         -DFEATURE_force_debug_info:BOOL=ON
                         -DFEATURE_relocatable:BOOL=ON
-                        -DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                         -DFEATURE_debug:BOOL=ON

From b1381c1aa3fb44b9ed67b613c8a7204cda7b21ea Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Mon, 24 Oct 2022 22:54:06 +0200
Subject: [PATCH 07/18] v db

---
 versions/q-/qtbase.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 37bbf0c7437f59..1731e9a8af506e 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "4e4cb7e313bfe162ad327407cc6757ceb7ed039f",
+      "git-tree": "10513a054c0735740c8dec4b46944d0e306036cf",
       "version": "6.3.2",
       "port-version": 2
     },

From 6101604ba576ea08459b3f807ea96252e1046025 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Mon, 24 Oct 2022 23:01:52 +0200
Subject: [PATCH 08/18] naming and feature

---
 ports/qtbase/portfile.cmake | 3 ++-
 ports/qtbase/vcpkg.json     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index d3640c925e6b2c..9c7c3b4b1f37c2 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -146,6 +146,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
     "xkbcommon-x11"       FEATURE_xkbcommon_x11
     "xrender"             FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled. 
     "xrender"             FEATURE_xcb_native_painting # experimental
+    "gles2"               FEATURE_opengles2
     #"vulkan"              CMAKE_REQUIRE_FIND_PACKAGE_Vulkan
     #"egl"                 CMAKE_REQUIRE_FIND_PACKAGE_EGL
     #"fontconfig"          CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig
@@ -161,7 +162,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
     INVERTED_FEATURES
     "vulkan"              CMAKE_DISABLE_FIND_PACKAGE_Vulkan
     "egl"                 CMAKE_DISABLE_FIND_PACKAGE_EGL
-    "gles"                CMAKE_DISABLE_FIND_PACKAGE_GLESv2
+    "gles2"               CMAKE_DISABLE_FIND_PACKAGE_GLESv2
     "fontconfig"          CMAKE_DISABLE_FIND_PACKAGE_Fontconfig
     #"freetype"            CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated
     "harfbuzz"            CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index b8c4f8e835a352..67febe31b270ee 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -127,7 +127,7 @@
           "default-features": false,
           "features": [
             "egl",
-            "gles"
+            "gles2"
           ],
           "platform": "android"
         }
@@ -171,8 +171,8 @@
         }
       ]
     },
-    "gles": {
-      "description": "GLES"
+    "gles2": {
+      "description": "OpenGL ES 2.0"
     },
     "glib": {
       "description": "GLib",

From 776d30f2b10170f8bbcc5f3a002d6ac005cd6397 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Mon, 24 Oct 2022 23:02:03 +0200
Subject: [PATCH 09/18] v db

---
 versions/q-/qtbase.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 1731e9a8af506e..b102115e646b96 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "10513a054c0735740c8dec4b46944d0e306036cf",
+      "git-tree": "a73f5a5636e38062618122a2fdeb04ca3983e078",
       "version": "6.3.2",
       "port-version": 2
     },

From bedebe10bbd087a4b88ef99acabd7ef24e079501 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 27 Oct 2022 11:39:19 +0200
Subject: [PATCH 10/18] Gate gles2 `!windows`

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
---
 ports/qtbase/vcpkg.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 67febe31b270ee..0eb2ce03444d9f 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -172,7 +172,8 @@
       ]
     },
     "gles2": {
-      "description": "OpenGL ES 2.0"
+      "description": "OpenGL ES 2.0",
+      "supports": "!windows"
     },
     "glib": {
       "description": "GLib",

From 89898a0906e5f061e9f93ee5f387cd0d1e3ba17e Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 27 Oct 2022 11:39:35 +0200
Subject: [PATCH 11/18] v db

---
 versions/q-/qtbase.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index b102115e646b96..8d6495f1339b81 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "a73f5a5636e38062618122a2fdeb04ca3983e078",
+      "git-tree": "8ad3353bcbf1d136924320f36d8879e1acb0e3c3",
       "version": "6.3.2",
       "port-version": 2
     },

From 21fe4ec680c0a5ab1d2399212a93e6c217e3f2cd Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 27 Oct 2022 11:40:48 +0200
Subject: [PATCH 12/18] !linux

---
 ports/qtbase/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 0eb2ce03444d9f..4852230e0e8c27 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -173,7 +173,7 @@
     },
     "gles2": {
       "description": "OpenGL ES 2.0",
-      "supports": "!windows"
+      "supports": "!windows & !linux"
     },
     "glib": {
       "description": "GLib",

From 703fbc4c6b5cca9c6d447614779aa76345cca86a Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 27 Oct 2022 11:40:58 +0200
Subject: [PATCH 13/18] v db

---
 versions/q-/qtbase.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 8d6495f1339b81..0f224029eb6904 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "8ad3353bcbf1d136924320f36d8879e1acb0e3c3",
+      "git-tree": "ed115d166d2f9058e10382dc35b01bb7b4ec9b36",
       "version": "6.3.2",
       "port-version": 2
     },

From 8d3d90f3ab0127e88f1f33e48d6e03cba2e4c580 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Fri, 28 Oct 2022 09:30:27 +0200
Subject: [PATCH 14/18] add qtbase[gles2] to ci for linux

---
 ports/qt/vcpkg.json     | 7 +++++++
 ports/qtbase/vcpkg.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
index 92d6cc72d27b9b..02ef113ab40e85 100644
--- a/ports/qt/vcpkg.json
+++ b/ports/qt/vcpkg.json
@@ -196,6 +196,13 @@
           ],
           "platform": "windows"
         },
+        {
+          "name": "qtbase",
+          "features": [
+            "gles2"
+          ],
+          "platform": "linux"
+        },
         {
           "name": "qtwayland",
           "features": [
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 4852230e0e8c27..0eb2ce03444d9f 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -173,7 +173,7 @@
     },
     "gles2": {
       "description": "OpenGL ES 2.0",
-      "supports": "!windows & !linux"
+      "supports": "!windows"
     },
     "glib": {
       "description": "GLib",

From 7c865ff819e5d90dadcb49b80ced25d5db9e733e Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Fri, 28 Oct 2022 09:31:09 +0200
Subject: [PATCH 15/18] v db

---
 versions/q-/qt.json     | 2 +-
 versions/q-/qtbase.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/q-/qt.json b/versions/q-/qt.json
index 61b1037e7fd9ab..9f6ce7842fc256 100644
--- a/versions/q-/qt.json
+++ b/versions/q-/qt.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "dc6a4c7e1ff449ba08297582c31a2add75d1d87b",
+      "git-tree": "3d1f292c90218f1cf71b84cfba2ec4b8a741b90b",
       "version": "6.3.2",
       "port-version": 1
     },
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 0f224029eb6904..8d6495f1339b81 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "ed115d166d2f9058e10382dc35b01bb7b4ec9b36",
+      "git-tree": "8ad3353bcbf1d136924320f36d8879e1acb0e3c3",
       "version": "6.3.2",
       "port-version": 2
     },

From 87dd083fc0f7aaace0416851b009c14e5e4d341a Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Fri, 28 Oct 2022 10:52:24 +0200
Subject: [PATCH 16/18] disable opengl_desktop if gles2 is set

---
 ports/qtbase/portfile.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index 9c7c3b4b1f37c2..c7a967cbf27404 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -163,6 +163,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
     "vulkan"              CMAKE_DISABLE_FIND_PACKAGE_Vulkan
     "egl"                 CMAKE_DISABLE_FIND_PACKAGE_EGL
     "gles2"               CMAKE_DISABLE_FIND_PACKAGE_GLESv2
+    "gles2"               FEATURE_opengl_desktop
     "fontconfig"          CMAKE_DISABLE_FIND_PACKAGE_Fontconfig
     #"freetype"            CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated
     "harfbuzz"            CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz

From c597a20e19c5ef241bdccdf9f1c5245a0f0ed339 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Fri, 28 Oct 2022 10:55:57 +0200
Subject: [PATCH 17/18] disable gles3

---
 ports/qtbase/portfile.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index c7a967cbf27404..98084e056f2df9 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -188,7 +188,11 @@ if("xkb" IN_LIST FEATURES)
 else()
     list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xkbcommon=no)
 endif()
-list(APPEND FEATURE_GUI_OPTIONS )
+
+# Disable GLES3
+list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles3:BOOL=OFF)
+list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles31:BOOL=OFF)
+list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles32:BOOL=OFF)
 
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ATSPI2:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_DirectFB:BOOL=ON)

From 7d6c17ee4bc0146a76b85aba7f347be84b2b2105 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Fri, 28 Oct 2022 10:56:07 +0200
Subject: [PATCH 18/18] v db

---
 versions/q-/qtbase.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 8d6495f1339b81..c8057dc4b6cd60 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "8ad3353bcbf1d136924320f36d8879e1acb0e3c3",
+      "git-tree": "fdd5dc4e0a94cae2b27acd08ea0c4a7453a6519d",
       "version": "6.3.2",
       "port-version": 2
     },