Skip to content

Commit

Permalink
Upgrade freetype-sys to version 0.21 (#258)
Browse files Browse the repository at this point in the history
Co-authored-by: Martin Robinson <[email protected]>
  • Loading branch information
LeoDog896 and mrobinson committed Jun 17, 2024
1 parent a6157a6 commit 0a7ddc4
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion harfbuzz-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ optional = true
features = ["Win32_Graphics_DirectWrite"]

[dependencies.freetype-sys]
version = "0.20.1"
version = "0.21.0"
optional = true

[features]
Expand Down

0 comments on commit 0a7ddc4

Please sign in to comment.