diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-04-24 06:19:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 21:19:45 -0700 |
| commit | bb7ccc4b90d68c62c0b120f12fed654b7768fced (patch) | |
| tree | 2ffebf39c541d3344b15ef682c1d8bfe05438643 /scripts | |
| parent | ed9511fcf6d6fd6ab1358db7d19b5fee7cbda05c (diff) | |
| download | vcpkg-bb7ccc4b90d68c62c0b120f12fed654b7768fced.tar.gz vcpkg-bb7ccc4b90d68c62c0b120f12fed654b7768fced.zip | |
[Qt[latest]] Update to 5.14.2 (#10644)
* make qt5 all features and add the missing qt modules
* fix control
* qt5 webengine enviromnent setup
* copy qtminimal plugin to tools
* add opengles3 option for testing
* [qt5-imageformats] freeglut is not a dependency on osx
* [qt5-base] fontconfig can require iconv on linux and osx
* include the jasper fix to get CI coverage?
* trying to get ci coverage for qt on osx
* Revert "trying to get ci coverage for qt on osx"
This reverts commit 8b9b188839ec90c25b54b49d17cf03c50987a49b.
* apply the correct ci hack
* fix wrapper to include macosx debug suffix
* update baseline
* first try to fix the Qt5 cmake configs at the root.
* fix missing backslash
* fix plugin patch
* fix qt config patch
* remove 90% of fixcmake.py
* update baseline
* experimental removal of fixcmake.py and dll copying into tools/qt5/bin
* fix experimental dll copying.
* fix static windows builds
* fix static builds
* fix plugin copy
* add quotes around configuration to make it work
* remove dll debug messages
* note about the cmake fix
* revert fontconfig changes on linux. Make qt.conf relative and not absolute
* make qt.conf relative
* trying to fix ogre osx ci regression
* fix silly path error
* Revert "trying to fix ogre osx ci regression"
This reverts commit 708d8250d6eae81bb9a030ff7edef22d2ea1e67c.
* add ogre:x64-osx=fail to CI baseline
* retry on osx
* fix configure error. since in qt5-base everything is in the package directory and not in the installed
* revert change to ci.baseline
* update ci baseline
* update Qt Control fields
* update qt hashes to 5.12.7
* update baseline
update missing hashes
update empty include/packages
add info for placeholder ports not yet correctly working (e.g. qt5-wayland)
* fix linux qt targets not having debug properties.
* remove most of the wrapper
* actual forgot to commit the prl parser
* fix the config a bit differently. have to check linux configs again
* add xlib patch.
* make qt-base fail to get logs on linux
* Need logs from qt5-base
* update versions I missed
* ws change
* lets see if this is enough to make qt5-x11extras happy
* add upstream patch.
* add newline to patch
* ws change to trigger rebuild and maybe get logs on osx failure
* need generated cmakescripts to check linkage.
* rename cmake files to end on .log so that i can inspect them after CI failure
* fix patch
* make qt run
* androidextras only supports android
* qt5-doc will only be build on linux
* ws ci trigger due to download failure
* WS to retrigger CI due to download failure
* add code for debug tools
* lets see if we can do it with only the release tools
* update baseline
* fix create link error on linx
* update baseline
* revert changes which tried to use release tools only
* fix dependencies
* add debug qt.conf
* add another copyright install
* qtdoc does not have any include files
* fix wrong copy pasta
* update latest port hashes.
* make the patches versions dependent
* cleanup qt5 control a bit
* update qt5-base control for ci run to use latest
* fix patches for latest
* forgot to commit the portfile changes
* fix imageformat dependencies for latest qt
* update last hash
* fix translations dependencies
* get cmake scripts from CI
* new patch for creating correct configs
* patch precompiled headers away from qt5-webengine
* fix patch for 5.12.7. (Patch was for 5.14.1)
* trigger CI rebuild
* add simple gl path to fix the chormium build error
* comment out debug message from prl parser
* bump control
* update webengine control
* update CI to skip webengine.
* update baseline
* ws change to osg-qt
* remove kd-soap from faillist
* reset ci baseline to upstream/master
* update baseline
* fix osg-qt?
* skip ms-angle on osx and linux since the normal angle port should be used!
* update ci baseline
* try adding fontconfig manually
* update ci baseline to remove osg-qt for the time being
* remove manual library.
* remove wrapper and get plugin info also from linux and osx
* allow build of complete qt
* fix missing parameter in populate plugin.
* need more info from CI
* fix foreach CI loop
* comment out CI code colllection to make a full qt5 ci run
* fix qt5-imageformats regression on linux
* update baseline
* - add patch to find the debug library
- manually fix EGL path in Qt5GuiConfigExtras.cmake
* bump control
* update hashes to 5.14.2
* comment out messages for debugging
* bump version in control
* fix create cmake patch
* add qtmain path corrections for single configuration build.
* fix escaping of . in regex
* remove one to many \\
* remove latest as a default feature
* reenable messages to debug osg-qt issue on osx.
* small cmake options details.
might need to patch cmakelists.txt if this is not working
* remove unnecessary comment
* make prl parser silent again.
* remove canvas3d from the default features since it has been deprecated and will be removed in the future
* remove ws change
* remove newline and ws
* trigger ci test
* revert 199a3ef92f83775a61bd0f9beee0c48698bff1b6
* add messages to qt5-webengine and adjust baseline
* add jpeg and zlib to JASPER_LIBS
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 274af8198..5287169bf 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1125,7 +1125,7 @@ mpir:arm64-windows=fail mpir:arm-uwp=fail
mpir:x64-uwp=fail
-#Conflicts with angle
+#Conflicts with angle and qt-5base
ms-angle:arm64-windows = skip
ms-angle:arm-uwp = skip
ms-angle:x64-linux = skip
@@ -1327,9 +1327,6 @@ osgearth:x64-osx=fail osgearth:x64-linux=fail
osgearth:x64-windows-static=fail
osg-qt:x64-windows-static=fail
-# Missing Fontconfig linkage in vcpkg_cmake_wrapper. Will be fixed by #9860 with the removal of the wrapper.
-osg-qt:x64-osx=fail
-osg-qt:x64-linux=ignore
otl:x64-windows=ignore
otl:x64-windows-static=ignore
otl:x64-uwp=ignore
@@ -1501,8 +1498,28 @@ qt5-macextras:x64-linux=fail qt5-macextras:x64-windows=fail
qt5-macextras:x64-windows-static=fail
qt5-macextras:x86-windows=fail
+# Missing system libraries
+qt5-wayland:x64-osx=fail
+# Missing libraries
+qt5-wayland:x86-windows=fail
+qt5-wayland:x64-windows=fail
+qt5-wayland:x64-windows-static=fail
qt5-winextras:x64-linux=fail
qt5-winextras:x64-osx=fail
+# Too big for CI.
+qt5-webengine:x64-windows=skip
+qt5-webengine:x86-windows=skip
+# Missing prerequisites for CI success
+qt5-webengine:x64-linux=fail
+qt5-webengine:x64-osx=fail
+# Static builds of qt5-webengine are not supported by the port itself
+qt5-webengine:x64-windows-static=skip
+# Missing system libraries
+qt5-x11extras:x64-osx=fail
+# Missing libraries
+qt5-x11extras:x86-windows=fail
+qt5-x11extras:x64-windows=fail
+qt5-x11extras:x64-windows-static=fail
quickfast:x64-linux=ignore
quickfix:x64-linux=ignore
quickfix:x64-windows=ignore
|
