[cairo] update license info and add all licenses to copyright file (m…

…icrosoft#32430)
mstorsjo · Jul 11, 2023 · efd6ced · efd6ced
1 parent d25dff3
commit efd6ced
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake
@@ -87,4 +87,4 @@ endif()
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 # Handle copyright
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+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,10 +1,10 @@
 {
   "name": "cairo",
   "version": "1.17.8",
-  "port-version": 2,
+  "port-version": 3,
   "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": "MPL-1.1",
+  "license": "LGPL-2.1-only OR MPL-1.1",
   "supports": "!xbox",
   "dependencies": [
     "dirent",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1366,7 +1366,7 @@
     },
     "cairo": {
       "baseline": "1.17.8",
-      "port-version": 2
+      "port-version": 3
     },
     "cairomm": {
       "baseline": "1.16.2",

diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e8fda1b05b3f6a99f08c23f8ad94ed43d4a69875",
+      "version": "1.17.8",
+      "port-version": 3
+    },
     {
       "git-tree": "e94aef48f94b5cdac2387269b5f2ad421a684873",
       "version": "1.17.8",