[cairo-commit] 2 commits - meson.build util/cairo-script

[GitLab Mirror]

 meson.build                   |    1 -
 util/cairo-script/meson.build |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7c998fa01983eb19a3f62aa12fb65280299850d1
Merge: da5450e72 179c27b1d
Author: Uli Schlachter <psychon at znc.in>
Date:   Mon Jul 18 16:25:09 2022 +0000

    Merge branch 'lzo-only-in-script' into 'master'
    
    meson: Only link cairo-script-interpreter with liblzo
    
    See merge request cairo/cairo!346

commit 179c27b1d7505cec2132dea21868fe2c9205044f
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jul 18 10:01:38 2022 +0100

    meson: Only link cairo-script-interpreter with liblzo
    
    The rest of cairo (and therefore most external packages that depend
    on cairo) doesn't make any use of liblzo.
    
    Signed-off-by: Simon McVittie <smcv at debian.org>

diff --git a/meson.build b/meson.build
index 130ca251f..970f49a52 100644
--- a/meson.build
+++ b/meson.build
@@ -206,7 +206,6 @@ endif
 
 lzo_dep = dependency('lzo2', required: false)
 if lzo_dep.found()
-  deps += [lzo_dep]
   conf.set('HAVE_LZO', 1)
 endif
 
diff --git a/util/cairo-script/meson.build b/util/cairo-script/meson.build
index 653c19d33..51e0ce7cd 100644
--- a/util/cairo-script/meson.build
+++ b/util/cairo-script/meson.build
@@ -27,7 +27,7 @@ csi_trace_sources = [
 libcairoscript = library('cairo-script-interpreter',
   cairoscript_interpreter_sources,
   include_directories: [incbase],
-  dependencies: deps + [libcairo_dep],
+  dependencies: deps + [libcairo_dep, lzo_dep],
   soversion: cairo_version_sonum,
   version: cairo_libversion,
   install: true,