[meson] Require ragel 6.10

Ragel 7 is also not stable from upstream's point of view.

This uses “version” argument find_program(), which was introduced in
meson 0.52.0, so I raised the minimum required meson version
accordingly.
This commit is contained in:
Khaled Hosny 2021-09-14 07:07:00 +02:00 committed by Behdad Esfahbod
parent 175f24a459
commit 7e9ac8fea2
4 changed files with 4 additions and 4 deletions

View File

@ -68,7 +68,7 @@ jobs:
steps: steps:
- checkout - checkout
- run: apk update && apk add ragel gcc g++ glib-dev freetype-dev cairo-dev git py3-pip ninja - run: apk update && apk add ragel gcc g++ glib-dev freetype-dev cairo-dev git py3-pip ninja
- run: pip3 install meson==0.47.0 - run: pip3 install meson==0.52.0
- run: meson build --buildtype=minsize - run: meson build --buildtype=minsize
- run: ninja -Cbuild -j9 - run: ninja -Cbuild -j9
- run: meson test -Cbuild --print-errorlogs - run: meson test -Cbuild --print-errorlogs

View File

@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: install dependencies - name: install dependencies
run: sudo apt-get install pkg-config gcc ragel gcovr gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-setuptools ninja-build gobject-introspection libgirepository1.0-dev run: sudo apt-get install pkg-config gcc ragel gcovr gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-setuptools ninja-build gobject-introspection libgirepository1.0-dev
- run: sudo pip3 install fonttools meson==0.47.0 - run: sudo pip3 install fonttools meson==0.52.0
- name: run - name: run
run: meson build -Db_coverage=true --auto-features=enabled -Dgraphite=enabled -Dchafa=disabled -Doptimization=2 run: meson build -Db_coverage=true --auto-features=enabled -Dgraphite=enabled -Dchafa=disabled -Doptimization=2
- name: ci - name: ci

View File

@ -1,5 +1,5 @@
project('harfbuzz', 'c', 'cpp', project('harfbuzz', 'c', 'cpp',
meson_version: '>= 0.47.0', meson_version: '>= 0.52.0',
version: '2.9.1', version: '2.9.1',
default_options: [ default_options: [
'cpp_eh=none', # Just to support msvc, we are passing -fno-rtti also anyway 'cpp_eh=none', # Just to support msvc, we are passing -fno-rtti also anyway

View File

@ -290,7 +290,7 @@ hb_gobject_headers = files(
'hb-gobject-structs.h', 'hb-gobject-structs.h',
) )
ragel = find_program('ragel', required: false) ragel = find_program('ragel', version: '6.10', required: false)
if not ragel.found() if not ragel.found()
warning('You have to install ragel if you are going to develop HarfBuzz itself') warning('You have to install ragel if you are going to develop HarfBuzz itself')
else else