diff --git a/extra/cairo/build b/extra/cairo/build index bb542798..0dec2207 100755 --- a/extra/cairo/build +++ b/extra/cairo/build @@ -1,26 +1,17 @@ #!/bin/sh -e -# Disable building 'cairo-sphinx'. -sed -e "s/\(BUILD_SPHINX_TRUE=\)/\1'#'/" \ - -e "s/\(BUILD_SPHINX_FALSE=\)'#'/\1=/" \ - configure > _ -mv -f _ configure +export DESTDIR="$1" -# Disable building tests and documentation. -sed 's/boilerplate test perf//g;s/src doc/src/g' Makefile.in > _ -mv -f _ Makefile.in +sed meson.build -sh ./configure \ - --prefix=/usr \ - --disable-static \ - --enable-tee \ - --disable-xlib-xcb \ - --disable-xcb \ - --disable-xlib-xrender \ - --disable-xlib \ - --disable-trace \ - --disable-valgrind \ - --disable-gtk-doc-html +meson setup \ + -Dprefix=/usr \ + -Dtee=enabled \ + -Dxcb=disabled \ + -Dxlib=disabled \ + -Dxlib-xcb=disabled \ + -Dtests=disabled \ + . output -make -make DESTDIR="$1" install +ninja -C output +ninja -C output install diff --git a/extra/cairo/checksums b/extra/cairo/checksums index 3ba292aa..1d38b918 100644 --- a/extra/cairo/checksums +++ b/extra/cairo/checksums @@ -1 +1 @@ -33e88a21de1fa52405f3952647b3bfd21d5d9d394e1abbc9ddb050a8ca09e35a74 +55b4b6406668e08dd6b816beba82c86df8e9a5468352c66597badb4f6583930e6a diff --git a/extra/cairo/sources b/extra/cairo/sources index e43c5aab..35ab0ad8 100644 --- a/extra/cairo/sources +++ b/extra/cairo/sources @@ -1 +1 @@ -https://cairographics.org/releases/cairo-1.16.0.tar.xz +https://cairographics.org/releases/cairo-1.18.0.tar.xz diff --git a/extra/cairo/version b/extra/cairo/version index df10ebf3..f0fb559d 100644 --- a/extra/cairo/version +++ b/extra/cairo/version @@ -1 +1 @@ -1.16.0 1 +1.18.0 1