diff options
| -rw-r--r-- | patches/harfbuzz-1.7.5.local.patch | 11 | ||||
| -rw-r--r-- | vars/build.vars | 9 |
2 files changed, 18 insertions, 2 deletions
diff --git a/patches/harfbuzz-1.7.5.local.patch b/patches/harfbuzz-1.7.5.local.patch new file mode 100644 index 00000000..65a2b8f7 --- /dev/null +++ b/patches/harfbuzz-1.7.5.local.patch @@ -0,0 +1,11 @@ +--- harfbuzz-1.7.5/src/hb-ot-kern-table.hh.orig 2018-02-27 21:36:40.772000000 +0000 ++++ harfbuzz-1.7.5/src/hb-ot-kern-table.hh 2018-02-27 21:37:57.168000000 +0000 +@@ -205,7 +205,7 @@ + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (thiz()) && +- thiz()->length >= thiz()->min_size && ++ thiz()->length >= T::min_size && + c->check_array (thiz(), 1, thiz()->length) && + thiz()->subtable.sanitize (c, thiz()->format)); + } diff --git a/vars/build.vars b/vars/build.vars index f2bb90b4..f175fddc 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -549,7 +549,7 @@ NATIVE_PACKAGES_DEPS_X11_PACKAGES=" inputproto kbproto xcb_proto xproto fixesproto libXau libpthread_stubs xcb xextproto xtrans libX11 libXext freetype fontconfig renderproto Xrender libXft libXfixes libXi libICE libSM libXt libXmu libXpm libXaw libxkbfile -pixman cairo dbus pango atk gdk gtk2 imlib2 libcaca"; +harfbuzz pixman cairo dbus pango atk gdk gtk2 imlib2 libcaca"; NATIVE_PACKAGES_DEPS_X11_PREFIX="${PREFIX_NATIVE}"; NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python"; : ${PKG_INPUTPROTO_SHA256SUM:=893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d}; @@ -644,6 +644,11 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python"; : ${PKG_CAIRO_URL:=http://cairographics.org/snapshots/cairo-${PKG_CAIRO_VERSION}.tar.xz}; : ${PKG_CAIRO_SHA256SUM:=5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c}; : ${PKG_CAIRO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2}; +: ${PKG_HARFBUZZ_VERSION:=1.7.5}; +: ${PKG_HARFBUZZ_URL:=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PKG_HARFBUZZ_VERSION}.tar.bz2}; +: ${PKG_HARFBUZZ_SHA256SUM:=84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563}; +: ${PKG_HARFBUZZ_CONFIGURE_ARGS_EXTRA:=--with-icu=no}; +: ${PKG_HARFBUZZ_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2"}; : ${PKG_DBUS_VERSION:=1.11.20}; : ${PKG_DBUS_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_VERSION}.tar.gz}; : ${PKG_DBUS_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa}; @@ -651,7 +656,7 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python"; : ${PKG_PANGO_VERSION:=1.40.11}; : ${PKG_PANGO_SHA256SUM:=5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e}; : ${PKG_PANGO_URL:=http://ftp.gnome.org/pub/GNOME/sources/pango/${PKG_PANGO_VERSION%.*}/pango-${PKG_PANGO_VERSION}.tar.xz}; -: ${PKG_PANGO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2}; +: ${PKG_PANGO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include/harfbuzz}; : ${PKG_ATK_VERSION:=2.26.0}; : ${PKG_ATK_SHA256SUM:=eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827}; : ${PKG_ATK_URL:=http://ftp.gnome.org/pub/gnome/sources/atk/${PKG_ATK_VERSION%.*}/atk-${PKG_ATK_VERSION}.tar.xz}; |