From 361b5997df42c7df0ecd9ea29631f699fada7cd4 Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Sun, 12 Feb 2023 01:28:33 +0000 Subject: [PATCH] harfbuzz: update to 7.0.0 --- mingw-w64-harfbuzz/PKGBUILD | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/mingw-w64-harfbuzz/PKGBUILD b/mingw-w64-harfbuzz/PKGBUILD index f46fcadbe5..cb9f675f13 100644 --- a/mingw-w64-harfbuzz/PKGBUILD +++ b/mingw-w64-harfbuzz/PKGBUILD @@ -4,32 +4,32 @@ _realname=harfbuzz pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=6.0.0 +pkgver=7.0.0 pkgrel=1 pkgdesc="OpenType text shaping engine (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') -url="https://www.freedesktop.org/wiki/Software/HarfBuzz" +url="https://github.com/harfbuzz/harfbuzz" license=("MIT") -makedepends=("${MINGW_PACKAGE_PREFIX}-icu" - "${MINGW_PACKAGE_PREFIX}-gobject-introspection" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-cairo" - "${MINGW_PACKAGE_PREFIX}-python" +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-meson" - "${MINGW_PACKAGE_PREFIX}-ragel" - "${MINGW_PACKAGE_PREFIX}-cc") + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-gtk-doc" + "${MINGW_PACKAGE_PREFIX}-gobject-introspection" + "${MINGW_PACKAGE_PREFIX}-icu" + "${MINGW_PACKAGE_PREFIX}-cairo" + "${MINGW_PACKAGE_PREFIX}-ragel") depends=("${MINGW_PACKAGE_PREFIX}-freetype" "${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-glib2" "${MINGW_PACKAGE_PREFIX}-graphite2") checkdepends=("${MINGW_PACKAGE_PREFIX}-python-fonttools" "${MINGW_PACKAGE_PREFIX}-python-setuptools") -options=('strip' 'staticlibs') optdepends=("${MINGW_PACKAGE_PREFIX}-icu: harfbuzz-icu support" "${MINGW_PACKAGE_PREFIX}-cairo: hb-view program") source=("https://github.com/harfbuzz/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.xz") -sha256sums=('1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4') +sha256sums=('7b4685b7066c5c6b8dc6cd7b02f63c554fb8cc1c4ddcfc44bc284efa3c20cf28') build() { # Build static and shared libs separately due to necessity of defining DGRAPHITE2_STATIC @@ -37,14 +37,13 @@ build() { export _static_dir="${srcdir}/build-${MSYSTEM}-static" export _shared_dir="${srcdir}/build-${MSYSTEM}-shared" - [[ -d "${_static_dir}" ]] && rm -rf "${_static_dir}" mkdir -p "${_static_dir}" && cd "${_static_dir}" # static build CFLAGS="${CFLAGS} -DGRAPHITE2_STATIC" \ CXXFLAGS="${CXXFLAGS} -DGRAPHITE2_STATIC" \ MSYS2_ARG_CONV_EXCL="--prefix=" \ - ${MINGW_PREFIX}/bin/meson \ + ${MINGW_PREFIX}/bin/meson setup \ --prefix="${MINGW_PREFIX}" \ --buildtype plain \ --wrap-mode=nofallback \ @@ -57,16 +56,17 @@ build() { -Dgraphite=enabled \ -Dchafa=disabled \ -Ddirectwrite=enabled \ + -Dtests=disabled \ + -Ddocs=disabled \ ../${_realname}-${pkgver} ${MINGW_PREFIX}/bin/meson compile # shared build - [[ -d "${_shared_dir}" ]] && rm -rf "${_shared_dir}" mkdir -p "${_shared_dir}" && cd "${_shared_dir}" MSYS2_ARG_CONV_EXCL="--prefix=" \ - ${MINGW_PREFIX}/bin/meson \ + ${MINGW_PREFIX}/bin/meson setup \ --prefix="${MINGW_PREFIX}" \ --buildtype plain \ --wrap-mode=nofallback \ @@ -79,6 +79,7 @@ build() { -Dgraphite=enabled \ -Dchafa=disabled \ -Ddirectwrite=enabled \ + -Dtests=disabled \ ../${_realname}-${pkgver} ${MINGW_PREFIX}/bin/meson compile @@ -86,6 +87,8 @@ build() { check(){ cd "${srcdir}/build-${MSYSTEM}-shared" + ${MINGW_PREFIX}/bin/meson setup -Dtests=enabled ../${_realname}-${pkgver} + ${MINGW_PREFIX}/bin/meson compile ${MINGW_PREFIX}/bin/meson test }