[cairo-commit] 2 commits - meson.build

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sun Sep 12 15:49:15 UTC 2021


 meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 224b44e9d4a7f083df4217b1b6b3cfbec82f9928
Merge: 918fe0266 08cd1fdeb
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sun Sep 12 15:49:13 2021 +0000

    Merge branch 'fix-no-png-dep' into 'master'
    
    meson: fix build without libpng
    
    See merge request cairo/cairo!252

commit 08cd1fdebec79ced88f5912fc9703a3924c34334
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sun Sep 12 15:55:31 2021 +0100

    meson: fix build without libpng
    
    meson.build:966:2: ERROR: Expected 1 arguments, got 0.

diff --git a/meson.build b/meson.build
index 2ffd4ea32..f1fc25e41 100644
--- a/meson.build
+++ b/meson.build
@@ -963,7 +963,7 @@ subdir('src')
 if feature_conf.get('CAIRO_HAS_PNG_FUNCTIONS', 0) == 1
   subdir('boilerplate')
 else
-  cairoboilerplate_dep = dependency()
+  cairoboilerplate_dep = dependency('', required: false)
 endif
 
 subdir('util')


More information about the cairo-commit mailing list