mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-01 11:59:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
060c2708a3
vcpkg/ports/cairo/cairo_static_fix.patch

19 lines
475 B
Diff
Raw Normal View History

[cairo] Update to 1.18.0 (#36444) <!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> Fixes #36397 <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. All features passed with following triplets: ``` x86-windows x64-windows x64-windows-static ``` Usage test passed on `x64-windows`. <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) --> --------- Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
2024-02-22 14:35:32 +08:00
diff --git a/meson.build b/meson.build
index 9100152..7005f7e 100644
--- a/meson.build
+++ b/meson.build
@@ -97,6 +97,13 @@ endif
update cairo (#29818)
2023-02-28 03:51:45 +08:00
add_project_arguments('-D_GNU_SOURCE', language: 'c')
[cairo] Fix static cairo builds (#18103) * fix static cairo builds * remove outdated patch * version stuff * try getting cairo back into static CI builds
2021-07-16 07:01:16 +08:00
+if host_machine.system() == 'windows'
+ lib_default = get_option('default_library')
+ if lib_default == 'static'
[cairo] update to 1.7.6 (#23849) * [cairo] upgrade cairo to 1.7.6 (microsoft#23848) * [cairo] remove patch (microsoft#23848) 0001-meson-fix-macOS-build-and-add-macOS-ci.patch has been merged into the upstream repository and is part of the 1.7.6 release. * [cairo] use meson option to disable bfd (microsoft#23848) Upstream has introduced an option to disable bfd. Use the option to disable it (See microsoft#23022) * [cairo] chase upstream cflags handling (microsoft#23848) Upstream has put all cflags handling into the top-level meson. Move our static compilation indicator definition to the top level, too. * [cairo] force-disable xcb (microsoft#23848) This is the next update * [cairo] format vcpkg.json (microsoft#23848) * [cairo] update version registries (microsoft#23848) * [cairo] add license (microsoft#23848) * [cairo] regenerate versions registry (microsoft#23848) Co-authored-by: Schaich <alonso.schaich@sodgeit.de>
2022-04-02 05:39:10 +08:00
+ add_project_arguments('-DCAIRO_WIN32_STATIC_BUILD', language: 'c')
[cairo] Fix static cairo builds (#18103) * fix static cairo builds * remove outdated patch * version stuff * try getting cairo back into static CI builds
2021-07-16 07:01:16 +08:00
+ endif
+endif
+
[cairo] Update to 1.18.0 (#36444) <!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> Fixes #36397 <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. All features passed with following triplets: ``` x86-windows x64-windows x64-windows-static ``` Usage test passed on `x64-windows`. <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) --> --------- Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
2024-02-22 14:35:32 +08:00
pkgmod = import('pkgconfig')
python3 = import('python').find_installation()
Reference in New Issue Copy Permalink