From 5b55ba9daba082460b99056602c1067afd4e0c45 Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Fri, 17 May 2024 12:06:28 -0700
Subject: [PATCH] [vcpkg baseline][qt5-base] Add option disable feature gssapi
 to fix ci baseline (#38670)

Fixes regression:
https://dev.azure.com/vcpkg/public/_build/results?buildId=102737&view=results
````
REGRESSION: lunarg-vulkantools:x64-linux failed with BUILD_FAILED
REGRESSION: qt5-serialbus:x64-linux failed with BUILD_FAILED
````
Error:
````
/usr/bin/ld: /mnt/vcpkg-ci/b/krb5/x64-linux-dbg/lib/gssapi/krb5/../../.././../src/krb5-1-8a38cd677f.clean/src/lib/gssapi/krb5/export_name.c:61: undefined reference to `krb5_free_context'
````
Add option _--gssapi=no_ to disable use feature gssapi
Remove
````
lunarg-vulkantools:x64-linux=fail
qt5-serialbus:x64-linux=fail
````
from ci.baseline.txt
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [ ] ~~SHA512s are updated for each updated download.~~
- [ ] ~~The "supports" clause reflects platforms that may be fixed by
this new version.~~
- [ ] ~~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~~
- [ ] ~~Any patches that are no longer applied are deleted from the
port's directory.~~
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

---------

Co-authored-by: Jon <v-zhli17@microsoft.com>
---
 ports/qt5-base/portfile.cmake | 1 +
 ports/qt5-base/vcpkg.json     | 2 +-
 scripts/ci.baseline.txt       | 2 --
 versions/baseline.json        | 2 +-
 versions/q-/qt5-base.json     | 5 +++++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index d4065340f9..e680bef6ae 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -119,6 +119,7 @@ list(APPEND CORE_OPTIONS
     -no-angle # Qt does not need to build angle. VCPKG will build angle!
     -no-glib
     -openssl-linked
+    -no-feature-gssapi
     )
 
 if(WITH_PGSQL_PLUGIN)
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index 9caaec15be..9eb155bc89 100644
--- a/ports/qt5-base/vcpkg.json
+++ b/ports/qt5-base/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-base",
   "version": "5.15.13",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt Base provides the basic non-GUI functionality required by all Qt applications.",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 659ce47573..c3a3abdca2 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -672,8 +672,6 @@ log4cpp:x64-linux=fail # dynamic exception specifications
 loguru:arm-neon-android=fail
 loguru:arm64-android=fail
 loguru:x64-android=fail
-lunarg-vulkantools:x64-linux=fail
-qt5-serialbus:x64-linux=fail
 magma:x64-linux=fail
 mchehab-zbar:arm-neon-android=fail
 mchehab-zbar:arm64-android=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index b5095b3ed1..f61b376eef 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7150,7 +7150,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.13",
-      "port-version": 1
+      "port-version": 2
     },
     "qt5-canvas3d": {
       "baseline": "0",
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index 7cfe841e53..79fb99d9dc 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "89570374cb1b5f83ecad6775121eb06e68b02495",
+      "version": "5.15.13",
+      "port-version": 2
+    },
     {
       "git-tree": "0a70734eb07533aeba97b75a928fdf8a47d1e1d3",
       "version": "5.15.13",