[arch-commits] Commit in cairo/repos (8 files)

Andreas Radke andyrtr at archlinux.org
Fri Aug 1 08:13:15 UTC 2014


    Date: Friday, August 1, 2014 @ 10:13:15
  Author: andyrtr
Revision: 218481

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  cairo/repos/extra-i686/PKGBUILD
    (from rev 218480, cairo/trunk/PKGBUILD)
  cairo/repos/extra-i686/cairo-1.12.16-lto-optional.patch
    (from rev 218480, cairo/trunk/cairo-1.12.16-lto-optional.patch)
  cairo/repos/extra-x86_64/PKGBUILD
    (from rev 218480, cairo/trunk/PKGBUILD)
  cairo/repos/extra-x86_64/cairo-1.12.16-lto-optional.patch
    (from rev 218480, cairo/trunk/cairo-1.12.16-lto-optional.patch)
Deleted:
  cairo/repos/extra-i686/PKGBUILD
  cairo/repos/extra-i686/cairo-1.12.16-lto-optional.patch
  cairo/repos/extra-x86_64/PKGBUILD
  cairo/repos/extra-x86_64/cairo-1.12.16-lto-optional.patch

-----------------------------------------------+
 /PKGBUILD                                     |  140 ++++++++++++++++++++++++
 /cairo-1.12.16-lto-optional.patch             |   58 +++++++++
 extra-i686/PKGBUILD                           |   70 ------------
 extra-i686/cairo-1.12.16-lto-optional.patch   |   29 ----
 extra-x86_64/PKGBUILD                         |   70 ------------
 extra-x86_64/cairo-1.12.16-lto-optional.patch |   29 ----
 6 files changed, 198 insertions(+), 198 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-08-01 08:12:56 UTC (rev 218480)
+++ extra-i686/PKGBUILD	2014-08-01 08:13:15 UTC (rev 218481)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Brice Carpentier <brice at daknet.org>
-
-pkgname=cairo
-pkgver=1.12.16
-pkgrel=2
-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' 'sh' 'lzo2')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind'
-             # 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=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-        cairo-1.12.16-lto-optional.patch)
-sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec'
-          '80883e44a57942762995aea2f136701b1fa54568')
-
-prepare() {
-  cd $pkgname-$pkgver
-  # https://bugs.archlinux.org/task/40313 + https://bugs.gentoo.org/510782
-  # patch to make it optional is taken from Gentoo
-  patch -Np1 -i $srcdir/cairo-1.12.16-lto-optional.patch
-  autoreconf -vfi
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./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-test-surfaces
-	
-	#--disable-xlib-xcb \
-	# --enable-test-surfaces \ takes ages
-	#--enable-drm # breaks build
-	
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make -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-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: cairo/repos/extra-i686/PKGBUILD (from rev 218480, cairo/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-08-01 08:13:15 UTC (rev 218481)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Brice Carpentier <brice at daknet.org>
+
+pkgname=cairo
+pkgver=1.12.16
+pkgrel=3
+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' 'sh' 'lzo')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind'
+             # 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=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
+        cairo-1.12.16-lto-optional.patch)
+sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec'
+          '80883e44a57942762995aea2f136701b1fa54568')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # https://bugs.archlinux.org/task/40313 + https://bugs.gentoo.org/510782
+  # patch to make it optional is taken from Gentoo
+  patch -Np1 -i $srcdir/cairo-1.12.16-lto-optional.patch
+  autoreconf -vfi
+}
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./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-test-surfaces
+	
+	#--disable-xlib-xcb \
+	# --enable-test-surfaces \ takes ages
+	#--enable-drm # breaks build
+	
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make -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-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-i686/cairo-1.12.16-lto-optional.patch
===================================================================
--- extra-i686/cairo-1.12.16-lto-optional.patch	2014-08-01 08:12:56 UTC (rev 218480)
+++ extra-i686/cairo-1.12.16-lto-optional.patch	2014-08-01 08:13:15 UTC (rev 218481)
@@ -1,29 +0,0 @@
-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/extra-i686/cairo-1.12.16-lto-optional.patch (from rev 218480, cairo/trunk/cairo-1.12.16-lto-optional.patch)
===================================================================
--- extra-i686/cairo-1.12.16-lto-optional.patch	                        (rev 0)
+++ extra-i686/cairo-1.12.16-lto-optional.patch	2014-08-01 08:13:15 UTC (rev 218481)
@@ -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"
+ 
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-08-01 08:12:56 UTC (rev 218480)
+++ extra-x86_64/PKGBUILD	2014-08-01 08:13:15 UTC (rev 218481)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Brice Carpentier <brice at daknet.org>
-
-pkgname=cairo
-pkgver=1.12.16
-pkgrel=2
-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' 'sh' 'lzo2')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind'
-             # 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=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-        cairo-1.12.16-lto-optional.patch)
-sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec'
-          '80883e44a57942762995aea2f136701b1fa54568')
-
-prepare() {
-  cd $pkgname-$pkgver
-  # https://bugs.archlinux.org/task/40313 + https://bugs.gentoo.org/510782
-  # patch to make it optional is taken from Gentoo
-  patch -Np1 -i $srcdir/cairo-1.12.16-lto-optional.patch
-  autoreconf -vfi
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./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-test-surfaces
-	
-	#--disable-xlib-xcb \
-	# --enable-test-surfaces \ takes ages
-	#--enable-drm # breaks build
-	
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make -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-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: cairo/repos/extra-x86_64/PKGBUILD (from rev 218480, cairo/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-08-01 08:13:15 UTC (rev 218481)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Brice Carpentier <brice at daknet.org>
+
+pkgname=cairo
+pkgver=1.12.16
+pkgrel=3
+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' 'sh' 'lzo')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind'
+             # 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=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
+        cairo-1.12.16-lto-optional.patch)
+sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec'
+          '80883e44a57942762995aea2f136701b1fa54568')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # https://bugs.archlinux.org/task/40313 + https://bugs.gentoo.org/510782
+  # patch to make it optional is taken from Gentoo
+  patch -Np1 -i $srcdir/cairo-1.12.16-lto-optional.patch
+  autoreconf -vfi
+}
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./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-test-surfaces
+	
+	#--disable-xlib-xcb \
+	# --enable-test-surfaces \ takes ages
+	#--enable-drm # breaks build
+	
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make -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-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/cairo-1.12.16-lto-optional.patch
===================================================================
--- extra-x86_64/cairo-1.12.16-lto-optional.patch	2014-08-01 08:12:56 UTC (rev 218480)
+++ extra-x86_64/cairo-1.12.16-lto-optional.patch	2014-08-01 08:13:15 UTC (rev 218481)
@@ -1,29 +0,0 @@
-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/extra-x86_64/cairo-1.12.16-lto-optional.patch (from rev 218480, cairo/trunk/cairo-1.12.16-lto-optional.patch)
===================================================================
--- extra-x86_64/cairo-1.12.16-lto-optional.patch	                        (rev 0)
+++ extra-x86_64/cairo-1.12.16-lto-optional.patch	2014-08-01 08:13:15 UTC (rev 218481)
@@ -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"
+ 
+




More information about the arch-commits mailing list