diff --git a/freetype2/mingw-w64-bootstrap/PKGBUILD b/freetype2/mingw-w64-bootstrap/PKGBUILD index 57f9348a..a01ae3a7 100644 --- a/freetype2/mingw-w64-bootstrap/PKGBUILD +++ b/freetype2/mingw-w64-bootstrap/PKGBUILD @@ -5,16 +5,13 @@ pkgname=mingw-w64-freetype2-bootstrap pkgver=2.12.1 -pkgrel=2 +pkgrel=3 pkgdesc='Font rasterization library (mingw-w64)' arch=('any') url='https://www.freetype.org/' license=('GPL') depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2 mingw-w64-brotli) makedepends=(mingw-w64-gcc mingw-w64-meson) -provides=(mingw-w64-freetype) -replaces=(mingw-w64-freetype) -conflicts=(mingw-w64-freetype) options=(!strip !buildflags !libtool staticlibs) source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig} 0001-Enable-table-validation-modules.patch @@ -30,13 +27,12 @@ sha256sums=('4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f' validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then - _provides=${pkgname%-bootstrap} + _provides=(${pkgname%-bootstrap}) else - _provides=${pkgname}-bootstrap + _provides=(${pkgname}-bootstrap) # adding harfbuzz for improved OpenType features auto-hinting # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream depends+=(mingw-w64-harfbuzz) - replaces+=(${_provides}) fi provides+=(${_provides}) conflicts+=(${_provides}) @@ -53,10 +49,12 @@ prepare() { } build() { + local harfbuzz_support=enabled + [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]] && harfbuzz_support=disabled for _arch in ${_architectures}; do mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}" cd "${srcdir}/freetype-${pkgver}/build-${_arch}" - ${_arch}-meson --default-library both -D zlib=enabled -D bzip2=enabled -D png=disabled -D brotli=enabled -D b_lto=false + ${_arch}-meson --default-library both -D zlib=enabled -D bzip2=enabled -D png=disabled -D harfbuzz="$harfbuzz_support" -D brotli=enabled -D b_lto=false ninja done } diff --git a/freetype2/mingw-w64/PKGBUILD b/freetype2/mingw-w64/PKGBUILD index f150a19d..0ad0c7b9 100644 --- a/freetype2/mingw-w64/PKGBUILD +++ b/freetype2/mingw-w64/PKGBUILD @@ -5,16 +5,13 @@ pkgname=mingw-w64-freetype2 pkgver=2.12.1 -pkgrel=2 +pkgrel=3 pkgdesc='Font rasterization library (mingw-w64)' arch=('any') url='https://www.freetype.org/' license=('GPL') depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2 mingw-w64-brotli) makedepends=(mingw-w64-gcc mingw-w64-meson) -provides=(mingw-w64-freetype) -replaces=(mingw-w64-freetype) -conflicts=(mingw-w64-freetype) options=(!strip !buildflags !libtool staticlibs) source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig} 0001-Enable-table-validation-modules.patch @@ -30,13 +27,12 @@ sha256sums=('4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f' validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then - _provides=${pkgname%-bootstrap} + _provides=(${pkgname%-bootstrap}) else - _provides=${pkgname}-bootstrap + _provides=(${pkgname}-bootstrap) # adding harfbuzz for improved OpenType features auto-hinting # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream depends+=(mingw-w64-harfbuzz) - replaces+=(${_provides}) fi provides+=(${_provides}) conflicts+=(${_provides}) @@ -53,10 +49,12 @@ prepare() { } build() { + local harfbuzz_support=enabled + [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]] && harfbuzz_support=disabled for _arch in ${_architectures}; do mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}" cd "${srcdir}/freetype-${pkgver}/build-${_arch}" - ${_arch}-meson --default-library both -D zlib=enabled -D bzip2=enabled -D png=disabled -D brotli=enabled -D b_lto=false + ${_arch}-meson --default-library both -D zlib=enabled -D bzip2=enabled -D png=disabled -D harfbuzz="$harfbuzz_support" -D brotli=enabled -D b_lto=false ninja done }