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

[wxwidgets] update to 3.1.6 #24483

Merged
merged 15 commits into from
May 6, 2022
Merged

Conversation

marekr
Copy link
Contributor

@marekr marekr commented Apr 30, 2022

Updates wxWidgets to 3.1.6

Three patches are no longer necessary as they are now incorporated upstream.
One patch was updated (and I'm eyeballing to get upstreamed for 3.1.7)

the download of two submodules was added as the upstream now uses them

#24499 should be merged first to have a fixed 3.1.5 before moving to 3.1.6

@marekr marekr force-pushed the wxwidgets-update branch from 98549e8 to 775d82e Compare April 30, 2022 16:48
@marekr marekr force-pushed the wxwidgets-update branch from 775d82e to cab2c17 Compare April 30, 2022 23:13
@marekr marekr force-pushed the wxwidgets-update branch from cab2c17 to 132f2fc Compare April 30, 2022 23:49
@marekr marekr force-pushed the wxwidgets-update branch from 132f2fc to 1032842 Compare April 30, 2022 23:54
@marekr
Copy link
Contributor Author

marekr commented May 1, 2022

#24489

I made an issue for the wrapper I found, I have a fix in the PR potentially.

@marekr marekr force-pushed the wxwidgets-update branch 2 times, most recently from 6585d98 to 3440fea Compare May 1, 2022 00:53
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for wxwidgets but no changes to version or port version.
-- Version: 3.1.6
-- Old SHA: 1b62ad21da0ec7e821dfa630d9cf20884b5f3c02
-- New SHA: 68f9540d91a732c7ac50c60058f6f5daed4c2daa
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@marekr marekr force-pushed the wxwidgets-update branch from 3440fea to 210783e Compare May 1, 2022 01:23
@dg0yt
Copy link
Contributor

dg0yt commented May 1, 2022

the download of two submodules was added as the upstream now uses them

I see nanosvg and pcre. pcre is in vcpkg. nanosvg is header-only IIUC, but it might still be added as a separate port.

@marekr
Copy link
Contributor Author

marekr commented May 1, 2022

the download of two submodules was added as the upstream now uses them

I see nanosvg and pcre. pcre is in vcpkg. nanosvg is header-only IIUC, but it might still be added as a separate port.

I wasn't sure about pcre because the existing wxwidgets

the download of two submodules was added as the upstream now uses them

I see nanosvg and pcre. pcre is in vcpkg. nanosvg is header-only IIUC, but it might still be added as a separate port.

There is no nanosvg port in vcpkg and it is header only.

I wasn't sure about pcre because even with the current 3.1.5 option, the pcre that is bundled in the source does not have to be used. It's just in 3.1.6 vadim finally made it a submodule by pointing it to a wxwidgets controlled fork repo. It does not point to the pcre2 github source repo that vcpkg uses so I wasn't sure.

It does work built against the libpcre2 package and I can make that change, should I?

@dg0yt
Copy link
Contributor

dg0yt commented May 1, 2022

There is no nanosvg port in vcpkg and it is header only.

Sure, I checked this before posting.
There is a clear maintainer guideline "Do not use vendored dependencies".
Header-only should make it easier.

I wasn't sure about pcre because even with the current 3.1.5 option, the pcre that is bundled in the source does not have to be used. It's just in 3.1.6 vadim finally made it a submodule by pointing it to a wxwidgets controlled fork repo. It does not point to the pcre2 github source repo that vcpkg uses so I wasn't sure.
It does work built against the libpcre2 package and I can make that change, should I?

I don't know how the version requirements will develop in the future. But again, "Do not use vendored dependencies".

@marekr
Copy link
Contributor Author

marekr commented May 1, 2022

There is no nanosvg port in vcpkg and it is header only.

Sure, I checked this before posting. There is a clear maintainer guideline "Do not use vendored dependencies". Header-only should make it easier.

I wasn't sure about pcre because even with the current 3.1.5 option, the pcre that is bundled in the source does not have to be used. It's just in 3.1.6 vadim finally made it a submodule by pointing it to a wxwidgets controlled fork repo. It does not point to the pcre2 github source repo that vcpkg uses so I wasn't sure.
It does work built against the libpcre2 package and I can make that change, should I?

I don't know how the version requirements will develop in the future. But again, "Do not use vendored dependencies".

Separate PR for nanosvg port or is combining it into this one ok?

Also, how do we handle nanosvg having no official versioning? The author does not tag or even #define anything for use
The only version is basically commit hash

@dg0yt
Copy link
Contributor

dg0yt commented May 1, 2022

Disclaimer: I don't have an official voice here.

Separate PR for nanosvg port or is combining it into this one ok?

For a small thing like nanosvg both is feasible IMO. It depends on the number of feedback and revision circles.

Also, how do we handle nanosvg having no official versioning? The author does not tag or even #define anything for use The only version is basically commit hash

You might use version-date, with the date of you vcpkg submission.

@marekr marekr force-pushed the wxwidgets-update branch from 210783e to bccecc2 Compare May 2, 2022 01:37
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/nanosvg/portfile.cmake

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/nanosvg/vcpkg.json

Valid values for the license field can be found in the documentation

@marekr marekr force-pushed the wxwidgets-update branch from bccecc2 to 4dfba02 Compare May 2, 2022 01:40
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/nanosvg/portfile.cmake

@marekr marekr force-pushed the wxwidgets-update branch from 4dfba02 to 42d4628 Compare May 2, 2022 01:42
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/nanosvg/portfile.cmake

@marekr marekr force-pushed the wxwidgets-update branch from 42d4628 to 5bd44b2 Compare May 2, 2022 01:46
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/nanosvg/portfile.cmake

Revise nanosvg and wxwidgets ports
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for nanosvg but no changes to version or port version.
-- Version: 2022-04-29
-- Old SHA: 40b956b29611e6f8644062c3176f4d205c86a262
-- New SHA: 827223ed18553b608489e328101549261d0c9d5a
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for wxwidgets but no changes to version or port version.
-- Version: 3.1.6
-- Old SHA: 81ae28ddaad2554d2abb8adda4a5806272089165
-- New SHA: 82533af13f2f2d968718ad0759046355b8995320
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@marekr
Copy link
Contributor Author

marekr commented May 5, 2022

This is waiting for marekr#1.

Merged the subpr and updated hashes

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for wxwidgets but no changes to version or port version.
-- Version: 3.1.6
-- Old SHA: 82533af13f2f2d968718ad0759046355b8995320
-- New SHA: 0d3126577fd4e09fc62f93c72c8d5025f532c55e
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for wxwidgets but no changes to version or port version.
-- Version: 3.1.6
-- Old SHA: dc3329a6f42e6a8ea70c29270ce79029ed2d575c
-- New SHA: 16d9f0aabf4f0df68bebd7b42ff6005d952f9392
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label May 6, 2022
@BillyONeal
Copy link
Member

I see that @dg0yt isn't marked as approve here but looking at the conversation it seems all your feedback has been resolved.

Thanks for the update!

@BillyONeal BillyONeal merged commit aec505b into microsoft:master May 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants