Commit Graph

21 Commits

Author SHA1 Message Date
Thomas Sondergaard
484762d429
[qt5-webengine] Work around mixed protobuf issue (#37044)
On MS Windows qt5-webengine fails to build in a context where protobuf
from vcpkg is also used because it includes the vcpkg supplied version
of protobuf headers when building the Qt part of the code in
qt5-webengine, against the internal copy of Chromium which has used its
older copy of protobuf to generate the headers. The build failure seen
is this:

    FAILED: obj/QtWebEngineCore/browser_message_filter_qt.obj
    ...
    ...

C:\vcpkgroot\qt5-webengine\x64-windows-dbg\src\core\debug\gen\net/third_party/quiche/src/quic/core/proto/cached_network_parameters.pb.h(17):
fatal error C1189: #error: This file was generated by an older version
of protoc which is

To work around this issue we ensure that the path to the chromium
provided version of protobuf is included before the path to the vcpkg
provided includes residing in:

    C:/vcpkgroot/qt5-webengine/x64-windows-dbg/include

Fixes #12150
Fixes #27932
Fixes #34452

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
2024-03-01 14:39:36 -08:00
Thomas Sondergaard
c0af3ec409
[qt5-webengine] add icu and dbus as dependencies (#36974)
These are dependencies that must otherwise be provided by the operating
system. libdbus-1.so, at least on some Linux distributions, depends on
other system provided libraries like liblz4.so, libzstd.so, and
liblzma.so. It was necessary to cherry-pick two patches for the chromium
embedded in qtwebengine to make it build with ICU 74.

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
2024-02-28 17:09:05 -08:00
Dr.-Ing. Carsten Grimm
9d3db6b7e4
[qt5] update to 5.15.12, patch CVE-2023-51714 (#35912)
* [qt5] update version number and hashes

* [qt5-base] add official patch for CVE-2023-51714

* [qt5] regenerate version info
2023-12-28 23:59:20 -08:00
Dr.-Ing. Carsten Grimm
97f6e67666
[qt5] update to 5.15.11 (#34289) 2023-10-05 20:07:02 -07:00
Carsten Grimm
e942f068ed
[qt5-webengine] remove obsolete patches from qt5-webengine (#32219)
* [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 (#31878) 2023-06-08 09:55:57 -07:00
Osyotr
a2476c3ed4
[qt5] Update to 5.15.9 (#30699) 2023-04-11 22:54:14 -07:00
Carsten Grimm
668bf87fc5
[qt5-webengine] fix issue 30006 missing includes for msvc (#30612)
* [qt5-webengine] add missing includes in third party libraries

This fixes issue #30006. 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 (#30412) 2023-03-28 14:53:36 -07:00
Cheney Wang
6382d0d6cc
[qt5-webengine] Fix error LNK1218: warning treated as error (#29827)
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 (#28720) 2023-01-12 15:28:00 -08:00
Osyotr
a71baa4dc7
[qt5] Update to 5.15.7 (#27522) 2022-11-01 20:00:58 -07:00
Noah
23905f6f86
[saucer, ereignis] Update saucer port and add ereignis (#26683)
* [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 (#26715)
* [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 (#25305) 2022-06-20 14:12:25 -07:00
Fei Chong
145848fb45
[qt5-webengine]: fix typo (#25012) 2022-05-31 16:17:00 -07:00
Alonso Schaich
63f1d5b4d0
[qt5-webengine] fix nonobvious failure (#24528)
* [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 #23574)

* [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 (#24660)
* [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 (#23484)
* [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 (#23364) 2022-03-07 11:27:29 -08:00
Billy O'Neal
b295670e4b
Bulk convert control files. (#19986)
```
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