summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Lamskoy2018-06-01 02:07:04 +0300
committerEugene Lamskoy2018-06-01 02:07:32 +0300
commitf901b315c7459b42a6327c91323f1f30ce90bb4d (patch)
tree46e5a66b29eee653ab0c0d5b0109f3cd8c85f1f0
parent3ba2b1a906f2c99b96cdfb01a922c5358c661469 (diff)
downloadaur-f901b315c7459b42a6327c91323f1f30ce90bb4d.tar.gz
Updates from cairo package
-rw-r--r--.SRCINFO30
-rw-r--r--utf-8.diff44
2 files changed, 53 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f74fca6dbad..95973c045619 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,10 @@
# Generated by mksrcinfo v8
-# Thu May 31 16:07:20 UTC 2018
+# Thu May 31 23:06:59 UTC 2018
pkgbase = cairo-ubuntu
- pkgdesc = Cairo vector graphics library
+ pkgdesc = 2D graphics library with support for multiple output devices (with ubuntu patches)
pkgver = 1.15.12
- pkgrel = 1
- url = http://cairographics.org/
- changelog = CHANGELOG
- arch = i686
+ pkgrel = 2
+ url = https://cairographics.org/
arch = x86_64
license = LGPL
license = MPL
@@ -21,27 +19,17 @@ pkgbase = cairo-ubuntu
depends = libxrender
depends = libxext
depends = fontconfig
- depends = pixman>=0.28.0
+ depends = pixman
depends = glib2
- depends = mesa
- depends = libgl
depends = lzo
provides = cairo=1.15.12
- provides = cairo-ubuntu
- provides = cairo-xcb
- conflicts = cairo
- conflicts = cairo-cleartype
- conflicts = cairo-git
- conflicts = cairo-gl-git
- conflicts = cairo-glitz
- conflicts = cairo-ocaml-git
- conflicts = cairo-small
- replaces = cairo-xcb
- source = http://cairographics.org/snapshots/cairo-1.15.12.tar.xz
+ source = 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
source = cairo-webkit-html5-fix.patch
- md5sums = f7d9ad73a8abe0d178e0fc16d3fcbfa3
+ md5sums = SKIP
+ md5sums = 46b1abd8e6ff88107680d907b8c247fc
md5sums = 080eac1ce1b2fa2beb550555d31d29b8
md5sums = 4ffec1c86085da11bf9f56d6bf88fbdf
md5sums = 6080d20e289f5e75cc013e8f40710aa3
diff --git a/utf-8.diff b/utf-8.diff
new file mode 100644
index 000000000000..882551867638
--- /dev/null
+++ b/utf-8.diff
@@ -0,0 +1,44 @@
+ src/cairo-quartz-image.h | 2 +-
+ src/cairo-quartz.h | 2 +-
+ src/cairo-vg.h | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git c/src/cairo-quartz-image.h i/src/cairo-quartz-image.h
+index dae234dac..0dd5abb4f 100644
+--- c/src/cairo-quartz-image.h
++++ i/src/cairo-quartz-image.h
+@@ -1,6 +1,6 @@
+ /* cairo - a vector graphics library with display and print output
+ *
+- * Copyright © 2008 Mozilla Corporation
++ * Copyright © 2008 Mozilla Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+diff --git c/src/cairo-quartz.h i/src/cairo-quartz.h
+index 9be5f9ae5..9e11e876f 100644
+--- c/src/cairo-quartz.h
++++ i/src/cairo-quartz.h
+@@ -1,6 +1,6 @@
+ /* cairo - a vector graphics library with display and print output
+ *
+- * Copyright © 2006, 2007 Mozilla Corporation
++ * Copyright © 2006, 2007 Mozilla Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+diff --git c/src/cairo-vg.h i/src/cairo-vg.h
+index f9a62e51c..a2701db3b 100644
+--- c/src/cairo-vg.h
++++ i/src/cairo-vg.h
+@@ -1,8 +1,8 @@
+ /* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */
+ /* cairo - a vector graphics library with display and print output
+ *
+- * Copyright © 2007 * Mozilla Corporation
+- * Copyright © 2009 Chris Wilson
++ * Copyright © 2007 * Mozilla Corporation
++ * Copyright © 2009 Chris Wilson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public