Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qtbase: don't require pcre2's default features #42321

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ports/qtbase/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qtbase",
"version": "6.8.0",
"port-version": 1,
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
"homepage": "https://www.qt.io/",
"license": null,
Expand All @@ -10,7 +11,10 @@
"name": "libb2",
"platform": "!windows"
},
"pcre2",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems kinda odd that qtbase depends on pcre2 but also have a separate feature for it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes that seemed weird to me too. I left it as-is because I figured there must have been a reason it was done like that, but if usage of PCRE2 is a feature that is supposed to be disable-able, then it should probably be removed.

{
"name": "pcre2",
"default-features": false
},
{
"name": "qtbase",
"host": true,
Expand Down Expand Up @@ -379,7 +383,10 @@
"pcre2": {
"description": "Enable PCRE2 support",
"dependencies": [
"pcre2"
{
"name": "pcre2",
"default-features": false
}
]
},
"png": {
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7550,7 +7550,7 @@
},
"qtbase": {
"baseline": "6.8.0",
"port-version": 0
"port-version": 1
},
"qtcharts": {
"baseline": "6.8.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtbase.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "572380eee3c59c2656423fac304568537b7358d3",
"version": "6.8.0",
"port-version": 1
},
{
"git-tree": "b5025594fddc343bba86dadf4159d41a7e1bac13",
"version": "6.8.0",
Expand Down