[qt5] Update to 5.15.1 #13477

Neumann-A · 2020-09-11T09:27:04Z

Let CI run the build. I currently need my local compute rescources :P

close #13464

…trapping

Neumann-A · 2020-09-14T17:05:41Z

@cenit Since you touched assimp. Are there any optional dependencies in assimp which vcpkg is not aware of?

cenit · 2020-09-14T17:07:10Z

Going by memory, they should be marked as todo in the portfile

Neumann-A · 2020-09-15T19:05:00Z

Just for future reference if there is an issue with qt5-webengine

Starting package 1/1: qt5-webengine:x64-windows
Building package qt5-webengine[core]:x64-windows...
Could not locate cached archive: C:\Users\Alexander\AppData\Local\vcpkg\archives\bf\bf4b76c9792918b20a1e5c9ec9ebe2f7e61b602f.zip
-- qt5-webengine requires a lot of free disk space (>300GB), ram (>32 GB) and time (>4h per configuration) to be successfully build.
-- As such qt5-webengine is not properly tested.
-- If qt5-webengine fails post build validation please open up an issue.
-- If it fails due to post validation the successfully installed files can be found in E:/detect_compiler/packages/qt5-webengine_x64-windows
-- and just need to be copied into E:/detect_compiler/installed/x64-windows
CMake Warning at scripts/cmake/vcpkg_buildpath_length_warning.cmake:4 (message):
  qt5-webengine's buildsystem uses very long paths and may fail on your
  system.

  We recommend moving vcpkg to a short path such as 'C:\src\vcpkg' or using
  the subst command.
Call Stack (most recent call first):
  installed/x64-windows/share/qt5/qt_download_submodule.cmake:13 (vcpkg_buildpath_length_warning)
  installed/x64-windows/share/qt5/qt_submodule_installation.cmake:4 (qt_download_submodule)
  ports/qt5-webengine/portfile.cmake:48 (qt_submodule_installation)
  scripts/ports.cmake:79 (include)


-- Using cached E:/vcpkg_cache/downloads/qtwebengine-everywhere-src-5.15.1.tar.xz
-- Extracting source E:/vcpkg_cache/downloads/qtwebengine-everywhere-src-5.15.1.tar.xz
-- Applying patch common.pri.patch
-- Applying patch gl.patch
-- Using source at E:/detect_compiler/buildtrees/qt5-webengine/src/5.15.1-8798b27a4c.clean
-- Configuring x64-windows-rel
-- Configuring x64-windows-rel done
-- Configuring x64-windows-dbg
-- Configuring x64-windows-dbg done
-- Package build-x64-windows-dbg
-- Package build-x64-windows-rel
-- Package install-x64-windows-dbg
-- Package install-x64-windows-rel
-- Installing: E:/detect_compiler/packages/qt5-webengine_x64-windows/share/qt5-webengine/copyright
-- Performing post-build validation
-- Performing post-build validation done
Stored binary cache: C:\Users\Alexander\AppData\Local\vcpkg\archives\bf\bf4b76c9792918b20a1e5c9ec9ebe2f7e61b602f.zip
Building package qt5-webengine[core]:x64-windows... done
Installing package qt5-webengine[core]:x64-windows...
Installing package qt5-webengine[core]:x64-windows... done
Elapsed time for package qt5-webengine:x64-windows: 4.441 h

Total elapsed time: 4.441 h

The package qt5-webengine:x64-windows provides CMake targets:

    find_package(Qt5Gui CONFIG REQUIRED)
    target_link_libraries(main PRIVATE Qt5::QPdfPlugin)

    find_package(Qt5Pdf CONFIG REQUIRED)
    target_link_libraries(main PRIVATE Qt::Pdf Qt5::Pdf Qt::PdfPrivate Qt5::PdfPrivate)

    find_package(Qt5PdfWidgets CONFIG REQUIRED)
    target_link_libraries(main PRIVATE Qt::PdfWidgets Qt5::PdfWidgets Qt::PdfWidgetsPrivate Qt5::PdfWidgetsPrivate)

    find_package(Qt5WebEngine CONFIG REQUIRED)
    target_link_libraries(main PRIVATE Qt::WebEngine Qt5::WebEngine Qt::WebEnginePrivate Qt5::WebEnginePrivate)

    find_package(Qt5WebEngineCore CONFIG REQUIRED)
    target_link_libraries(main PRIVATE Qt::WebEngineCore Qt5::WebEngineCore Qt::WebEngineCorePrivate Qt5::WebEngineCorePrivate)

    find_package(Qt5WebEngineWidgets CONFIG REQUIRED)
    target_link_libraries(main PRIVATE Qt::WebEngineWidgets Qt5::WebEngineWidgets Qt::WebEngineWidgetsPrivate Qt5::WebEngineWidgetsPrivate)

