summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-07-09 12:25:37 +0000
committerJohannes Huber <johu@gentoo.org>2012-07-09 12:25:37 +0000
commit24377f180132dc14d49ed6a30beddef9febe3d0d (patch)
treeda9c409c4eb2ff6edd08cb76cb45968ffc25ed73 /x11-libs/qt-sql
parentVersion bump (bug 425400, by Khayyam), drop old. (diff)
downloadhistorical-24377f180132dc14d49ed6a30beddef9febe3d0d.tar.gz
historical-24377f180132dc14d49ed6a30beddef9febe3d0d.tar.bz2
historical-24377f180132dc14d49ed6a30beddef9febe3d0d.zip
Remove old.
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/qt-sql')
-rw-r--r--x11-libs/qt-sql/ChangeLog5
-rw-r--r--x11-libs/qt-sql/files/qt-4.6-nolibx11.patch18
2 files changed, 4 insertions, 19 deletions
diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index 6eb0b2ba1e9c..226c028faa9b 100644
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-sql
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.145 2012/07/09 11:40:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.146 2012/07/09 12:25:37 johu Exp $
+
+ 09 Jul 2012; Johannes Huber <johu@gentoo.org> -files/qt-4.6-nolibx11.patch:
+ Remove old.
09 Jul 2012; Johannes Huber <johu@gentoo.org> -qt-sql-4.6.3-r2.ebuild:
Drop Qt-4.6.3
diff --git a/x11-libs/qt-sql/files/qt-4.6-nolibx11.patch b/x11-libs/qt-sql/files/qt-4.6-nolibx11.patch
deleted file mode 100644
index e5d13327b8ce..000000000000
--- a/x11-libs/qt-sql/files/qt-4.6-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