summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Lamskoy2018-06-18 23:55:56 +0300
committerEugene Lamskoy2018-06-18 23:55:56 +0300
commit79cfa9fca45e69d1aff059d873e7e88c4bd782bf (patch)
tree71c37567c2eb0aedc06dd79c8b225fe30df8cb02
parent5ff2c6dae11406ebea49589c6ee761e86daa33c5 (diff)
downloadaur-79cfa9fca45e69d1aff059d873e7e88c4bd782bf.tar.gz
Added conflict. Small fixes
-rw-r--r--.SRCINFO7
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD5
3 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 342a7c03aae0..a67e8f86e15f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Jun 3 21:48:46 UTC 2018
+# Tue Jun 5 10:43:19 UTC 2018
pkgbase = cairo-ubuntu
pkgdesc = 2D graphics library with support for multiple output devices (with ubuntu patches)
pkgver = 1.15.12
- pkgrel = 2
+ pkgrel = 3
url = https://cairographics.org/
arch = x86_64
license = LGPL
@@ -23,7 +23,8 @@ pkgbase = cairo-ubuntu
depends = glib2
depends = lzo
provides = cairo=1.15.12
- source = git+https://anongit.freedesktop.org/git/cairo#commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519
+ conflicts = cairo
+ source = cairo::git+https://anongit.freedesktop.org/git/cairo#commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519
source = utf-8.diff
source = cairo-respect-fontconfig_pb.patch
source = cairo-server-side-gradients.patch
diff --git a/.gitignore b/.gitignore
index e05240c6677d..3df37932d5a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
src/*
pkg/*
*.tar.gz
-*.tar.zx
+*.tar.xz
*.tar.bz2
-.AURINFO
+cairo/*
diff --git a/PKGBUILD b/PKGBUILD
index be891d000bc3..1220e401ae19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,17 @@
pkgname=cairo-ubuntu
_realpkg=cairo
pkgver=1.15.12
-pkgrel=2
+pkgrel=3
pkgdesc="2D graphics library with support for multiple output devices (with ubuntu patches)"
url="https://cairographics.org/"
arch=(x86_64)
provides=("${_realpkg}=${pkgver}")
license=(LGPL MPL)
+conflicts=("cairo")
depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
_commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519 # tags/1.15.12^0
-source=("git+https://anongit.freedesktop.org/git/cairo#commit=$_commit"
+source=("cairo::git+https://anongit.freedesktop.org/git/cairo#commit=$_commit"
utf-8.diff
cairo-respect-fontconfig_pb.patch
cairo-server-side-gradients.patch