diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index bda263ff08..8e0b300aa8 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_buildpath_length_warning(37) -if (VCPKG_TARGET_IS_LINUX) +if(VCPKG_TARGET_IS_LINUX) 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 " + "sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libgl1-mesa-dev libxrender-dev " "libxi-dev libxkbcommon-dev libxkbcommon-x11-dev. For more information, see " - "https://doc.qt.io/qt-5/linux-requirements.html") + "https://doc.qt.io/qt-5/linux.html and 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() @@ -264,9 +265,6 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() elseif(VCPKG_TARGET_IS_LINUX) list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -xcb -linuxfb) - if (NOT EXISTS "/usr/include/GL/glu.h") - message(FATAL_ERROR "qt5 requires libgl1-mesa-dev and libglu1-mesa-dev, please use your distribution's package manager to install them.\nExample: \"apt-get install libgl1-mesa-dev libglu1-mesa-dev\"") - endif() list(APPEND RELEASE_OPTIONS "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}" diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 823aaf4fed..09f19cc1de 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version": "5.15.9", - "port-version": 1, + "port-version": 2, "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/versions/baseline.json b/versions/baseline.json index b6b6a0f755..e51565f78e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6466,7 +6466,7 @@ }, "qt5-base": { "baseline": "5.15.9", - "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 fdcbecce51..8c462bbda1 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1137d1509e996fa4bde14ec310c6955b50408c8a", + "version": "5.15.9", + "port-version": 2 + }, { "git-tree": "11985a25ce0eb80b4a66246fc5962140f454225f", "version": "5.15.9",