diff options
| author |   Jonathan Callen <jcallen@gentoo.org> | 2010-02-16 06:51:24 +0000 |
|---|---|---|
| committer | Jonathan Callen <jcallen@gentoo.org> | 2010-02-16 06:51:24 +0000 |
| commit | 350a57f88581720d6c5d64049435148ee29c677b (patch) | |
| tree | d6ebd0d75ce19af601a87fce1dd642f10ee2b30c /x11-libs/qt-sql | |
| parent | Drop old patch (diff) | |
| download | historical-350a57f88581720d6c5d64049435148ee29c677b.tar.gz historical-350a57f88581720d6c5d64049435148ee29c677b.tar.bz2 historical-350a57f88581720d6c5d64049435148ee29c677b.zip | |
Actually remove old patch
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'x11-libs/qt-sql')
| -rw-r--r-- | x11-libs/qt-sql/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-sql/files/qt-4.6.1-nolibx11.patch | 18 |
2 files changed, 5 insertions, 19 deletions
diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog index 2e68eb051446..d91174a699fb 100644 --- a/x11-libs/qt-sql/ChangeLog +++ b/x11-libs/qt-sql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-sql # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.74 2010/02/15 15:11:49 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.75 2010/02/16 06:51:24 abcd Exp $ + + 16 Feb 2010; Jonathan Callen <abcd@gentoo.org> + -files/qt-4.6.1-nolibx11.patch: + Actually remove old patch *qt-sql-4.6.2 (15 Feb 2010) diff --git a/x11-libs/qt-sql/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-sql/files/qt-4.6.1-nolibx11.patch deleted file mode 100644 index e5d13327b8ce..000000000000 --- a/x11-libs/qt-sql/files/qt-4.6.1-nolibx11.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 |