Commit Graph

26 Commits

Author SHA1 Message Date
Carsten Grimm
e942f068ed
[qt5-webengine] remove obsolete patches from qt5-webengine ()
* [qt5-webengine] remove build_3.with_missing_stdbool_include.patch from qt5-webengine

* [qt5-webengine] remove workaround-msvc2022-ice.patch from qt5-webengine

* [qt5-webengine] increase port version number

* [qt5-webengine] updated versions to include qt5-webengine port version 5.15.10#1
2023-06-26 22:51:48 -07:00
Osyotr
2e43a34b44
[qt5] Update to 5.15.10 () 2023-06-08 09:55:57 -07:00
Osyotr
a2476c3ed4
[qt5] Update to 5.15.9 () 2023-04-11 22:54:14 -07:00
Carsten Grimm
668bf87fc5
[qt5-webengine] fix issue 30006 missing includes for msvc ()
* [qt5-webengine] add missing includes in third party libraries

This fixes issue . Newer versions of msvc require more includes than previous versions. To accommodate this change, two missing includes are added to the third party libraries chromium and libxml.

* [qt5-webengine] update port number

* [qt5-webengine] restore LF line endings on patch

* [qt5-webengine] re-run vcpkg x-add-version for qt5-webengine port-version 3
2023-04-06 17:27:42 -07:00
Pat Wang
d9fdfc073e
[qt5-webengine] Fix x64-linux-dynamic build error () 2023-03-28 14:53:36 -07:00
Cheney Wang
6382d0d6cc
[qt5-webengine] Fix error LNK1218: warning treated as error ()
Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>
2023-02-27 12:02:46 -08:00
Osyotr
a61e638f3a
[qt5] Update to 5.15.8 () 2023-01-12 15:28:00 -08:00
Osyotr
a71baa4dc7
[qt5] Update to 5.15.7 () 2022-11-01 20:00:58 -07:00
Noah
23905f6f86
[saucer, ereignis] Update saucer port and add ereignis ()
* [saucer] add new port

[saucer] add lockpp dependency

beleg

* [lockpp] add new port

* [saucer] update ref

* [saucer] only support static

* fix: revert cibaseline

* refactor: also disable uwp

* [saucer,lockpp] remove superflous dependencies

* [lockpp] update version

* [saucer] update to 1.0.0

* [saucer] specifiy only static library

* [saucer] bump ref

* [saucer] remove unused dependency

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* [saucer] use vcpkg webview2

* [ereignis] add new port

* [saucer] update port

* [ereignis] fix description

* [saucer] update ref

* [qt5-webengine] use host for nodejs

* [qt5-webengine] bump `port-version`

* [ereignis] remove unused dependency

* [qt5-webengine] revert git-tree of old port

* [ereignis] add empty line

* fix: formatting & versions

* fix: reset modified files

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2022-09-12 14:04:41 -07:00
Osyotr
5d500d15c1
[qt5] Update to 5.15.6 ()
* [qt5] Update to 5.15.6

