Improve mingw-w64-freetype2 packages
* Simplify provides/conflicts/replaces * Remove reference to mingw-w64-freetype which should be long gone * Remove "replaces"; in some use cases one might rather stick with the bootstrap version * Explicitly enable/disable harfbuzz so the bootstrap version won't accidentally depend on it if it is installed in the build environment
This commit is contained in:
parent
f05eee98a0
commit
589a25a341
|
@ -5,16 +5,13 @@
|
||||||
|
|
||||||
pkgname=mingw-w64-freetype2-bootstrap
|
pkgname=mingw-w64-freetype2-bootstrap
|
||||||
pkgver=2.12.1
|
pkgver=2.12.1
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
pkgdesc='Font rasterization library (mingw-w64)'
|
pkgdesc='Font rasterization library (mingw-w64)'
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url='https://www.freetype.org/'
|
url='https://www.freetype.org/'
|
||||||
license=('GPL')
|
license=('GPL')
|
||||||
depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2 mingw-w64-brotli)
|
depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2 mingw-w64-brotli)
|
||||||
makedepends=(mingw-w64-gcc mingw-w64-meson)
|
makedepends=(mingw-w64-gcc mingw-w64-meson)
|
||||||
provides=(mingw-w64-freetype)
|
|
||||||
replaces=(mingw-w64-freetype)
|
|
||||||
conflicts=(mingw-w64-freetype)
|
|
||||||
options=(!strip !buildflags !libtool staticlibs)
|
options=(!strip !buildflags !libtool staticlibs)
|
||||||
source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig}
|
source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig}
|
||||||
0001-Enable-table-validation-modules.patch
|
0001-Enable-table-validation-modules.patch
|
||||||
|
@ -30,13 +27,12 @@ sha256sums=('4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f'
|
||||||
validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <wl@gnu.org>
|
validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then
|
if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then
|
||||||
_provides=${pkgname%-bootstrap}
|
_provides=(${pkgname%-bootstrap})
|
||||||
else
|
else
|
||||||
_provides=${pkgname}-bootstrap
|
_provides=(${pkgname}-bootstrap)
|
||||||
# adding harfbuzz for improved OpenType features auto-hinting
|
# adding harfbuzz for improved OpenType features auto-hinting
|
||||||
# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
|
# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
|
||||||
depends+=(mingw-w64-harfbuzz)
|
depends+=(mingw-w64-harfbuzz)
|
||||||
replaces+=(${_provides})
|
|
||||||
fi
|
fi
|
||||||
provides+=(${_provides})
|
provides+=(${_provides})
|
||||||
conflicts+=(${_provides})
|
conflicts+=(${_provides})
|
||||||
|
@ -53,10 +49,12 @@ prepare() {
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
local harfbuzz_support=enabled
|
||||||
|
[[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]] && harfbuzz_support=disabled
|
||||||
for _arch in ${_architectures}; do
|
for _arch in ${_architectures}; do
|
||||||
mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}"
|
mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}"
|
||||||
cd "${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
|
ninja
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,16 +5,13 @@
|
||||||
|
|
||||||
pkgname=mingw-w64-freetype2
|
pkgname=mingw-w64-freetype2
|
||||||
pkgver=2.12.1
|
pkgver=2.12.1
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
pkgdesc='Font rasterization library (mingw-w64)'
|
pkgdesc='Font rasterization library (mingw-w64)'
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url='https://www.freetype.org/'
|
url='https://www.freetype.org/'
|
||||||
license=('GPL')
|
license=('GPL')
|
||||||
depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2 mingw-w64-brotli)
|
depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2 mingw-w64-brotli)
|
||||||
makedepends=(mingw-w64-gcc mingw-w64-meson)
|
makedepends=(mingw-w64-gcc mingw-w64-meson)
|
||||||
provides=(mingw-w64-freetype)
|
|
||||||
replaces=(mingw-w64-freetype)
|
|
||||||
conflicts=(mingw-w64-freetype)
|
|
||||||
options=(!strip !buildflags !libtool staticlibs)
|
options=(!strip !buildflags !libtool staticlibs)
|
||||||
source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig}
|
source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig}
|
||||||
0001-Enable-table-validation-modules.patch
|
0001-Enable-table-validation-modules.patch
|
||||||
|
@ -30,13 +27,12 @@ sha256sums=('4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f'
|
||||||
validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <wl@gnu.org>
|
validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then
|
if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then
|
||||||
_provides=${pkgname%-bootstrap}
|
_provides=(${pkgname%-bootstrap})
|
||||||
else
|
else
|
||||||
_provides=${pkgname}-bootstrap
|
_provides=(${pkgname}-bootstrap)
|
||||||
# adding harfbuzz for improved OpenType features auto-hinting
|
# adding harfbuzz for improved OpenType features auto-hinting
|
||||||
# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
|
# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
|
||||||
depends+=(mingw-w64-harfbuzz)
|
depends+=(mingw-w64-harfbuzz)
|
||||||
replaces+=(${_provides})
|
|
||||||
fi
|
fi
|
||||||
provides+=(${_provides})
|
provides+=(${_provides})
|
||||||
conflicts+=(${_provides})
|
conflicts+=(${_provides})
|
||||||
|
@ -53,10 +49,12 @@ prepare() {
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
local harfbuzz_support=enabled
|
||||||
|
[[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]] && harfbuzz_support=disabled
|
||||||
for _arch in ${_architectures}; do
|
for _arch in ${_architectures}; do
|
||||||
mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}"
|
mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}"
|
||||||
cd "${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
|
ninja
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue