From c82e3700d843271e9bb5462a6a1f615d937b8054 Mon Sep 17 00:00:00 2001 From: DavidKorczynski Date: Thu, 12 May 2022 00:32:44 +0100 Subject: [PATCH] cairo: fix build (#7700) --- projects/cairo/Dockerfile | 2 +- projects/cairo/build.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/cairo/Dockerfile b/projects/cairo/Dockerfile index b53099fc1..ffe6979e7 100644 --- a/projects/cairo/Dockerfile +++ b/projects/cairo/Dockerfile @@ -15,7 +15,7 @@ ################################################################################ FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y python3-pip gtk-doc-tools libffi-dev autotools-dev libtool gperf -RUN pip3 install -U meson==0.56.0 ninja +RUN pip3 install -U meson==0.60.0 ninja RUN git clone --depth 1 git://git.sv.nongnu.org/freetype/freetype2.git RUN git clone --depth 1 https://gitlab.gnome.org/GNOME/glib diff --git a/projects/cairo/build.sh b/projects/cairo/build.sh index f12053b51..0870d9740 100755 --- a/projects/cairo/build.sh +++ b/projects/cairo/build.sh @@ -36,7 +36,6 @@ meson \ -Db_lundef=false \ -Doss_fuzz=enabled \ -Dlibmount=disabled \ - -Dinternal_pcre=true \ _builddir ninja -C _builddir ninja -C _builddir install