Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't build Cairo with LZO #3

Merged
merged 2 commits into from
Aug 1, 2023
Merged

Don't build Cairo with LZO #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ae22f1
Don't build cairo with LZO
dchengTSC Aug 1, 2023
136c90d
Update versions
dchengTSC Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions ports/cairo/disable-lzo.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions ports/cairo/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
3 changes: 1 addition & 2 deletions ports/cairo/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -10,7 +10,6 @@
"dirent",
"expat",
"libpng",
"lzo",
"pixman",
"pthread",
{
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,7 +1366,7 @@
},
"cairo": {
"baseline": "1.17.8",
"port-version": 3
"port-version": 4
},
"cairomm": {
"baseline": "1.16.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cairo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "00cb8b7ffed9ce81f8b93d62e057076430f82948",
"version": "1.17.8",
"port-version": 4
},
{
"git-tree": "e8fda1b05b3f6a99f08c23f8ad94ed43d4a69875",
"version": "1.17.8",
Expand Down