[cairo] fix mingw build failure (#44304)

Co-authored-by: Jeff <jeff.gnefeij.com>
This commit is contained in:
Gnefeij 2025-03-12 02:47:26 +08:00 committed by GitHub
parent c2f8645031
commit c14d623871
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/src/win32/dw-extra.h b/src/win32/dw-extra.h
index 424fb606d..a9daced21 100644
--- a/src/win32/dw-extra.h
+++ b/src/win32/dw-extra.h
@@ -23,6 +23,8 @@
typedef DWRITE_COLOR_GLYPH_RUN1 DWRITE_COLOR_GLYPH_RUN1_WORKAROUND;
#endif
+#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 11
DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS);
+#endif
#endif /* DWRITE_EXTRA_H */

View File

@ -3,6 +3,8 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
list(APPEND EXTRA_PATCHES fix_clang-cl_build.patch)
endif()
list(APPEND EXTRA_PATCHES dw-extra.patch)
vcpkg_from_gitlab(
OUT_SOURCE_PATH SOURCE_PATH
GITLAB_URL https://gitlab.freedesktop.org

View File

@ -1,6 +1,7 @@
{
"name": "cairo",
"version": "1.18.2",
"port-version": 1,
"description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.",
"homepage": "https://cairographics.org",
"license": "LGPL-2.1-only OR MPL-1.1",

View File

@ -1482,7 +1482,7 @@
},
"cairo": {
"baseline": "1.18.2",
"port-version": 0
"port-version": 1
},
"cairomm": {
"baseline": "1.18.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b332aecd569cb46a2677231dd3b326c139453401",
"version": "1.18.2",
"port-version": 1
},
{
"git-tree": "84c6e863f1f936bd0db07b3302e568ac1c98531c",
"version": "1.18.2",