diff --no-dereference -Naur -- libcairo.normalized/build/config.sub libcairo.srctix/build/config.sub
--- libcairo.normalized/build/config.sub	2012-06-08 18:15:38.000000000 +0200
+++ libcairo.srctix/build/config.sub	2013-03-29 14:00:31.883796588 +0100
@@ -1348,7 +1348,7 @@
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff --no-dereference -Naur -- libcairo.normalized/build/configure.ac.warnings libcairo.srctix/build/configure.ac.warnings
--- libcairo.normalized/build/configure.ac.warnings	2012-10-21 18:30:52.000000000 +0200
+++ libcairo.srctix/build/configure.ac.warnings	2014-04-28 14:31:54.776689178 +0200
@@ -36,16 +36,6 @@
 dnl We also abuse the warning-flag facility to enable other compiler
 dnl options.  Namely, the following:
 
-dnl -flto working really needs a test link, not just a compile
-
-safe_MAYBE_WARN="$MAYBE_WARN"
-MAYBE_WARN="$MAYBE_WARN -flto"
-AC_TRY_LINK([],[
-	int main(int argc, char **argv) { return 0; }
-],[],[
-	MAYBE_WARN="$safe_MAYBE_WARN"
-])
-
 MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
 
 dnl Also to turn various gcc/glibc-specific preprocessor checks
diff --no-dereference -Naur -- libcairo.normalized/configure libcairo.srctix/configure
--- libcairo.normalized/configure	2013-02-10 14:39:19.000000000 +0100
+++ libcairo.srctix/configure	2014-09-07 12:55:24.353462613 +0200
@@ -18159,33 +18159,6 @@
 MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
 			-erroff=E_ENUM_TYPE_MISMATCH_OP"
 
-
-
-safe_MAYBE_WARN="$MAYBE_WARN"
-MAYBE_WARN="$MAYBE_WARN -flto"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-	int main(int argc, char **argv) { return 0; }
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-else
-
-	MAYBE_WARN="$safe_MAYBE_WARN"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
 MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
 
 MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
@@ -31800,7 +31773,7 @@
 
 
 
-if pkg-config --exists 'pixman-1 >= 0.27.1'; then
+if ${PKG_CONFIG:-pkg-config} --exists 'pixman-1 >= 0.27.1'; then
 
 $as_echo "#define HAS_PIXMAN_GLYPHS 1" >>confdefs.h
 
diff --no-dereference -Naur -- libcairo.normalized/configure.ac libcairo.srctix/configure.ac
--- libcairo.normalized/configure.ac	2013-01-29 14:54:51.000000000 +0100
+++ libcairo.srctix/configure.ac	2014-12-27 15:10:23.171474943 +0100
@@ -662,7 +662,7 @@
   image_LIBS=$pixman_LIBS
 ])
 
-if pkg-config --exists 'pixman-1 >= 0.27.1'; then
+if ${PKG_CONFIG:-pkg-config} --exists 'pixman-1 >= 0.27.1'; then
     AC_DEFINE([HAS_PIXMAN_GLYPHS], 1, [Enable pixman glyph cache])
 fi
 
diff --no-dereference -Naur -- libcairo.normalized/tixbuildinfo libcairo.srctix/tixbuildinfo
--- libcairo.normalized/tixbuildinfo	1970-01-01 01:00:00.000000000 +0100
+++ libcairo.srctix/tixbuildinfo	2013-11-29 15:37:32.018778190 +0100
@@ -0,0 +1,8 @@
+tix.version=1
+tix.class=srctix
+pkg.name=libcairo
+pkg.build-libraries=libz bzip2 libpng libfreetype libfontconfig? librsvg? libexpat? libpixman libglib?
+pkg.build-system=configure
+pkg.configure.args=--without-x --disable-valgrind --disable-xlib --enable-xlib=no --enable-xcb=no --enable-xlib-xcb=no --enable-xcb-shm=no --enable-glx=no
+pkg.make.vars=V=1
+pkg.post-install.cmd=tix-eradicate-libtool-la