diff --git a/desktop/font/harfbuzz/actions.py b/desktop/font/harfbuzz/actions.py index b68c6ad03b..24aa73cd2b 100644 --- a/desktop/font/harfbuzz/actions.py +++ b/desktop/font/harfbuzz/actions.py @@ -17,6 +17,8 @@ def setup(): if get.buildTYPE() == "emul32": options += " -D graphite=disabled \ + --libdir=/usr/lib32 \ + --bindir=/usr/bin32 \ -D introspection=disabled \ " @@ -27,7 +29,8 @@ def build(): def install(): mesontools.install() - if get.buildTYPE() == "_emul32": + if get.buildTYPE() == "emul32": + pisitools.removeDir("/usr/bin32") return pisitools.dodoc("AUTHORS", "COPYING", "README*") diff --git a/desktop/font/harfbuzz/pspec.xml b/desktop/font/harfbuzz/pspec.xml index a17b8d4988..7cd9987269 100644 --- a/desktop/font/harfbuzz/pspec.xml +++ b/desktop/font/harfbuzz/pspec.xml @@ -14,7 +14,7 @@ The Harfbuzz package contains an OpenType text shaping engine. https://github.com/harfbuzz/harfbuzz/archive/2.7.4.tar.gz - git + meson cairo-devel glib2-devel @@ -53,6 +53,7 @@ glib2-devel icu4c-devel graphite2-devel + freetype-devel harfbuzz