From ecda38b0a51979110b18b1bcd5f03f5b6a55e13a Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Sun, 13 Oct 2013 23:15:50 +0000 Subject: Update Qt to 4.8.5 and Qt Creator to 2.8.0. Proudly brought to you by the KDE on FreeBSD team, with commits by makc@, Schaich Alonso and yours truly. Besides the tons of upstream fixes, we have mkspecs for GCC 4.9 and clang33 (from ports), staging support in the Makefiles and dependency fixes related to pkg-config. Many thanks to the people who helped test the ports using our area51 repository, and also to the people who provided patches and bug reports via GNATS! PR: ports/180615 ports/181921 ports/182049 --- devel/qt4/files/patch-configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'devel/qt4/files/patch-configure') diff --git a/devel/qt4/files/patch-configure b/devel/qt4/files/patch-configure index bede68d7870e..91537eb8dab8 100644 --- a/devel/qt4/files/patch-configure +++ b/devel/qt4/files/patch-configure @@ -39,12 +39,13 @@ echo "Creating qmake. Please wait..." OLD_QCONFIG_H= -@@ -5831,14 +5826,6 @@ +@@ -5995,15 +5995,6 @@ + QMakeVar add QMAKE_CXXFLAGS -fpermissive 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 +- compileTest x11/xlib "XLib" $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" -- cgit v1.2.3