diff options
| author |   Dror Levin <spatz@gentoo.org> | 2010-01-20 12:25:02 +0000 |
|---|---|---|
| committer | Dror Levin <spatz@gentoo.org> | 2010-01-20 12:25:02 +0000 |
| commit | 9a551a8c8619f5793b59a72fdb99eddc3901e433 (patch) | |
| tree | 8737a349e5df7d3115bbcbd5ac54448e10c1ed25 | |
| parent | Restore macos keywords, make alsa dep required only for linux, bug 293671. (diff) | |
| download | gentoo-2-9a551a8c8619f5793b59a72fdb99eddc3901e433.tar.gz gentoo-2-9a551a8c8619f5793b59a72fdb99eddc3901e433.tar.bz2 gentoo-2-9a551a8c8619f5793b59a72fdb99eddc3901e433.zip | |
Remake nolibx11 patch for 4.6.1 and remove hebrew patch as it was included upstream.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
| -rw-r--r-- | x11-libs/qt-core/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/qt-core/files/qt-core-4.6.1-nolibx11.patch | 18 | ||||
| -rw-r--r-- | x11-libs/qt-core/qt-core-4.6.1.ebuild | 5 |
3 files changed, 26 insertions, 4 deletions
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index 2b7b70ec5644..256b1107b6c2 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.85 2010/01/19 14:47:02 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.86 2010/01/20 12:25:01 spatz Exp $ + + 20 Jan 2010; Dror Levin <spatz@gentoo.org> qt-core-4.6.1.ebuild, + +files/qt-core-4.6.1-nolibx11.patch: + Remake nolibx11 patch for 4.6.1 and remove hebrew patch as it was included + upstream. *qt-core-4.6.1 (19 Jan 2010) diff --git a/x11-libs/qt-core/files/qt-core-4.6.1-nolibx11.patch b/x11-libs/qt-core/files/qt-core-4.6.1-nolibx11.patch new file mode 100644 index 000000000000..e5d13327b8ce --- /dev/null +++ b/x11-libs/qt-core/files/qt-core-4.6.1-nolibx11.patch @@ -0,0 +1,18 @@ +--- configure-orig 2010-01-20 14:18:32.466798257 +0200 ++++ configure 2010-01-20 14:18:58.516799116 +0200 +@@ -5059,15 +5059,6 @@ + X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" + fi + +- # Check we actually have X11 :-) +- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS +- if [ $? != "0" ]; then +- echo "Basic XLib functionality test failed!" +- echo " You might need to modify the include and library search paths by editing" +- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." +- exit 1 +- fi +- + # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) + if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then diff --git a/x11-libs/qt-core/qt-core-4.6.1.ebuild b/x11-libs/qt-core/qt-core-4.6.1.ebuild index f2ddf831b3ec..2d288573cb66 100644 --- a/x11-libs/qt-core/qt-core-4.6.1.ebuild +++ b/x11-libs/qt-core/qt-core-4.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1.ebuild,v 1.1 2010/01/19 14:47:02 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1.ebuild,v 1.2 2010/01/20 12:25:01 spatz Exp $ EAPI="2" inherit qt4-build @@ -53,8 +53,7 @@ tools/linguist/shared translations" PATCHES=( - "${FILESDIR}/qt-4.6-nolibx11.diff" - "${FILESDIR}/${P}-hebrew.patch" + "${FILESDIR}/${P}-nolibx11.patch" ) pkg_setup() { |