From 6ae22f14b92a39b65c5234444fce51c05b4a8c76 Mon Sep 17 00:00:00 2001 From: David Cheng Date: Tue, 1 Aug 2023 11:56:25 -0400 Subject: [PATCH 1/2] Don't build cairo with LZO --- ports/cairo/disable-lzo.patch | 22 ++++++++++++++++++++++ ports/cairo/portfile.cmake | 1 + ports/cairo/vcpkg.json | 1 - 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 ports/cairo/disable-lzo.patch diff --git a/ports/cairo/disable-lzo.patch b/ports/cairo/disable-lzo.patch new file mode 100644 index 00000000000000..8945d2dcb83f3d --- /dev/null +++ b/ports/cairo/disable-lzo.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index 12512d115..aec6b003a 100644 +--- a/meson.build ++++ b/meson.build +@@ -201,7 +201,16 @@ else + endif + endif + +-lzo_dep = dependency('lzo2', required: false) ++# TSC patch: Never look for lzo (GPL-licensed), but keep lzo_dep around so ++# downstream meson.build files will still work ++# ++# From the docs at https://mesonbuild.com/Reference-manual_functions.html#dependency ++# ++# If dependency_name is '', the dependency is always not found. ++# So with required: false, this always returns a dependency object ++# for which the found() method returns false, and which can be passed ++# like any other dependency to the dependencies: keyword argument of a build_target. ++lzo_dep = dependency('', required: false) + if lzo_dep.found() + conf.set('HAVE_LZO', 1) + endif diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 36b876318a5bc3..4b237c8f069ce6 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_gitlab( disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554 mingw-dllexport.patch fix-static-missing-lib-msimg32.patch + disable-lzo.patch ${PATCHES} ) diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 38e6acd4744542..971f7fcfbf07c7 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -10,7 +10,6 @@ "dirent", "expat", "libpng", - "lzo", "pixman", "pthread", { From 136c90d73ec84e7deefb37c47840055b89c177cf Mon Sep 17 00:00:00 2001 From: David Cheng Date: Tue, 1 Aug 2023 11:58:01 -0400 Subject: [PATCH 2/2] Update versions --- ports/cairo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cairo.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 971f7fcfbf07c7..995deec38e1498 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cairo", "version": "1.17.8", - "port-version": 3, + "port-version": 4, "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", diff --git a/versions/baseline.json b/versions/baseline.json index 3619404d8ab4aa..442c861cf6d856 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1366,7 +1366,7 @@ }, "cairo": { "baseline": "1.17.8", - "port-version": 3 + "port-version": 4 }, "cairomm": { "baseline": "1.16.2", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index d47321464e5f7d..baba06a0755837 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00cb8b7ffed9ce81f8b93d62e057076430f82948", + "version": "1.17.8", + "port-version": 4 + }, { "git-tree": "e8fda1b05b3f6a99f08c23f8ad94ed43d4a69875", "version": "1.17.8",