ports/qt5-3d/portfile.cmake

Neumann-A · 2020-09-29T12:00:34Z

@JackBoosY @ras0219: Somebody needs to fetch the config.log from buildtrees/qt5-3d/<triplet>-<config>/ seems like the changes to assimp in #13264 did not work out as intended

JackBoosY · 2020-10-09T06:21:55Z

/azp run

azure-pipelines · 2020-10-09T06:22:00Z

No pipelines are associated with this pull request.

JackBoosY · 2020-10-10T02:26:47Z

qt5-3d fails on x64-windows-static and x64-linux.

Neumann-A · 2020-10-13T18:21:15Z

@JackBoosY: I need the config.log from <triplet>-(dbg|rel) to see what is wrong. I currently only know that it is assimp related

JackBoosY · 2020-10-14T02:34:41Z

@Neumann-A Sorry, I will test it manually and pick the log to you,

JackBoosY · 2020-10-14T07:10:21Z

Failed with qt5-base:x64-linux on my local machine:

ERROR: Feature 'xcb' was enabled, but the pre-condition 'features.thread && libs.xcb && tests.xcb_syslibs && features.xkbcommon-x11' failed.

Neumann-A · 2020-10-14T07:27:04Z

@JackBoosY that just means you need to install all the system libs CI also installs.

JackBoosY · 2020-10-14T09:12:10Z

@Neumann-A Seems the qt5-imageformats's patch is outdated:

Starting package 3/7: qt5-imageformats:x64-linux
Building package qt5-imageformats[core]:x64-linux...
Could not locate cached archive: /root/.cache/vcpkg/archives/77/7702362a5b4e67f7792f74bf475084f56a7dc632.zip
-- Downloading http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtimageformats-everywhere-src-5.15.1.tar.xz...
-- Extracting source /home/work/13477/vcpkg/downloads/qtimageformats-everywhere-src-5.15.1.tar.xz
-- Applying patch fix-include-math.patch
CMake Error at scripts/cmake/vcpkg_apply_patches.cmake:54 (message):
  Applying patch failed.  Checking patch
  src/plugins/imageformats/jp2/qjp2handler.cpp...

  error: while searching for:

  #include "qcolor.h"



  #include <jasper/jasper.h>



  QT_BEGIN_NAMESPACE





  error: patch failed: src/plugins/imageformats/jp2/qjp2handler.cpp:45

  error: src/plugins/imageformats/jp2/qjp2handler.cpp: patch does not apply

Call Stack (most recent call first):
  scripts/cmake/vcpkg_extract_source_archive_ex.cmake:141 (vcpkg_apply_patches)
  installed/x64-linux/share/qt5/qt_download_submodule.cmake:32 (vcpkg_extract_source_archive_ex)
  installed/x64-linux/share/qt5/qt_submodule_installation.cmake:4 (qt_download_submodule)
  ports/qt5-imageformats/portfile.cmake:54 (qt_submodule_installation)
  scripts/ports.cmake:79 (include)


Error: Building package qt5-imageformats:x64-linux failed with: BUILD_FAILED
Please ensure you're using the latest portfiles with `./vcpkg update`, then
submit an issue at https://github.com/Microsoft/vcpkg/issues including:
  Package: qt5-imageformats:x64-linux
  Vcpkg version: 2020.06.15-unknownhash

Additionally, attach any relevant sections from the log files above.

Neumann-A · 2020-10-14T09:24:04Z

@JackBoosY has there been a merge of a Qt(-imageformats) related PR since 6d77472 (last month)? 75bd2ef was merged 13h ago that is not something I can fight ;). Just remove the patch if it is unnecessary

JackBoosY · 2020-10-16T02:17:31Z

Oh, seems you've correct it.

JackBoosY · 2020-10-16T02:19:06Z

ports/qt5-3d/portfile.cmake

+endif()
+
+find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 


Only one irrelevant question: do you think vcpkg should provide commin function to implement it?

the only thing it removes would be the PATHS arguments. Unless vcpkg provides a more sophisticated function than vcpkg_find_library there is not a lot of benefit. I mean a common function could be used to get all depending libraries which also can be added by features of the depending port. But since vcpkg does not currently store any information on how a port was build in an accessibly way there is no way to implement it unless vcpkg is enabled to be run re-entrant.

This reverts commit aa0ffba.

This reverts commit 1763043.

Neumann-A added 2 commits September 11, 2020 11:25

update everything. Let ci test if just updating is enough

227f054

fix some minor version details.

5b45902

PhoebeHui assigned JackBoosY Sep 11, 2020

PhoebeHui added the category:port-update The issue is with a library, which is requesting update new revision label Sep 11, 2020

Neumann-A added 12 commits September 11, 2020 12:13

