Date: Thursday, September 4, 2014 @ 21:57:01 Author: jgc Revision: 220961
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64 Added: cairo/repos/gnome-unstable-i686/ cairo/repos/gnome-unstable-i686/PKGBUILD (from rev 220960, cairo/trunk/PKGBUILD) cairo/repos/gnome-unstable-i686/cairo-1.12.16-lto-optional.patch (from rev 220960, cairo/trunk/cairo-1.12.16-lto-optional.patch) cairo/repos/gnome-unstable-x86_64/ cairo/repos/gnome-unstable-x86_64/PKGBUILD (from rev 220960, cairo/trunk/PKGBUILD) cairo/repos/gnome-unstable-x86_64/cairo-1.12.16-lto-optional.patch (from rev 220960, cairo/trunk/cairo-1.12.16-lto-optional.patch) --------------------------------------------------------+ gnome-unstable-i686/PKGBUILD | 62 +++++++++++++++ gnome-unstable-i686/cairo-1.12.16-lto-optional.patch | 29 +++++++ gnome-unstable-x86_64/PKGBUILD | 62 +++++++++++++++ gnome-unstable-x86_64/cairo-1.12.16-lto-optional.patch | 29 +++++++ 4 files changed, 182 insertions(+) Copied: cairo/repos/gnome-unstable-i686/PKGBUILD (from rev 220960, cairo/trunk/PKGBUILD) =================================================================== --- gnome-unstable-i686/PKGBUILD (rev 0) +++ gnome-unstable-i686/PKGBUILD 2014-09-04 19:57:01 UTC (rev 220961) @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Brice Carpentier <br...@daknet.org> + +pkgname=cairo +pkgver=1.13.1 +pkgrel=1 +pkgdesc="Cairo vector graphics library" +arch=(i686 x86_64) +license=('LGPL' 'MPL') +url="http://cairographics.org/" +depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa' '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? +provides=('cairo-xcb') +replaces=('cairo-xcb') +source=('git://anongit.freedesktop.org/cairo#commit=29a8b4e970379ca04a7db8e63c71bb34c0e349ce') +sha1sums=('SKIP') + +build() { + cd $pkgname + NOCONFIGURE=1 ./autogen.sh + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-lto \ + --enable-tee \ + --enable-gl \ + --enable-egl \ + --enable-svg \ + --enable-ps \ + --enable-pdf \ + --enable-gobject \ + --enable-gtk-doc #\ + # --enable-test-surfaces + + #--disable-xlib-xcb \ + # --enable-test-surfaces \ takes ages + #--enable-drm # breaks build + + make +} + +check() { + cd $pkgname + #make -j1 -k test || /bin/true + + # results: + # 1.12.8-1 # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped + # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped + # 1.12.16-1: 144 Passed, 364 Failed [6 crashed, 12 expected], 27 Skipped + +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} Copied: cairo/repos/gnome-unstable-i686/cairo-1.12.16-lto-optional.patch (from rev 220960, cairo/trunk/cairo-1.12.16-lto-optional.patch) =================================================================== --- gnome-unstable-i686/cairo-1.12.16-lto-optional.patch (rev 0) +++ gnome-unstable-i686/cairo-1.12.16-lto-optional.patch 2014-09-04 19:57:01 UTC (rev 220961) @@ -0,0 +1,29 @@ +diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings +index f984eb2..15b3da2 100644 +--- a/build/configure.ac.warnings ++++ b/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" + + Copied: cairo/repos/gnome-unstable-x86_64/PKGBUILD (from rev 220960, cairo/trunk/PKGBUILD) =================================================================== --- gnome-unstable-x86_64/PKGBUILD (rev 0) +++ gnome-unstable-x86_64/PKGBUILD 2014-09-04 19:57:01 UTC (rev 220961) @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Brice Carpentier <br...@daknet.org> + +pkgname=cairo +pkgver=1.13.1 +pkgrel=1 +pkgdesc="Cairo vector graphics library" +arch=(i686 x86_64) +license=('LGPL' 'MPL') +url="http://cairographics.org/" +depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa' '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? +provides=('cairo-xcb') +replaces=('cairo-xcb') +source=('git://anongit.freedesktop.org/cairo#commit=29a8b4e970379ca04a7db8e63c71bb34c0e349ce') +sha1sums=('SKIP') + +build() { + cd $pkgname + NOCONFIGURE=1 ./autogen.sh + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-lto \ + --enable-tee \ + --enable-gl \ + --enable-egl \ + --enable-svg \ + --enable-ps \ + --enable-pdf \ + --enable-gobject \ + --enable-gtk-doc #\ + # --enable-test-surfaces + + #--disable-xlib-xcb \ + # --enable-test-surfaces \ takes ages + #--enable-drm # breaks build + + make +} + +check() { + cd $pkgname + #make -j1 -k test || /bin/true + + # results: + # 1.12.8-1 # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped + # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped + # 1.12.16-1: 144 Passed, 364 Failed [6 crashed, 12 expected], 27 Skipped + +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} Copied: cairo/repos/gnome-unstable-x86_64/cairo-1.12.16-lto-optional.patch (from rev 220960, cairo/trunk/cairo-1.12.16-lto-optional.patch) =================================================================== --- gnome-unstable-x86_64/cairo-1.12.16-lto-optional.patch (rev 0) +++ gnome-unstable-x86_64/cairo-1.12.16-lto-optional.patch 2014-09-04 19:57:01 UTC (rev 220961) @@ -0,0 +1,29 @@ +diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings +index f984eb2..15b3da2 100644 +--- a/build/configure.ac.warnings ++++ b/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" + +