From c60573ff7a4265e1831d2413b3703b1d4aadbc70 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Mar 2021 12:09:50 +0100 Subject: [PATCH] freetype: meson.build: Fix .pc file generation Fixes error when building fontconfig: checking for FREETYPE... no configure: error: Package requirements (freetype2 >= 21.0.15) were not met: Package dependency requirement 'freetype2 >= 21.0.15' could not be satisfied. Package 'freetype2' has version '6.17.4', required version is '>= 21.0.15' Signed-off-by: Bernd Kuhls --- .../patches/030-meson-pkgconfig.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 libs/freetype/patches/030-meson-pkgconfig.patch diff --git a/libs/freetype/patches/030-meson-pkgconfig.patch b/libs/freetype/patches/030-meson-pkgconfig.patch new file mode 100644 index 000000000..413189223 --- /dev/null +++ b/libs/freetype/patches/030-meson-pkgconfig.patch @@ -0,0 +1,56 @@ +From 26e2a89598d69c7aba76c83f6a1fcf1db17574ab Mon Sep 17 00:00:00 2001 +From: Werner Lemberg +Date: Wed, 4 Nov 2020 21:00:22 +0100 +Subject: [PATCH] * meson.build: Fix .pc file generation. + +For backwards compatibility we need the libtool version, not the .so +number. + +Reported by Nikolaus. + +Downloaded from upstream commit: +https://gitlab.freedesktop.org/freetype/freetype/-/commit/26e2a89598d69c7aba76c83f6a1fcf1db17574ab + +Signed-off-by: Bernd Kuhls +--- + ChangeLog | 9 +++++++++ + meson.build | 10 +++++++--- + 2 files changed, 16 insertions(+), 3 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -32,11 +32,15 @@ ft2_version = run_command(python_exe, + files('builds/meson/extract_freetype_version.py'), + files('include/freetype/freetype.h')).stdout().strip() + +-ft2_libtool_version = run_command(python_exe, ++ft2_so_version = run_command(python_exe, + files('builds/meson/extract_libtool_version.py'), + '--soversion', + files('builds/unix/configure.raw')).stdout().strip() + ++ft2_libtool_version = run_command(python_exe, ++ files('builds/meson/extract_libtool_version.py'), ++ files('builds/unix/configure.raw')).stdout().strip() ++ + ft2_includes = include_directories('include') + + +@@ -320,7 +324,7 @@ ft2_lib = library('freetype', + include_directories: ft2_includes, + dependencies: ft2_deps, + install: true, +- version: ft2_libtool_version, ++ version: ft2_so_version, + ) + + +@@ -328,7 +332,7 @@ ft2_lib = library('freetype', + freetype2_dep = declare_dependency( + include_directories: ft2_includes, + link_with: ft2_lib, +- version: ft2_libtool_version) ++ version: ft2_so_version) + + + # NOTE: Using both `install_dir` and `subdir` doesn't seem to work below,