diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group index a87eb33..af5f908 100644 --- a/groups/261.native_packages_x11.group +++ b/groups/261.native_packages_x11.group @@ -60,11 +60,10 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin")"; : ${PKG_GTK2_CONFIGURE_ARGS_EXTRA:="--disable-cups --disable-papi"}; : ${PKG_GTK2_DISABLED:=1}; : ${PKG_HARFBUZZ_DEPENDS:="freetype_pre glib"}; -: ${PKG_HARFBUZZ_VERSION:=1.7.5}; +: ${PKG_HARFBUZZ_SHA256SUM:=a8e5c86e4d99e1cc9865ec1b8e9b05b98e413c2a885cd11f8e9bb9502dd3e3a9}; +: ${PKG_HARFBUZZ_VERSION:=1.8.8}; : ${PKG_HARFBUZZ_URL:=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PKG_HARFBUZZ_VERSION}.tar.bz2}; -: ${PKG_HARFBUZZ_SHA256SUM:=84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563}; -: ${PKG_HARFBUZZ_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2"}; -: ${PKG_HARFBUZZ_CONFIGURE_ARGS_EXTRA:=--with-icu=no}; +: ${PKG_HARFBUZZ_CONFIGURE_ARGS_EXTRA:="--with-icu=no --with-cairo=no"}; : ${PKG_IMLIB2_DEPENDS:="freetype libX11 libXext"}; : ${PKG_IMLIB2_SHA256SUM:=4d393a77e13da883c8ee2da3b029da3570210fe37d000c9ac33d9fce751b166d}; : ${PKG_IMLIB2_VERSION:=1.6.1}; diff --git a/patches/harfbuzz-1.7.5.local.patch b/patches/harfbuzz-1.7.5.local.patch deleted file mode 100644 index 65a2b8f..0000000 --- a/patches/harfbuzz-1.7.5.local.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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)); - }