installs under /opt/cairo-xml alongside official cairo lib,

use with PKG_CONFIG_PATH=/opt/cairo-xml/lib/pkgconfig/

2 files changed, 11 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b03f10eb80f..e6b5aa01717b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cairo-xml
 	pkgdesc = cairo graphics library with support for xml surfaces enabled
 	pkgver = 1.16.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cairographics.org/
 	arch = x86_64
 	license = LGPL
@@ -22,8 +22,6 @@ pkgbase = cairo-xml
 	depends = pixman
 	depends = glib2
 	depends = lzo
-	provides = cairo
-	conflicts = cairo
 	source = git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=3ad43122b21a3299dd729dc8462d6b8f7f01142d
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 2864f16598a9..d2aabc0185a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,10 @@
 # Maintainer: osch <oliver@luced.de>
 # This PKGBUILD is modifed copy from https://www.archlinux.org/packages/extra/x86_64/cairo/
+# Installs under /opt/cairo-xml alongside official cairo lib,
+# use with PKG_CONFIG_PATH=/opt/cairo-xml/lib/pkgconfig/ in dependant projects.
 pkgname=cairo-xml
 pkgver=1.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc="cairo graphics library with support for xml surfaces enabled"
 url="https://cairographics.org/"
 arch=(x86_64)
@@ -10,8 +12,6 @@ license=(LGPL MPL)
 depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
 makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
 checkdepends=(ttf-dejavu gsfonts)
-provides=("cairo")
-conflicts=("cairo")
 _commit=3ad43122b21a3299dd729dc8462d6b8f7f01142d  # tags/1.16.0^0
 source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
 sha1sums=('SKIP')
@@ -21,19 +21,10 @@ pkgver() {
   git describe --tags | sed 's/-/+/g'
 }
 
-prepare() {
-  cd cairo
-
-  # Update gtk-doc
-  cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4
-  cp /usr/share/gtk-doc/data/gtk-doc.make build/Makefile.am.gtk-doc
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
 build() {
   cd cairo
-  ./configure --prefix=/usr \
+  NOCONFIGURE=1 ./autogen.sh
+  ./configure --prefix=/opt/cairo-xml \
         --sysconfdir=/etc \
         --localstatedir=/var \
         --disable-static \
@@ -46,19 +37,14 @@ build() {
         --enable-gtk-doc \
         --enable-full-testing \
         --enable-test-surfaces \
-        --enable-xml
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+        --enable-xml \
+        --enable-static  --disable-shared \
+        --disable-gtk-doc-html
+  sed -i -e 's:-L${libdir} -lcairo:${libdir}/libcairo.a:g' src/cairo.pc
+  sed -i -e 's:-L${libdir} -lcairo-gobject:${libdir}/libcairo-gobject.a:g' src/cairo-gobject.pc
   make
 }
 
-check() {
-  cd cairo
-  # FIXME: tests don't pass
-  env CAIRO_TEST_TARGET=image \
-      CAIRO_TEST_TARGET_FORMAT=rgba \
-      CAIRO_TESTS='!pthread-show-text' make -k check || :
-}
-
 package() {
   cd cairo
   make DESTDIR="$pkgdir" install