diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2014-12-12 21:50:18 +0000 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2014-12-12 21:50:18 +0000 |
| commit | 2c04c4caa3aeb670437980564bc9051ae0714154 (patch) | |
| tree | 289e1ab611a37465028b5154632bbee9f2846aed /x11-libs | |
| parent | Add support for kde applications dependency. (diff) | |
| download | gentoo-2-2c04c4caa3aeb670437980564bc9051ae0714154.tar.gz gentoo-2-2c04c4caa3aeb670437980564bc9051ae0714154.tar.bz2 gentoo-2-2c04c4caa3aeb670437980564bc9051ae0714154.zip | |
Disable the test suite better, bug 532338.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/cairo/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-1.12.18.ebuild | 4 | ||||
| -rw-r--r-- | x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch | 24 |
3 files changed, 21 insertions, 13 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog index edd11ba110a3..eb54d3ca294d 100644 --- a/x11-libs/cairo/ChangeLog +++ b/x11-libs/cairo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/cairo # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.391 2014/12/09 21:35:55 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.392 2014/12/12 21:50:18 mattst88 Exp $ + + 12 Dec 2014; Matt Turner <mattst88@gentoo.org> cairo-1.12.18.ebuild, + files/cairo-1.12.18-disable-test-suite.patch: + Disable the test suite better, bug 532338. 09 Dec 2014; Matt Turner <mattst88@gentoo.org> cairo-1.12.18.ebuild, cairo-9999.ebuild: diff --git a/x11-libs/cairo/cairo-1.12.18.ebuild b/x11-libs/cairo/cairo-1.12.18.ebuild index 31e778bdedc8..5cf67ca4f554 100644 --- a/x11-libs/cairo/cairo-1.12.18.ebuild +++ b/x11-libs/cairo/cairo-1.12.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.18.ebuild,v 1.4 2014/12/09 21:35:55 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.18.ebuild,v 1.5 2014/12/12 21:50:18 mattst88 Exp $ EAPI=5 @@ -102,6 +102,8 @@ src_prepare() { touch src/Makefile.am.features touch ChangeLog fi + + eautoreconf } multilib_src_configure() { diff --git a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch index 9af5f457c721..6822121ce495 100644 --- a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch +++ b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch @@ -1,13 +1,15 @@ -diff --git a/test/Makefile.am b/test/Makefile.am -index 950629b..db8cc90 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -75,7 +75,7 @@ endif - endif - test_sources += $(test) +diff --git a/Makefile.am b/Makefile.am +index 03fa352..7e11d24 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} --noinst_PROGRAMS = cairo-test-suite$(EXEEXT) # always build -+check_PROGRAMS = cairo-test-suite$(EXEEXT) # always build - noinst_SCRIPTS = check-refs.sh + DIST_SUBDIRS = src doc util boilerplate test perf + SUBDIRS = src doc util +-# libpng is required for our test programs +-if CAIRO_HAS_PNG_FUNCTIONS +-SUBDIRS += boilerplate test perf +-endif + + configure: cairo-version.h - TESTS += cairo-test-suite$(EXEEXT) |