Skip to content

Commit 24a8a8d

Browse files
committed
Update bundled FreeType to 2.14.1
1 parent e84ce2b commit 24a8a8d

File tree

4 files changed

+12
-52
lines changed

4 files changed

+12
-52
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ commands:
6767
fonts-install:
6868
steps:
6969
- restore_cache:
70-
key: fonts-4
70+
key: fonts-5
7171
- run:
7272
name: Install custom fonts
7373
command: |
@@ -80,7 +80,7 @@ commands:
8080
-O ~/.local/share/fonts/xkcd-Script.ttf || true
8181
fc-cache -f -v
8282
- save_cache:
83-
key: fonts-4
83+
key: fonts-5
8484
paths:
8585
- ~/.local/share/fonts/
8686

@@ -125,7 +125,7 @@ commands:
125125
--no-build-isolation --editable .[dev]
126126
fi
127127
- save_cache:
128-
key: build-deps-2
128+
key: build-deps-3
129129
paths:
130130
- subprojects/packagecache
131131

lib/matplotlib/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,7 @@ def _val_or_rc(val, *rc_names):
13451345
def _init_tests():
13461346
# The version of FreeType to install locally for running the tests. This must match
13471347
# the value in `subprojects/freetype2.wrap`.
1348-
LOCAL_FREETYPE_VERSION = '2.13.3'
1348+
LOCAL_FREETYPE_VERSION = '2.14.1'
13491349

13501350
from matplotlib import ft2font
13511351
if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or

subprojects/freetype2.wrap

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
# This is the version of FreeType to use when building a local version. It
2-
# must match the value in `lib/matplotlib.__init__.py`. Also update the docs
3-
# in `docs/devel/dependencies.rst`. Bump the cache key in
4-
# `.circleci/config.yml` when changing requirements.
1+
# This is the version of FreeType to use when building a local version. It must match
2+
# the `LOCAL_FREETYPE_VERSION` value in `lib/matplotlib/__init__.py`. Bump the cache key
3+
# in `.circleci/config.yml` when changing requirements.
54
[wrap-file]
6-
directory = freetype-2.13.3
7-
source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz
8-
source_fallback_url = https://downloads.sourceforge.net/project/freetype/freetype2/2.13.3/freetype-2.13.3.tar.xz
9-
source_filename = freetype-2.13.3.tar.xz
10-
source_hash = 0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289
11-
12-
# https://gitlab.freedesktop.org/freetype/freetype/-/commit/34aed655f1696da774b5cdd4c5effb312153232f
13-
diff_files = freetype-34aed655f1696da774b5cdd4c5effb312153232f.patch
5+
directory = freetype-2.14.1
6+
source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.14.1.tar.xz
7+
source_fallback_url = https://downloads.sourceforge.net/project/freetype/freetype2/2.14.1/freetype-2.14.1.tar.xz
8+
source_filename = freetype-2.14.1.tar.xz
9+
source_hash = 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc
1410

1511
[provide]
1612
freetype2 = freetype_dep

subprojects/packagefiles/freetype-34aed655f1696da774b5cdd4c5effb312153232f.patch

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)