diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-08-02 10:08:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-02 10:08:07 -0700 |
| commit | 1c2af994151fb3e177df54f89223b056ecddbcec (patch) | |
| tree | 263cdf1db448c2a0610191922c7c6036c4a4b366 /ports/qt5/CONTROL | |
| parent | c0f23c6c31ea7af5a751ea48a043dc64a872f4a0 (diff) | |
| download | vcpkg-1c2af994151fb3e177df54f89223b056ecddbcec.tar.gz vcpkg-1c2af994151fb3e177df54f89223b056ecddbcec.zip | |
[vcpkg format-manifest] Add convert-control flag (#12471)
* [vcpkg format-manifest] initial convert-control attempt
TODO: manifest comments! we should keep $directives
* Finalize x-format-manifest
First, fix Json::parse -- "\c", for any c, was incorrectly parsed.
It would emit the escaped character, and then parse the character, so
that `\b` would give you { '\b', 'b' }.
Second, canonicalize source paragraphs as we're parsing them. This found
an error in qt5 -- The `declarative` feature was listed twice, and we
now catch it, so I removed the second paragraph.
Add PlatformExpression::complexity to allow ordering platform
expressions in a somewhat reasonable way.
Notes:
- We allow `all_modules` as a feature name for back-compat with
paraview
- In order to actually convert CONTROL to vcpkg.json, we'd need to
rename the qt5 `default` feature.
- We need to add support for $directives in x-format-manifest
* fix qt5 port
* format
* fix compile
* fix tests for canonicalization
* Clean up code
* add error message for nothing to format
* add extra_info field
* add `const X&` overloads for `Object::insert[_or_replace]`
* fix compile
* simple CRs
* add tests
* format
* Fix mosquitto port file
also unmerge a line
* fail the tests on malformed manifest
* fix format_all
* fix coroutine port-version
* format manifests
Diffstat (limited to 'ports/qt5/CONTROL')
| -rw-r--r-- | ports/qt5/CONTROL | 75 |
1 files changed, 34 insertions, 41 deletions
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index 0f5121a28..2b06636e7 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,9 +1,10 @@ Source: qt5 Version: 5.15.0 +Port-Version: 1 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Build-Depends: qt5-base[core] -Default-Features: essentials, default +Default-Features: essentials Feature: essentials Build-Depends: qt5[core, tools, networkauth, quickcontrols2, multimedia, imageformats, declarative, svg, activeqt] @@ -13,29 +14,25 @@ Feature: latest Build-Depends: qt5-base[core, latest] Description: Build latest qt version (5.14.2) instead of LTS -Feature: default -Build-Depends: qt5[core, 3d, webchannel, websockets, extras, sensors, serialport, speech, virtualkeyboard, purchasing, scxml, charts, datavis3d, gamepad, graphicaleffects, location, webglplugin, webview, translations, remoteobjects, connectivity] -Description: Build the essential qt modules - Feature: all Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, serialbus, translations, doc, remoteobjects, connectivity], qt5[core,webengine] (!static), qt5[core,wayland] (!windows) Description: Install all Qt5 submodules (Warning: Could take a long time and fail...) Feature: extras Build-Depends: qt5-winextras (windows), qt5-macextras (osx), qt5-x11extras (linux), qt5-androidextras (android) -Description: +Description: Feature: 3d Build-Depends: qt5-3d -Description: +Description: Feature: webchannel Build-Depends: qt5-webchannel -Description: +Description: Feature: websockets Build-Depends: qt5-websockets -Description: +Description: Feature: xmlpatterns Build-Depends: qt5-xmlpatterns @@ -43,35 +40,35 @@ Description: (deprecated) Feature: sensors Build-Depends: qt5-sensors -Description: +Description: Feature: serialport Build-Depends: qt5-serialport -Description: +Description: Feature: speech Build-Depends: qt5-speech -Description: +Description: Feature: svg Build-Depends: qt5-svg -Description: +Description: Feature: tools Build-Depends: qt5-tools -Description: +Description: Feature: virtualkeyboard Build-Depends: qt5-virtualkeyboard -Description: +Description: Feature: networkauth Build-Depends: qt5-networkauth -Description: +Description: Feature: purchasing Build-Depends: qt5-purchasing -Description: +Description: Feature: quickcontrols Build-Depends: qt5-quickcontrols @@ -79,7 +76,7 @@ Description: (deprecated) Feature: quickcontrols2 Build-Depends: qt5-quickcontrols2 -Description: +Description: Feature: script Build-Depends: qt5-script @@ -87,7 +84,7 @@ Description: (deprecated) Feature: scxml Build-Depends: qt5-scxml -Description: +Description: Feature: activeqt Build-Depends: qt5-activeqt (windows) @@ -95,76 +92,72 @@ Description: Windows Only Feature: charts Build-Depends: qt5-charts -Description: +Description: Feature: datavis3d Build-Depends: qt5-datavis3d -Description: +Description: Feature: declarative Build-Depends: qt5-declarative -Description: +Description: Feature: gamepad Build-Depends: qt5-gamepad -Description: +Description: Feature: graphicaleffects Build-Depends: qt5-graphicaleffects -Description: - -Feature: declarative -Build-Depends: qt5-declarative -Description: +Description: Feature: imageformats Build-Depends: qt5-imageformats -Description: +Description: Feature: location Build-Depends: qt5-location -Description: +Description: Feature: multimedia Build-Depends: qt5-multimedia -Description: +Description: Feature: mqtt Build-Depends: qt5-mqtt -Description: +Description: Feature: webglplugin Build-Depends: qt5-webglplugin -Description: +Description: Feature: webview Build-Depends: qt5-webview -Description: +Description: Feature: wayland Build-Depends: qt5-wayland -Description: +Description: Feature: webengine Build-Depends: qt5-webengine -Description: +Description: Feature: serialbus Build-Depends: qt5-serialbus -Description: +Description: Feature: translations Build-Depends: qt5-translations -Description: +Description: Feature: doc Build-Depends: qt5-doc -Description: +Description: Feature: remoteobjects Build-Depends: qt5-remoteobjects -Description: +Description: Feature: connectivity Build-Depends: qt5-connectivity -Description: +Description: |
