diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2009-06-27 19:24:15 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2009-06-27 19:24:15 +0000 |
| commit | a99b9bfe2631102742160f7d4c4ece9837535154 (patch) | |
| tree | bfd7d6f8fef51e877182604ec79c17c1917ec5b3 /x11-libs/qt-core/files | |
| parent | amd64 stable, security bug 272566. (diff) | |
| download | historical-a99b9bfe2631102742160f7d4c4ece9837535154.tar.gz historical-a99b9bfe2631102742160f7d4c4ece9837535154.tar.bz2 historical-a99b9bfe2631102742160f7d4c4ece9837535154.zip | |
Qt 4.5.2 release version bump
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/qt-core/files')
| -rw-r--r-- | x11-libs/qt-core/files/qt-4.5-nolibx11.diff | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/x11-libs/qt-core/files/qt-4.5-nolibx11.diff b/x11-libs/qt-core/files/qt-4.5-nolibx11.diff new file mode 100644 index 000000000000..f94be77b742d --- /dev/null +++ b/x11-libs/qt-core/files/qt-4.5-nolibx11.diff @@ -0,0 +1,18 @@ +diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure +--- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300 ++++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300 +@@ -4733,14 +4733,6 @@ + X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" + fi + +- # Check we actually have X11 :-) +- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; 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 |