summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b4516632a019..6b1e5f937ed4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,6 +26,7 @@ pkgbase = cairo-infinality
depends = lzo
provides = cairo-xcb=1.14.2
provides = cairo=1.14.2
+ conflicts = cairo
replaces = cairo-xcb
source = http://cairographics.org/releases/cairo-1.14.2.tar.xz
source = cairo-respect-fontconfig_pb.patch
diff --git a/PKGBUILD b/PKGBUILD
index 400282b83d50..e35de3d93e1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,6 +18,7 @@ makedepends=('libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'val
provides=(
"cairo-xcb=$pkgver"
"cairo=$pkgver")
+conflicts=("cairo")
replaces=('cairo-xcb')
source=(
"http://cairographics.org/releases/cairo-$pkgver.tar.xz"