[cairomm] update to 1.16.1#23904
Merged
strega-nil-ms merged 6 commits intomicrosoft:masterfrom Apr 5, 2022
Merged
Conversation
There was a problem hiding this comment.
You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
ports/cairomm/vcpkg.json
Valid values for the license field can be found in the documentation
Cairo: * Surface::Type: Deprecate WIN32, add WIN32_SURFACE (Kjell Ahlstedt) Issue microsoft#26, merge request !14 Build: * cairommconfig.h.*: Don't dllimport on MinGW (Chun-wei Fan) Merge reqest !16 (Chun-wei Fan) Issue gtkmm#90 (Lukas K.) * Meson build: Make it possible to use cairomm as a subproject (Kjell Ahlstedt) * Meson build: No implicit_include_directories (Kjell Ahlstedt) * MSVC build: exception.h: Export Cairo::logic_error selectively (Chun-wei Fan) Merge request !17
The WIN32 constant has been renamed to WIN32_SURFACE , and the WIN32 -> WIN32_SURFACE alias is only provided for non-win32 sytems, therefore our previous patch is no longer needed.
Manually add ed1ce9a630b375b0f43435e34fbe690eb8276178 from upstream, which prevents MSVC 2022 toolchains from being overridden by the meson port file, resulting in corrupted binarycache metadata
7b9fbfb to
e94d843
Compare
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 9d9a6f486cc7da7664117a75d01440db0088634a -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json
index a443c6c..7bfd0bf 100644
--- a/versions/c-/cairomm.json
+++ b/versions/c-/cairomm.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "c49d6e01473014b21c964dd2b29c5028ce162ef2",
+ "git-tree": "5ae92557bdcf5f6dc8364cb179fd8fe57b0698ce",
"version": "1.16.1",
"port-version": 0
},3f1266e to
ae54a41
Compare
JonLiu1993
reviewed
Apr 1, 2022
JonLiu1993
approved these changes
Apr 1, 2022
Contributor
|
Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Describe the pull request
What does your PR fix?
Fixes [cairomm] update to 1.16.1 #23903
Which triplets are supported/not supported? Have you updated the CI baseline?
triplets unchanged, CI baseline not updated
Does your PR follow the maintainer guide?
YesIf you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?Yes
If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/