* Drop icu patch in qt5-tools that has been merged upstream
2022-09-08 11:33:41 -07:00
مهدي شينون (Mehdi Chinoune)
e8c16a3136
[qt5] update to 5.15.5 () 2022-06-20 14:12:25 -07:00
Fei Chong
145848fb45
[qt5-webengine]: fix typo () 2022-05-31 16:17:00 -07:00
Alonso Schaich
63f1d5b4d0
[qt5-webengine] fix nonobvious failure ()
* [qt5-webengine] Manually add nodejs to the path (microsoft#23574)

The build process requires nodejs to be in PATH when webengine is
built, and will build only the pdf-plugin if it's not (see )

* [qt5-webengine] Workaround MSVC2022 Internal Compiler Error
(microsoft#23574)

Add a patch based on
https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/407582
which was merged into upstream. We can't take the upstream patch
directly, because the patch was committed to the chromium
(sub)repository which is a subdirectory in the release zip file, i.e.
I had to modify the pathnames for the patch to apply

* [qt5-webengine] Update diagnostics (microsoft#23574)

I've spotted the linker using 16GB singlehandedly on the release
(opposed to "debug") packaging, and emory consumption was almost
permanently over 32GB while compiling, though peak memory
consumption can be reduced by setting up low values for
VCPKG_MAX_CONCURRENY

Also, reword the build-prefix-too-long message

* [qt5-webengine] Attempt enabling windows ci baselines (microsoft#23574)

* [qt5-webengine] Regenerate version registries (microsoft#23574)

* Also remove out of date comments from ci.baseline.txt referring to deleted lines.

* Revert "Also remove out of date comments from ci.baseline.txt referring to deleted lines."

This reverts commit 7a4d846431.

* [qt5-webengine] Re-add webengine blacklisting to ci.baseline (microsoft#23574)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-05-19 00:23:39 -07:00
Osyotr
81134652a6
[qt5] Update to 5.15.4 ()
* [qt5] Update to 5.15.4
https://lists.qt-project.org/pipermail/development/2022-May/042437.html

* Deprecate "latest" feature
Also update "qt5" port when updating versions

Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com>
2022-05-13 16:51:51 -07:00
LilyWangLL
183ba0e2f4
[qt5-webengine] Fix apply patch failed ()
* [qt5-webengine] Fix apply patch failed

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
2022-03-11 11:35:32 -08:00
Osyotr
ddff8f2cd6
[qt5] Update to 5.15.3 () 2022-03-07 11:27:29 -08:00
Billy O'Neal
b295670e4b
Bulk convert control files. ()
```
function Convert-Control {
    Param($full)
    .\vcpkg.exe format-manifest $full
    $root = $full.Substring(0, $full.Length - 7) # CONTROL
    $new = $root + 'vcpkg.json'
    $content = Get-Content -Raw $new
    $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100
    $oldVersion = $asJson['port-version']
    if ($null -eq $oldVersion) {
        $oldVersionFull = $asJson['version-string']
        Write-Host "Got version $oldVersionFull"
        $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$')
        if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) {
            $newFullVersion = [string]$match.Groups[1].Value
            $oldVersion = [int]$match.Groups[2].Value
            Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion"
            $newVersion = $oldVersion + 1
            $asJson['version-string'] = $newFullVersion
            Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion"
        } else {
            Write-Host "No previous version for $full -- setting 1"
            $newVersion = 1
        }
    } else {
        $newVersion = [int]$oldVersion + 1
        Write-Host "New version for $full : $newVersion"
    }

    $asJson['port-version'] = $newVersion

    $content = ConvertTo-Json $asJson -Depth 100
    Set-Content -Path $new -Value $content
    .\vcpkg.exe format-manifest $new
}

Get-ChildItem ports\CONTROL -Recurse | Foreach-Object {
    Convert-Control $_.FullName
}

git commit -am "this message"
.\vcpkg.exe x-add-version -all
git commit -a --amend
```
2021-09-09 01:24:04 -07:00
Alexander Neumann
ed54efbb16
[qt5-webengine] Fix issues ()
* [qt5-webengine]
 - add feature "proprietary-codecs"
 - fix build error due to internal changes how options are passed.
 - try to fail early on too long build paths instead of late

* comment the ci baseline for x64-windows to actually test it in ci
and only build one configuration to not overstress the ci system

* be less strict about the buildtree path length

* adjust qt5-webengine ci back

* update baseline

* change length error message according to CR.

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* fix version

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-03-30 10:56:00 -07:00
Alexander Neumann
8e926cc06c
[qt5] Update to 5.15.2 ()
* [qt5] Update to 5.15.2
(mqtt currently missing git tag)

* deactivate update of ports

* update version

* reduce port version

* fix typo

* fix patch for linux missing pthread

* fix qt5-tools

* fix qt5-webengine

* add xcb-util to linux provisioning script

* fix version numbers

* fix other typo

* remove new hashes file

* fix latest version info

* switch to vcpkg_from_git
adjust vcpkg_from_git to handle tags.
add OUT_REF for vcpkg_from_git to enable scriptable update of ports

* regenerate docs

* [vcpkg_from_git] new options TAG and OUT_REF
- TAG github tag to checkout
- OUT_REF github commit id related to tag or ref
(useable for automatic updates of ports if used with a version tag)

* Apply suggestions from code review

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* additional changes due to CR

* regenerate docs

* Remove 'Port-Version:0' from qt5-location

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* add all those versions

* fix versions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2021-01-20 12:55:41 -08:00
Alexander Neumann
aa0ffba768
[qt5] Update to 5.15.1 ()
* update everything. Let ci test if just updating is enough

* fix some minor version details.

* remove upstream patch

* add zstdd patch and do not remove zlib since it is required for bootstrapping

* add mqtt hash

* webengine hash

* add fixup pkgconfig to assimp

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

* setup pkg-config for qt

* fix psql detection in configure

* fix build details

* fix assimp library nameing

* -rpath option is not available for static builds

* move config log somewhere where CI can catch it.

* move logs only if they exists

* append bzip2 qt-3d

* break qt3d again to get logs

* retry qt3d

* remove qt-3d failure. everything ok now

* add assistent patch for qt5-tools not building qthelp

* remove unnecessary qt5-webengine patches

* Remove PSQL_TYPES

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

* remove unnecessary patch

* fix qt-3d on windows

* fix qt5-3d linux

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-10-17 02:10:11 -07:00
Alexander Neumann
f7dcd675d0
[qt-webengine] Fix building with vs2017 ()
* [qt5-webengine] fix vs2017 builds. closes 

* remove skip from ci baseline to test changes.

* add src/3rdparty/ subdir to patch

* put webengine back to skip. patch was succesfully applied
2020-08-01 13:48:12 -07:00
Alexander Neumann
3bffe1c049
[qt5] update qt to 5.15 and make ports depend on qt5-base[core]. ()
* [qt5] update qt to 5.15 and make ports depend on qt5-base[core].

* [qt5] update and remove patches

* [baseline] skip qt5-canvas3d due to deprecation

* [qwt] update to 6.1.4 and fix build issues

* [qt5-webengine] remove old patches

* [qwt] fix static patch

* [qt5-location] add a message that the port has a sprious failure

* [qt5-webengine] fix filename of patch

* [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors)

* [qt5-winextras] depend on qt5-base[core]

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* [qt5-base] update latest feature (latest=core)

* [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now

* [qt5-base] make qt5-base fail to get logs.

* [angle] include missing egl sources.

* [qt5-base] patch egl detection logic.

* [baseline] remove qt-x11extras:x64-linux=fail

* [qt5-base] need to be explicit about xcb to build qt5-x11extras

* [CI] add necessary system libraries to linux CI

* [qt5-base] remove comment to retry on linux

* [qt5-base] add static_init patch for MSVC

* [qt5-base] refined workaround to not regress linux and osx due to

* [paraview] remove unnecessary patches with newer qt versions

* [vcpkg/baseline] add webengine back to skip

* [vtk] fix missing include regression using patch from upstream

* [vtk] fix patch

* [qt5-base] replace with patch from upstream

* [paraview] use hdf5 1.10 api.

* [paraview] bump control

* Add more packages to Linux machines.

* [qt5-base] forgot to add the patch

* Delete 6943.diff

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-07-08 15:34:35 -07:00
Billy O'Neal
cc4f93f434
[vcpkg] Rename the msbuild property VcpkgRoot to VcpkgCurrentInstalledDir, and set VcpkgRoot to the expected root instead. () 2020-05-29 16:38:03 -07:00
Alexander Neumann
62d5125c5d
[qt5-webengine] Add dep atlmfc to CONTROL. Fix patches for latest. Add some options on linux ()
* [qt5-webengine] Fix dependencies and patch for latest

* fix latest build and add options to linux build
2020-05-08 11:44:12 -07:00
Alexander Neumann
d682bd79d1
[qt5] fix wrong versions in some CONTROL files () 2020-04-30 17:28:06 -07:00
Alexander Neumann
bb7ccc4b90
[Qt[latest]] Update to 5.14.2 ()
* 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 8b9b188839.

* 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 708d8250d6.

* 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 199a3ef92f

* add messages to qt5-webengine and adjust baseline

* add jpeg and zlib to JASPER_LIBS

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2020-04-23 21:19:45 -07:00