Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-xmlpatterns/files: qt-4.5-nolibx11.diff
Date: Sat, 27 Jun 2009 19:24:16
Message-Id: E1MKdVX-0004U4-Fp@stork.gentoo.org
1 yngwin 09/06/27 19:24:15
2
3 Added: qt-4.5-nolibx11.diff
4 Log:
5 Qt 4.5.2 release version bump
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 x11-libs/qt-xmlpatterns/files/qt-4.5-nolibx11.diff
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-xmlpatterns/files/qt-4.5-nolibx11.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-xmlpatterns/files/qt-4.5-nolibx11.diff?rev=1.1&content-type=text/plain
13
14 Index: qt-4.5-nolibx11.diff
15 ===================================================================
16 diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure
17 --- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300
18 +++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300
19 @@ -4733,14 +4733,6 @@
20 X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
21 fi
22
23 - # Check we actually have X11 :-)
24 - 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
25 - echo "Basic XLib functionality test failed!"
26 - echo " You might need to modify the include and library search paths by editing"
27 - echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
28 - exit 1
29 - fi
30 -
31 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
32 if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
33 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