minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* meson.build: s/ft2_libtool_version/ft2_pkgconfig_version/. 

(freetype2_dep): Use it.

`ft2_libtool_version` would be the shared library version, not the
one we should use in file `freetype2.pc`.
This commit is contained in:
Xavier Claessens 2020-10-26 13:39:19 -04:00 committed by Werner Lemberg
parent 0565c5ba2b
commit 69e0faa893
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2021-02-09 Xavier Claessens <xavier.claessens@collabora.com>
* meson.build: s/ft2_libtool_version/ft2_pkgconfig_version/.
(freetype2_dep): Use it.
`ft2_libtool_version` would be the shared library version, not the
one we should use in file `freetype2.pc`.
2021-02-09 Xavier Claessens <xavier.claessens@collabora.com>
* meson.build: Use `meson.override_dependency`.

6
meson.build
View File

@ -35,7 +35,7 @@ ft2_so_version = run_command(python_exe,
'--soversion',
files('builds/unix/configure.raw')).stdout().strip()
ft2_libtool_version = run_command(python_exe,
ft2_pkgconfig_version = run_command(python_exe,
files('builds/meson/extract_libtool_version.py'),
files('builds/unix/configure.raw')).stdout().strip()
@ -333,7 +333,7 @@ ft2_lib = library('freetype',
freetype2_dep = declare_dependency(
include_directories: ft2_includes,
link_with: ft2_lib,
version: ft2_so_version)
version: ft2_pkgconfig_version)
meson.override_dependency('freetype2', freetype2_dep)
@ -355,7 +355,7 @@ pkgconfig.generate(ft2_lib,
description: 'A free, high-quality, and portable font engine.',
url: 'https://freetype.org',
subdirs: 'freetype2',
version: ft2_libtool_version,
version: ft2_pkgconfig_version,
)