diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2013-07-27 23:47:20 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2013-07-27 23:47:20 +0000 |
| commit | 1e8abf672c53096f20d5271383d47d87bf711c94 (patch) | |
| tree | 8db7329b2ce357cc6a5d7fde19121f2834c8553e /eclass | |
| parent | Only list OpenRc once in the dependencies for this virtual since it is the fi... (diff) | |
| download | gentoo-2-1e8abf672c53096f20d5271383d47d87bf711c94.tar.gz gentoo-2-1e8abf672c53096f20d5271383d47d87bf711c94.tar.bz2 gentoo-2-1e8abf672c53096f20d5271383d47d87bf711c94.zip | |
Rewrite sed expression in qt_nolibx11() to work on both 4.8.4 and 4.8.5. Fixes bug 478018.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9d8abeb64494..4276637b49ea 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.899 2013/07/27 16:18:00 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.900 2013/07/27 23:47:20 pesa Exp $ + + 27 Jul 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Rewrite sed expression in qt_nolibx11() to work on both 4.8.4 and 4.8.5. + Fixes bug 478018. 27 Jul 2013; Pacho Ramos <pacho@gentoo.org> go-mono.eclass: Don't block mono-3 diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 0ca15d76d6d2..ba0ed38800a1 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.147 2013/07/06 07:57:14 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.148 2013/07/27 23:47:20 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -804,10 +804,9 @@ qt_mkspecs_dir() { # @FUNCTION: qt_nolibx11 # @INTERNAL # @DESCRIPTION: -# Ignore X11 tests for packages that don't need X libraries installed. +# Skip X11 tests for packages that don't need X libraries installed. qt_nolibx11() { - sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || - die "x11 check sed failed" + sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' "${S}"/configure || die } EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst |