Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 584b1fd

Browse files
committed
Remove version from FreeType wrap file
Latest Meson (1.9.0 at this time) is now erroring because of the Harfbuzz contains a differently-named wrap file that provides `freetype2`. This may be a bug upstream, but we really don't need the version in the filename.
1 parent 9766cbd commit 584b1fd

3 files changed

Lines changed: 6 additions & 8 deletions

File tree

extern/meson.build

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@ subdir('agg24-svn')
99
if get_option('system-freetype')
1010
freetype_dep = dependency('freetype2', version: '>=9.11.3')
1111
else
12-
# This is the version of FreeType to use when building a local version. It
13-
# must match the value in `lib/matplotlib.__init__.py`. Also update the docs
14-
# in `docs/devel/dependencies.rst`. Bump the cache key in
15-
# `.circleci/config.yml` when changing requirements.
16-
LOCAL_FREETYPE_VERSION = '2.13.3'
17-
1812
freetype_proj = subproject(
19-
f'freetype-@LOCAL_FREETYPE_VERSION@',
13+
'freetype2',
2014
default_options: [
2115
'default_library=static',
2216
'brotli=disabled',

lib/matplotlib/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ def _val_or_rc(val, *rc_names):
13331333

13341334
def _init_tests():
13351335
# The version of FreeType to install locally for running the tests. This must match
1336-
# the value in `meson.build`.
1336+
# the value in `subprojects/freetype2.wrap`.
13371337
LOCAL_FREETYPE_VERSION = '2.13.3'
13381338

13391339
from matplotlib import ft2font
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
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.
15
[wrap-file]
26
directory = freetype-2.13.3
37
source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz

0 commit comments

Comments
 (0)