From 93008c20957a7ae94fbd7b03da1f2980d4abb50c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 26 Jan 2022 12:23:43 +1100 Subject: [PATCH] Upgraded raqm to 0.8.0 --- .ci/install.sh | 2 +- depends/install_raqm.sh | 4 ++-- docs/installation.rst | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index c48acf9ee..efc57a641 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -19,7 +19,7 @@ set -e sudo apt-get -qq install libfreetype6-dev liblcms2-dev python3-tk\ ghostscript libffi-dev libjpeg-turbo-progs libopenjp2-7-dev\ - cmake imagemagick libharfbuzz-dev libfribidi-dev + cmake meson imagemagick libharfbuzz-dev libfribidi-dev python3 -m pip install --upgrade pip python3 -m pip install --upgrade wheel diff --git a/depends/install_raqm.sh b/depends/install_raqm.sh index 3105465ec..39b998d05 100755 --- a/depends/install_raqm.sh +++ b/depends/install_raqm.sh @@ -2,13 +2,13 @@ # install raqm -archive=raqm-0.7.1 +archive=libraqm-0.8.0 ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz pushd $archive -./configure --prefix=/usr && make -j4 && sudo make -j4 install +meson build --prefix=/usr && sudo ninja -C build install popd diff --git a/docs/installation.rst b/docs/installation.rst index 0699ef341..ea0e78500 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -394,7 +394,8 @@ Prerequisites for **Ubuntu 16.04 LTS - 20.04 LTS** are installed with:: libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \ libharfbuzz-dev libfribidi-dev libxcb1-dev -Then see ``depends/install_raqm.sh`` to install libraqm. +To install libraqm, ``sudo apt-get install meson`` and then see +``depends/install_raqm.sh``. Prerequisites are installed on recent **Red Hat**, **CentOS** or **Fedora** with::