diff --git a/srcpkgs/cairo/patches/cairo-1.12.16-lto-optional.patch b/srcpkgs/cairo/patches/cairo-1.12.16-lto-optional.patch deleted file mode 100644 index 1b769819e77..00000000000 --- a/srcpkgs/cairo/patches/cairo-1.12.16-lto-optional.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings -index f984eb2..15b3da2 100644 ---- build/configure.ac.warnings -+++ build/configure.ac.warnings -@@ -38,13 +38,18 @@ 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([],[ -+AC_ARG_ENABLE(lto, -+ AS_HELP_STRING([--disable-lto], -+ [Do not try to use Link-Time Optimization])) -+if test "x$enable_lto" != "xno"; then -+ 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" --]) -+ ]) -+fi - - MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" - - diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template index 35d9ce50d2c..bb2075e3007 100644 --- a/srcpkgs/cairo/template +++ b/srcpkgs/cairo/template @@ -1,7 +1,7 @@ # Template build file for 'cairo'. pkgname=cairo -version=1.12.16 -revision=7 +version=1.14.0 +revision=1 build_style=gnu-configure configure_args="--disable-static --disable-lto --enable-tee $(vopt_if opengl '--enable-gl --enable-egl') @@ -11,11 +11,10 @@ maintainer="Juan RP " license="LGPL-2.1, MPL-1.1" homepage="http://cairographics.org" distfiles="${homepage}/releases/$pkgname-$version.tar.xz" -checksum=2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846 +checksum=2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7 -hostmakedepends="which automake libtool pkg-config" -makedepends="libpng-devel>=1.6 fontconfig-devel pixman-devel>=0.28 libXrender-devel>=0.9.7_3 libglib-devel" -depends="pixman>=0.28" +hostmakedepends="automake libtool pkg-config" +makedepends="libpng-devel fontconfig-devel pixman-devel libXrender-devel libglib-devel" pre_configure() { autoreconf -fi