Skip to content

Commit 0a7ddc4

Browse files
LeoDog896mrobinson
andauthored
Upgrade freetype-sys to version 0.21 (#258)
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
1 parent a6157a6 commit 0a7ddc4

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

.github/workflows/main.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ on:
1212
jobs:
1313
linux-ci-shared:
1414
name: stable, Linux, shared library
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- uses: actions/checkout@v4
1818
with:
1919
submodules: true
20-
21-
- name: install harfbuzz from apt
20+
21+
- name: Install harfbuzz from apt
2222
run: |
2323
sudo apt update
24-
sudo apt install libharfbuzz-dev
24+
sudo apt install libharfbuzz-dev libfreetype-dev
2525
2626
- name: Install stable toolchain
2727
uses: dtolnay/rust-toolchain@stable
@@ -54,16 +54,16 @@ jobs:
5454
# do this where the embedded harfbuzz is statically linked, but we don't
5555
# need to do it for every environment.
5656
- name: Cargo package
57-
run: cargo package --manifest-path=harfbuzz-sys/Cargo.toml --features bundled
57+
run: cargo package --manifest-path=harfbuzz-sys/Cargo.toml --features "freetype-sys/bundled bundled"
5858

5959
- name: Cargo build
60-
run: cargo build --workspace --features bundled
60+
run: cargo build --workspace --features "freetype-sys/bundled bundled"
6161

6262
- name: Cargo clippy
63-
run: cargo clippy --workspace --features bundled -- -D warnings
63+
run: cargo clippy --workspace --features "freetype-sys/bundled bundled" -- -D warnings
6464

6565
- name: Cargo test
66-
run: cargo test --workspace --features bundled
66+
run: cargo test --workspace --features "freetype-sys/bundled bundled"
6767
env:
6868
RUST_BACKTRACE: 1
6969

@@ -134,10 +134,10 @@ jobs:
134134
uses: dtolnay/rust-toolchain@stable
135135

136136
- name: Cargo build
137-
run: cargo build --workspace --features bundled
137+
run: cargo build --workspace --features "freetype-sys/bundled bundled"
138138

139139
- name: Cargo test
140-
run: cargo test --workspace --features bundled
140+
run: cargo test --workspace --features "freetype-sys/bundled bundled"
141141
env:
142142
RUST_BACKTRACE: 1
143143

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ Or, after a clone:
2121
```
2222
git submodule update --init
2323
```
24+
25+
## FreeType Support
26+
27+
The `freetype` feature is enabled by default. If your system does not have FreeType
28+
or FreeType development packages, which is typically the case for Windows, you can
29+
either disable default features or enable the `freetype-sys/bundled` feature.

harfbuzz-sys/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ optional = true
3737
features = ["Win32_Graphics_DirectWrite"]
3838

3939
[dependencies.freetype-sys]
40-
version = "0.20.1"
40+
version = "0.21.0"
4141
optional = true
4242

4343
[features]

0 commit comments

Comments
 (0)