summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten de Boer2015-08-31 20:32:16 +0200
committerMaarten de Boer2015-08-31 20:34:48 +0200
commit670e522c18038153f3cecdfe8186539861c68cab (patch)
tree0b9d267fe1d1328c76dede1136f852bddbf99c06
parent3686872399c557c71823fd5ed93bdf72757be80e (diff)
downloadaur-670e522c18038153f3cecdfe8186539861c68cab.tar.gz
Fix pkgbuild paths and conflict option
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD7
2 files changed, 5 insertions, 3 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 29231f7475df..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"
@@ -30,7 +31,7 @@ sha1sums=('c8da68aa66ca0855b5d0ff552766d3e8679e1d24'
'5bff494f52a16114f4cf6d04bfb0b9d7c4e9da23')
build() {
- cd $pkgname-$pkgver
+ cd "$srcdir/cairo-$pkgver"
patch -Np1 -i ../cairo-respect-fontconfig_pb.patch
patch -Np1 -i ../cairo-server-side-gradients.patch
@@ -57,11 +58,11 @@ build() {
}
check() {
- cd $pkgname-$pkgver
+ cd "$srcdir/cairo-$pkgver"
#make -j1 -k test || /bin/true
}
package() {
- cd $pkgname-$pkgver
+ cd "$srcdir/cairo-$pkgver"
make DESTDIR="$pkgdir" install
}