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

[cairomm] update to 1.16.1 #23904

Merged

Conversation

SchaichAlonso
Copy link
Contributor

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?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and 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/

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 vcpkg.json where a "license" field is missing.

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

Schaich and others added 5 commits March 31, 2022 11:48
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
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!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 9d9a6f486cc7da7664117a75d01440db0088634a -- versions
./vcpkg x-add-version --all
Diff
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
     },

@SchaichAlonso SchaichAlonso marked this pull request as ready for review March 31, 2022 19:40
@JonLiu1993 JonLiu1993 self-assigned this Apr 1, 2022
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Apr 1, 2022
@JonLiu1993 JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Apr 1, 2022
@strega-nil-ms
Copy link
Contributor

Thanks!

@strega-nil-ms strega-nil-ms merged commit 3f7655c into microsoft:master Apr 5, 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.

[cairomm] update to 1.16.1
3 participants