remove upstream patch

2e38270

add zstdd patch and do not remove zlib since it is required for boots…

9562486

…trapping

add mqtt hash

b2b79df

webengine hash

593d0d3

add fixup pkgconfig to assimp

5d00cbb

add assimp to qt-3d (still requires zlib fix)

85dac5f

setup pkg-config for qt

d38ad3c

fix psql detection in configure

c59c452

fix build details

3132bdb

fix assimp library nameing

80a124b

-rpath option is not available for static builds

4080f35

move config log somewhere where CI can catch it.

a4c5c9a

Neumann-A added 8 commits September 14, 2020 20:15

move logs only if they exists

a2b264b

append bzip2 qt-3d

260c602

break qt3d again to get logs

c768158

retry qt3d

ca44065

remove qt-3d failure. everything ok now

de673fe

add assistent patch for qt5-tools not building qthelp

fb228c1

remove unnecessary qt5-webengine patches

549b91f

Merge remote-tracking branch 'upstream/master' into update_qt_5.15.1

6d77472

Neumann-A marked this pull request as ready for review September 15, 2020 17:55

JackBoosY approved these changes Sep 16, 2020

View reviewed changes

JackBoosY added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Sep 16, 2020

Neumann-A commented Sep 29, 2020

View reviewed changes

ports/qt5-3d/portfile.cmake Outdated Show resolved Hide resolved

Neumann-A commented Sep 29, 2020

View reviewed changes

ports/qt5-3d/portfile.cmake Outdated Show resolved Hide resolved

[qt5-3d] remove irrxml as a assimp dep

dd9c8ef

JackBoosY added the requires:author-response label Oct 10, 2020

Merge branch 'master' into update_qt_5.15.1

695fa20

Neumann-A and others added 3 commits October 14, 2020 16:08

remove unnecessary patch

4b28132

fix qt-3d on windows

aa1c519

fix qt5-3d linux

b04973d

dan-shaw approved these changes Oct 15, 2020

View reviewed changes

JackBoosY removed the requires:author-response label Oct 16, 2020

JackBoosY reviewed Oct 16, 2020

View reviewed changes

JackBoosY approved these changes Oct 16, 2020

View reviewed changes

JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Oct 16, 2020

dan-shaw merged commit aa0ffba into microsoft:master Oct 17, 2020

Neumann-A deleted the update_qt_5.15.1 branch October 17, 2020 12:01

lijgame added a commit to lijgame/vcpkg that referenced this pull request Oct 18, 2020

Revert "[qt5] Update to 5.15.1 (microsoft#13477)"

1763043

This reverts commit aa0ffba.

lijgame added a commit to lijgame/vcpkg that referenced this pull request Oct 18, 2020

Revert "Revert "[qt5] Update to 5.15.1 (microsoft#13477)""

4644d6f

This reverts commit 1763043.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[qt5] Update to 5.15.1 #13477

[qt5] Update to 5.15.1 #13477

Neumann-A commented Sep 11, 2020 •

edited

Loading

Neumann-A commented Sep 14, 2020

cenit commented Sep 14, 2020

Neumann-A commented Sep 15, 2020

Neumann-A commented Sep 29, 2020

JackBoosY commented Oct 9, 2020

azure-pipelines bot commented Oct 9, 2020

JackBoosY commented Oct 10, 2020

Neumann-A commented Oct 13, 2020

JackBoosY commented Oct 14, 2020

JackBoosY commented Oct 14, 2020

Neumann-A commented Oct 14, 2020

JackBoosY commented Oct 14, 2020

Neumann-A commented Oct 14, 2020

JackBoosY commented Oct 16, 2020

JackBoosY Oct 16, 2020

Neumann-A Oct 16, 2020

		endif()

		find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)

[qt5] Update to 5.15.1 #13477

[qt5] Update to 5.15.1 #13477

Conversation

Neumann-A commented Sep 11, 2020 • edited Loading

Neumann-A commented Sep 14, 2020

cenit commented Sep 14, 2020

Neumann-A commented Sep 15, 2020

Neumann-A commented Sep 29, 2020

JackBoosY commented Oct 9, 2020

azure-pipelines bot commented Oct 9, 2020

JackBoosY commented Oct 10, 2020

Neumann-A commented Oct 13, 2020

JackBoosY commented Oct 14, 2020

JackBoosY commented Oct 14, 2020

Neumann-A commented Oct 14, 2020

JackBoosY commented Oct 14, 2020

Neumann-A commented Oct 14, 2020

JackBoosY commented Oct 16, 2020

JackBoosY Oct 16, 2020

Choose a reason for hiding this comment

Neumann-A Oct 16, 2020

Choose a reason for hiding this comment

Neumann-A commented Sep 11, 2020 •

edited

Loading