From 44458a74022d3ecf415ea4ca588922502be21df7 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 12 Jul 2016 18:14:17 +0200 Subject: [PATCH] Don't replace mingw-w64-freetype2 --- freetype2/mingw-w64-bootstrap/PKGBUILD | 4 ++-- freetype2/mingw-w64/PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/freetype2/mingw-w64-bootstrap/PKGBUILD b/freetype2/mingw-w64-bootstrap/PKGBUILD index 7cc22f3f..b6794f6c 100644 --- a/freetype2/mingw-w64-bootstrap/PKGBUILD +++ b/freetype2/mingw-w64-bootstrap/PKGBUILD @@ -5,7 +5,7 @@ pkgname=mingw-w64-freetype2-bootstrap pkgver=2.6.5 -pkgrel=1 +pkgrel=2 pkgdesc="TrueType font rendering library (mingw-w64)" arch=('any') url="http://www.freetype.org/" @@ -36,9 +36,9 @@ else # 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}) -replaces+=(${_provides}) conflicts+=(${_provides}) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/freetype2/mingw-w64/PKGBUILD b/freetype2/mingw-w64/PKGBUILD index ea25ce39..80184ff1 100644 --- a/freetype2/mingw-w64/PKGBUILD +++ b/freetype2/mingw-w64/PKGBUILD @@ -36,9 +36,9 @@ else # 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}) -replaces+=(${_provides}) conflicts+=(${_provides}) _architectures="i686-w64-mingw32 x86_64-w64-mingw32"