diff --git a/desktop/font/harfbuzz/actions.py b/desktop/font/harfbuzz/actions.py index 94c480708f..b68c6ad03b 100644 --- a/desktop/font/harfbuzz/actions.py +++ b/desktop/font/harfbuzz/actions.py @@ -7,28 +7,27 @@ from pisi.actionsapi import get from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools +from pisi.actionsapi import mesontools + def setup(): - options = "--with-glib=yes \ - --with-freetype=yes \ - --with-cairo=yes \ - --with-icu=yes \ - --with-gobject=yes \ - --with-graphite2=yes" + options = "-D graphite=enabled \ + -D docs=disabled \ + " if get.buildTYPE() == "emul32": - options += "--with-glib=yes \ - --with-graphite2=no \ - --with-cairo=yes \ - --with-icu=yes" - autotools.configure(options) + options += " -D graphite=disabled \ + -D introspection=disabled \ + " + + mesontools.configure(options) - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") - def build(): - autotools.make() + mesontools.build() def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - - pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") + mesontools.install() + if get.buildTYPE() == "_emul32": + return + + pisitools.dodoc("AUTHORS", "COPYING", "README*") diff --git a/desktop/font/harfbuzz/pspec.xml b/desktop/font/harfbuzz/pspec.xml index e929d967bb..5ea7dac403 100644 --- a/desktop/font/harfbuzz/pspec.xml +++ b/desktop/font/harfbuzz/pspec.xml @@ -12,8 +12,10 @@ library OpenType text shaping engine. The Harfbuzz package contains an OpenType text shaping engine. - https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz + https://github.com/harfbuzz/harfbuzz/archive/2.7.4.tar.gz + + meson cairo-devel glib2-devel icu4c-devel @@ -22,6 +24,7 @@ expat-devel python-six gtk-doc + gobject-introspection-devel @@ -92,6 +95,13 @@ + + 2021-01-23 + 2.7.4 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-14 2.6.4