From 02e902e3803f5af92b70b4c6ccc64f23f6d2c7e6 Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Sat, 15 Apr 2023 05:13:05 +0800
Subject: [PATCH] [qtbase/qt5-base] Add more convenient msg about install the
 correct dependencies for Ubuntu (#30854)

* [qtbase/qt5-base] Add more convenient msg about install the correct dependencies for ubuntu

* Add https://doc.qt.io/qt-5/linux-requirements.html back, fix them -> they typo, and wrap.

---------

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/qt5-base/portfile.cmake | 13 +++++--------
 ports/qt5-base/vcpkg.json     |  1 +
 ports/qtbase/portfile.cmake   |  7 +++++++
 ports/qtbase/vcpkg.json       |  2 +-
 versions/baseline.json        |  4 ++--
 versions/q-/qt5-base.json     |  5 +++++
 versions/q-/qtbase.json       |  5 +++++
 7 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index b92543eab5..bda263ff08 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -1,14 +1,11 @@
 vcpkg_buildpath_length_warning(37)
 
 if (VCPKG_TARGET_IS_LINUX)
-    message(WARNING "qt5-base currently requires some packages from the system package manager, see https://doc.qt.io/qt-5/linux-requirements.html")
-    message(WARNING 
-[[
-qt5-base for qt5-x11extras requires several libraries from the system package manager. Please refer to
-  https://github.com/microsoft/vcpkg/blob/master/scripts/azure-pipelines/linux/provision-image.sh
-  for a complete list of them.
-]]
-    )
+    message(WARNING "qt5-base currently requires some packages from the system package manager. "
+    "They can be installed on Ubuntu systems via "
+    "sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev "
+    "libxi-dev libxkbcommon-dev libxkbcommon-x11-dev. For more information, see "
+    "https://doc.qt.io/qt-5/linux-requirements.html")
 elseif(VCPKG_TARGET_IS_MINGW AND CMAKE_HOST_WIN32)
     find_program(MINGW32_MAKE mingw32-make PATHS ENV PATH NO_DEFAULT_PATH REQUIRED)
 endif()
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index 41e76623dd..823aaf4fed 100644
--- a/ports/qt5-base/vcpkg.json
+++ b/ports/qt5-base/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt5-base",
   "version": "5.15.9",
+  "port-version": 1,
   "description": "Qt5 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/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index cb304e1bee..718755cfb7 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -33,6 +33,13 @@ 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)
+    message(WARNING "qtbase currently requires packages from the system package manager. "
+    "They can be installed on Ubuntu systems via sudo apt-get install " 
+    "'^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev "
+    "libxkbcommon-x11-dev.")
+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
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 7523c8a31a..be16a2a56b 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.4.3",
-  "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 1745b428ae..dc7034f4e8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6426,7 +6426,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.9",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-canvas3d": {
       "baseline": "0",
@@ -6598,7 +6598,7 @@
     },
     "qtbase": {
       "baseline": "6.4.3",
-      "port-version": 1
+      "port-version": 2
     },
     "qtcharts": {
       "baseline": "6.4.3",
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index 55683622d2..fdcbecce51 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "11985a25ce0eb80b4a66246fc5962140f454225f",
+      "version": "5.15.9",
+      "port-version": 1
+    },
     {
       "git-tree": "0dbe8668bfb03c43ce4fec9edf98da248e581774",
       "version": "5.15.9",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index a86ea78690..c3cb70e889 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b694b6e51c89c8610540165e6e8b3a236acb4301",
+      "version": "6.4.3",
+      "port-version": 2
+    },
     {
       "git-tree": "425f6dcfce1eadab0723c4ec5e9085da0272ab6d",
       "version": "6.4.3",