| 1 |
pesa 13/07/27 23:47:20 |
| 2 |
|
| 3 |
Modified: ChangeLog qt4-build.eclass |
| 4 |
Log: |
| 5 |
Rewrite sed expression in qt_nolibx11() to work on both 4.8.4 and 4.8.5. Fixes bug 478018. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.900 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.900&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.900&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.899&r2=1.900 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.899 |
| 18 |
retrieving revision 1.900 |
| 19 |
diff -u -r1.899 -r1.900 |
| 20 |
--- ChangeLog 27 Jul 2013 16:18:00 -0000 1.899 |
| 21 |
+++ ChangeLog 27 Jul 2013 23:47:20 -0000 1.900 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.899 2013/07/27 16:18:00 pacho Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.900 2013/07/27 23:47:20 pesa Exp $ |
| 27 |
+ |
| 28 |
+ 27 Jul 2013; Davide Pesavento <pesa@g.o> qt4-build.eclass: |
| 29 |
+ Rewrite sed expression in qt_nolibx11() to work on both 4.8.4 and 4.8.5. |
| 30 |
+ Fixes bug 478018. |
| 31 |
|
| 32 |
27 Jul 2013; Pacho Ramos <pacho@g.o> go-mono.eclass: |
| 33 |
Don't block mono-3 |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.148 eclass/qt4-build.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.148&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.148&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.147&r2=1.148 |
| 42 |
|
| 43 |
Index: qt4-build.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
| 46 |
retrieving revision 1.147 |
| 47 |
retrieving revision 1.148 |
| 48 |
diff -u -r1.147 -r1.148 |
| 49 |
--- qt4-build.eclass 6 Jul 2013 07:57:14 -0000 1.147 |
| 50 |
+++ qt4-build.eclass 27 Jul 2013 23:47:20 -0000 1.148 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2013 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.147 2013/07/06 07:57:14 pesa Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.148 2013/07/27 23:47:20 pesa Exp $ |
| 56 |
|
| 57 |
# @ECLASS: qt4-build.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -804,10 +804,9 @@ |
| 60 |
# @FUNCTION: qt_nolibx11 |
| 61 |
# @INTERNAL |
| 62 |
# @DESCRIPTION: |
| 63 |
-# Ignore X11 tests for packages that don't need X libraries installed. |
| 64 |
+# Skip X11 tests for packages that don't need X libraries installed. |
| 65 |
qt_nolibx11() { |
| 66 |
- sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || |
| 67 |
- die "x11 check sed failed" |
| 68 |
+ sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' "${S}"/configure || die |
| 69 |
} |
| 70 |
|
| 71 |
EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst |
Archives