[cairo] Update to 1.18.2

microsoft · Oct 22, 2024 · a57c656 · a57c656
1 parent c8582b4
commit a57c656
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake
@@ -1,19 +1,20 @@
+set(PATCHES "")
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    set(PATCHES fix_clang-cl_build.patch)
+    list(APPEND PATCHES fix_clang-cl_build.patch)
 endif()
 
 vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     GITLAB_URL https://gitlab.freedesktop.org
     REPO cairo/cairo
     REF "${VERSION}"
-    SHA512 2ef3b948b354a9be5c3afe2bbf47f559a00a6114c67ef50ce19d54a1d4232218311f2277e271faad4df598e19e03492ba97af934ede9411494618ebe46f9eee9
+    SHA512 5731eaa48857561aad023214ebb7be70344579a4bc75d00c46f8c622b4d34be7f79ab02e2cd54a419086490a3bf31aafa2418d873833b475b9824e3f2f5b17b6
     PATCHES
-        cairo_static_fix.patch
-        disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554
-        fix-static-missing-lib-msimg32.patch
+        #cairo_static_fix.patch
+        #disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554
+        #fix-static-missing-lib-msimg32.patch
         ${PATCHES}
-        fix-alloca-undefine.patch # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/520
+        #fix-alloca-undefine.patch # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/520
         cairo_add_lzo_feature_option.patch
 )
 
@@ -92,6 +93,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-# Handle copyright
+#file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING-LGPL-2.1" "${SOURCE_PATH}/COPYING-MPL-1.1")
diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cairo",
-  "version": "1.18.0",
-  "port-version": 1,
+  "version": "1.18.2",
   "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",
@@ -24,31 +23,31 @@
   ],
   "features": {
     "fontconfig": {
-      "description": "build with fontconfig",
+      "description": "Build with fontconfig",
       "dependencies": [
         "fontconfig"
       ]
     },
     "freetype": {
-      "description": "use the freetype font backend",
+      "description": "Use the freetype font backend",
       "dependencies": [
         "freetype"
       ]
     },
     "gobject": {
-      "description": "build gobject module",
+      "description": "Build the gobject module",
       "dependencies": [
         "glib"
       ]
     },
     "lzo": {
-      "description": "build with lzo support",
+      "description": "Build with lzo support",
       "dependencies": [
         "lzo"
       ]
     },
     "x11": {
-      "description": "build with x11 support",
+      "description": "Build with X11 support",
       "supports": "!windows"
     }
   }

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -167,7 +167,6 @@ caf:arm64-uwp=fail
 caf:arm64-android=fail
 caf:x64-android=fail
 caf:x64-uwp=fail
-cairo:x64-android=fail
 # file conflict with dbg-macro
 c-dbg-macro:x86-windows=skip
 c-dbg-macro:x64-windows=skip
@@ -195,7 +194,6 @@ catch-classic:x64-windows        = skip
 catch-classic:x64-windows-static = skip
 catch-classic:x64-windows-static-md=skip
 catch-classic:x86-windows        = skip
-cairo:arm64-android=fail
 cctag:x64-windows-static-md=fail
 cello:arm64-uwp=fail
 cello:x64-uwp=fail

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1481,8 +1481,8 @@
       "port-version": 0
     },
     "cairo": {
-      "baseline": "1.18.0",
-      "port-version": 1
+      "baseline": "1.18.2",
+      "port-version": 0
     },
     "cairomm": {
       "baseline": "1.18.0",

diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a90dd2db9086bc24adfe43e3e2f02ea6e8bad41c",
+      "version": "1.18.2",
+      "port-version": 0
+    },
     {
       "git-tree": "0fda02793cfc3911468cd200b0a889c65035db1d",
       "version": "1.18.0",