From 90476ba66c46603949418495195e668d8701bcb1 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Thu, 2 Jul 2020 16:41:22 +0000 Subject: [PATCH 1/2] meson: Make Requires in .pc files match autotools Libreoffice tries to use only harfbuzz-icu.pc and assumes this includes -lharfbuzz. --- src/meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/meson.build b/src/meson.build index 36df8cb13..b8c5543ee 100644 --- a/src/meson.build +++ b/src/meson.build @@ -501,6 +501,7 @@ pkgmod.generate(libharfbuzz, pkgmod.generate(libharfbuzz_subset, description: 'HarfBuzz font subsetter', + requires: ['harfbuzz'], subdirs: [meson.project_name()], version: meson.project_version(), ) @@ -531,6 +532,7 @@ if have_icu and not have_icu_builtin pkgmod.generate(libharfbuzz_icu, description: 'HarfBuzz text shaping library ICU integration', + requires: ['harfbuzz'], subdirs: [meson.project_name()], version: meson.project_version(), ) @@ -644,6 +646,7 @@ if have_gobject pkgmod.generate(libharfbuzz_gobject, description: 'HarfBuzz text shaping library GObject integration', + requires: ['harfbuzz', 'glib-2.0', 'gobject-2.0'], subdirs: [meson.project_name()], version: meson.project_version(), ) From 8691f06b290486a7c48f70f4e48efa845dbe1b81 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Thu, 2 Jul 2020 17:46:56 +0000 Subject: [PATCH 2/2] meson: Pin harfbuzz in .pc files to the built version This ensures that we link -subset, -icu and -gobject with a matching version of the main library. --- src/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/meson.build b/src/meson.build index b8c5543ee..9189b967a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -501,7 +501,7 @@ pkgmod.generate(libharfbuzz, pkgmod.generate(libharfbuzz_subset, description: 'HarfBuzz font subsetter', - requires: ['harfbuzz'], + requires: ['harfbuzz = @0@'.format(meson.project_version())], subdirs: [meson.project_name()], version: meson.project_version(), ) @@ -532,7 +532,7 @@ if have_icu and not have_icu_builtin pkgmod.generate(libharfbuzz_icu, description: 'HarfBuzz text shaping library ICU integration', - requires: ['harfbuzz'], + requires: ['harfbuzz = @0@'.format(meson.project_version())], subdirs: [meson.project_name()], version: meson.project_version(), ) @@ -646,7 +646,7 @@ if have_gobject pkgmod.generate(libharfbuzz_gobject, description: 'HarfBuzz text shaping library GObject integration', - requires: ['harfbuzz', 'glib-2.0', 'gobject-2.0'], + requires: ['harfbuzz = @0@'.format(meson.project_version()), 'glib-2.0', 'gobject-2.0'], subdirs: [meson.project_name()], version: meson.project_version(), )