Don't replace mingw-w64-freetype2

This commit is contained in:
Martchus 2016-07-12 18:14:17 +02:00
parent e31a479987
commit 44458a7402
2 changed files with 3 additions and 3 deletions

View File

@ -5,7 +5,7 @@
pkgname=mingw-w64-freetype2-bootstrap pkgname=mingw-w64-freetype2-bootstrap
pkgver=2.6.5 pkgver=2.6.5
pkgrel=1 pkgrel=2
pkgdesc="TrueType font rendering library (mingw-w64)" pkgdesc="TrueType font rendering library (mingw-w64)"
arch=('any') arch=('any')
url="http://www.freetype.org/" url="http://www.freetype.org/"
@ -36,9 +36,9 @@ else
# 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})
replaces+=(${_provides})
conflicts+=(${_provides}) conflicts+=(${_provides})
_architectures="i686-w64-mingw32 x86_64-w64-mingw32" _architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -36,9 +36,9 @@ else
# 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})
replaces+=(${_provides})
conflicts+=(${_provides}) conflicts+=(${_provides})
_architectures="i686-w64-mingw32 x86_64-w64-mingw32" _architectures="i686-w64-mingw32 x86_64-w64-mingw32"