wok-current rev 25611

Patch qt4 for build webkit module with gcc 6
author Stanislas Leduc <shann@slitaz.org>
date Sat Sep 02 23:39:56 2023 +0000 (16 months ago)
parents 63b31b012ead
children e5202cbaa4a3
files qt4/stuff/gcc6_build_fix.patch
line diff
     1.1 --- a/qt4/stuff/gcc6_build_fix.patch	Sat Sep 02 23:33:35 2023 +0000
     1.2 +++ b/qt4/stuff/gcc6_build_fix.patch	Sat Sep 02 23:39:56 2023 +0000
     1.3 @@ -52,3 +52,38 @@
     1.4           };
     1.5   
     1.6       public:
     1.7 +
     1.8 +Allow gcc v6 to build webkit. Without this, webkit isn't built
     1.9 +when gcc v6 is used (silently but then python-pyqt fails to build).
    1.10 +
    1.11 +Upstream-Status: Inappropriate [no development on qt4 now]
    1.12 +RP 2016/5/26
    1.13 +
    1.14 +Index: qt-everywhere-opensource-src-4.8.7/configure
    1.15 +===================================================================
    1.16 +
    1.17 +Amend this and change the logic to assume all compilers are suitable
    1.18 +exept 3.3x resp. 3.2x and older ones.
    1.19 +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
    1.20 +
    1.21 +--- qt-everywhere-opensource-src-4.8.7.orig/configure
    1.22 ++++ qt-everywhere-opensource-src-4.8.7/configure
    1.23 +@@ -7757,15 +7757,15 @@
    1.24 +     *-g++*)
    1.25 + 	# Check gcc's version
    1.26 + 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
    1.27 +-	    5*|4*|3.4*)
    1.28 +-		;;
    1.29 +             3.3*)
    1.30 +                 canBuildWebKit="no"
    1.31 +                 ;;
    1.32 +-	    *)
    1.33 ++	    3.2*|3.1*|3.0*|2*)
    1.34 + 		canBuildWebKit="no"
    1.35 + 		canBuildQtXmlPatterns="no"
    1.36 + 		;;
    1.37 ++	    *)
    1.38 ++		;;
    1.39 + 	esac
    1.40 + 	;;
    1.41 +     solaris-cc*)