From 0a7ddc45e0d9f2b0715bb219d3fcd6ca1c7ba349 Mon Sep 17 00:00:00 2001 From: Tristan F Date: Mon, 17 Jun 2024 05:31:53 -0400 Subject: [PATCH] Upgrade `freetype-sys` to version 0.21 (#258) Co-authored-by: Martin Robinson --- .github/workflows/main.yml | 20 ++++++++++---------- README.md | 6 ++++++ harfbuzz-sys/Cargo.toml | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 27db6dab..ffb7f715 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,16 +12,16 @@ on: jobs: linux-ci-shared: name: stable, Linux, shared library - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: submodules: true - - - name: install harfbuzz from apt + + - name: Install harfbuzz from apt run: | sudo apt update - sudo apt install libharfbuzz-dev + sudo apt install libharfbuzz-dev libfreetype-dev - name: Install stable toolchain uses: dtolnay/rust-toolchain@stable @@ -54,16 +54,16 @@ jobs: # do this where the embedded harfbuzz is statically linked, but we don't # need to do it for every environment. - name: Cargo package - run: cargo package --manifest-path=harfbuzz-sys/Cargo.toml --features bundled + run: cargo package --manifest-path=harfbuzz-sys/Cargo.toml --features "freetype-sys/bundled bundled" - name: Cargo build - run: cargo build --workspace --features bundled + run: cargo build --workspace --features "freetype-sys/bundled bundled" - name: Cargo clippy - run: cargo clippy --workspace --features bundled -- -D warnings + run: cargo clippy --workspace --features "freetype-sys/bundled bundled" -- -D warnings - name: Cargo test - run: cargo test --workspace --features bundled + run: cargo test --workspace --features "freetype-sys/bundled bundled" env: RUST_BACKTRACE: 1 @@ -134,10 +134,10 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Cargo build - run: cargo build --workspace --features bundled + run: cargo build --workspace --features "freetype-sys/bundled bundled" - name: Cargo test - run: cargo test --workspace --features bundled + run: cargo test --workspace --features "freetype-sys/bundled bundled" env: RUST_BACKTRACE: 1 diff --git a/README.md b/README.md index 75ab4dd8..e622b317 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,9 @@ Or, after a clone: ``` git submodule update --init ``` + +## FreeType Support + +The `freetype` feature is enabled by default. If your system does not have FreeType +or FreeType development packages, which is typically the case for Windows, you can +either disable default features or enable the `freetype-sys/bundled` feature. diff --git a/harfbuzz-sys/Cargo.toml b/harfbuzz-sys/Cargo.toml index 83ca0789..d9ddf779 100644 --- a/harfbuzz-sys/Cargo.toml +++ b/harfbuzz-sys/Cargo.toml @@ -37,7 +37,7 @@ optional = true features = ["Win32_Graphics_DirectWrite"] [dependencies.freetype-sys] -version = "0.20.1" +version = "0.21.0" optional = true [features]