summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSolomon Choina <shlomochoina@gmail.com>2017-12-22 11:03:32 -0500
committerSolomon Choina <shlomochoina@gmail.com>2017-12-22 11:03:32 -0500
commitc7d09d790be9ad631960fda386cc3fc673ca2728 (patch)
tree7aca22851db116c27a9710171af5898cab945583
parent830999111a49fe415d06bff584aaa92409243d0b (diff)
update pkgver remove a patch
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD25
2 files changed, 12 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e30e931..7fff344 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
# Generated by mksrcinfo v8
-# Thu Sep 14 21:31:09 UTC 2017
+# Fri Dec 22 16:03:15 UTC 2017
pkgbase = cairo-infinality-ultimate
pkgdesc = Cairo vector graphics library
- pkgver = 1.15.8
- pkgrel = 3
+ pkgver = 1.15.10
+ pkgrel = 1
url = http://cairographics.org/
arch = i686
arch = x86_64
groups = infinality-bundle
license = LGPL
license = MPL
- makedepends = mesa-libgl
+ makedepends = libgl
makedepends = librsvg
makedepends = gtk2
makedepends = poppler-glib
@@ -31,13 +31,10 @@ pkgbase = cairo-infinality-ultimate
conflicts = cairo
conflicts = cairo-cleartype
conflicts = cairo-git
- conflicts = cairo-gl-git
- conflicts = cairo-glitz
conflicts = cairo-ocaml-git
- conflicts = cairo-small
conflicts = cairo-ubuntu
replaces = cairo-xcb
- source = git+https://anongit.freedesktop.org/git/cairo#tag=1.15.8
+ source = git+https://anongit.freedesktop.org/git/cairo#tag=1.15.10
source = cairo-make-lcdfilter-default.patch
source = cairo-respect-fontconfig_pb.patch
source = cairo-server-side-gradients.patch
diff --git a/PKGBUILD b/PKGBUILD
index 1c3d9d2..f388d90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
pkgname=cairo-infinality-ultimate
_name=cairo
-pkgver=1.15.8
-pkgrel=3
+pkgver=1.15.10
+pkgrel=1
pkgdesc="Cairo vector graphics library"
arch=(i686 x86_64)
license=('LGPL' 'MPL')
@@ -13,15 +13,12 @@ url="http://cairographics.org/"
groups=('infinality-bundle')
# requires libGL + libEGL - all libgl variants (mesa
depends=('libpng' 'libxrender' 'libxext' 'fontconfig-infinality-ultimate' 'pixman' 'glib2' 'libgl' 'lzo')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind' 'git')
- # for the test suite:
- #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
-#optdepends=('xcb-util: for XCB backend') # really needed?
+makedepends=('libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind' 'git')
provides=('cairo-xcb' 'cairo')
replaces=('cairo-xcb')
-conflicts=('cairo' 'cairo-cleartype' 'cairo-git' 'cairo-gl-git' 'cairo-glitz' 'cairo-ocaml-git' 'cairo-small' 'cairo-ubuntu')
+conflicts=('cairo' 'cairo-cleartype' 'cairo-git' 'cairo-ocaml-git' 'cairo-ubuntu')
-source=("git+https://anongit.freedesktop.org/git/cairo#tag=1.15.8"
+source=("git+https://anongit.freedesktop.org/git/cairo#tag=$pkgver"
cairo-make-lcdfilter-default.patch
cairo-respect-fontconfig_pb.patch
cairo-server-side-gradients.patch
@@ -49,6 +46,7 @@ build() {
--localstatedir=/var \
--disable-static \
--enable-tee \
+ --disable-lto \
--enable-gl \
--enable-egl \
--enable-svg \
@@ -56,19 +54,10 @@ build() {
--enable-pdf \
--enable-gobject \
--enable-gtk-doc
-
- #--disable-xlib-xcb \
- #--enable-test-surfaces \ takes ages
- #--enable-drm # breaks build
-
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
-#check() {
-# cd $_name
-# make -j4 -k test || /bin/true
-#}
-
package() {
cd $_name
make DESTDIR="$pkgdir" install