wok-current rev 25609
Patch qt4 to build with gcc 6
author | Stanislas Leduc <shann@slitaz.org> |
---|---|
date | Sat Sep 02 22:03:07 2023 +0000 (14 months ago) |
parents | a91651fabf7c |
children | 63b31b012ead |
files | qt4/receipt qt4/stuff/gcc6_build_fix.patch |
line diff
1.1 --- a/qt4/receipt Sat Sep 02 20:54:38 2023 +0000 1.2 +++ b/qt4/receipt Sat Sep 02 22:03:07 2023 +0000 1.3 @@ -38,6 +38,9 @@ 1.4 # Rules to configure and make the package. 1.5 compile_rules() 1.6 { 1.7 + # Patch for build with gcc 6 1.8 + patch -p1 < $stuff/gcc6_build_fix.patch 1.9 + 1.10 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${src}/lib" 1.11 ./configure\ 1.12 -silent \
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/qt4/stuff/gcc6_build_fix.patch Sat Sep 02 22:03:07 2023 +0000 2.3 @@ -0,0 +1,29 @@ 2.4 +This patch is needed so that build does not fail on C++11 errors such as the one below: 2.5 + 2.6 +In file included from ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastAllocBase.h:84:0, 2.7 +from ../3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h:24, 2.8 +from ../3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_exec.cpp:50: 2.9 +../3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h:173:69: error: 'std::tr1' has not been declared 2.10 +template<typename T> struct HasTrivialConstructor : public std::tr1::has_trivial_constructor<T> { }; 2.11 +^ 2.12 + 2.13 +Signed-off-by: Lucas C. Villa Real <lucasvr@gobolinux.org> 2.14 + 2.15 +--- qt-everywhere-opensource-src-4.8.6/src/script/script.pro.orig 2016-08-24 00:27:12.079214652 +0000 2.16 ++++ qt-everywhere-opensource-src-4.8.6/src/script/script.pro 2016-08-24 00:24:42.151217592 +0000 2.17 +@@ -107,3 +107,6 @@ integrity { 2.18 + 2.19 + # WebKit doesn't compile in C++0x mode 2.20 + *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x 2.21 ++ 2.22 ++# Fixes compilation errors with GCC 6.1.0 2.23 ++QMAKE_CXXFLAGS += -std=gnu++98 2.24 +--- qt-everywhere-opensource-src-4.8.7/src/plugins/accessible/widgets/widgets.pro.orig 2016-08-24 02:40:02.819058359 +0000 2.25 ++++ qt-everywhere-opensource-src-4.8.7/src/plugins/accessible/widgets/widgets.pro 2016-08-24 02:40:31.543057795 +0000 2.26 +@@ -21,4 +21,5 @@ HEADERS += qaccessiblewidgets.h \ 2.27 + qaccessiblemenu.h \ 2.28 + itemviews.h 2.29 + 2.30 +- 2.31 ++# Fixes compilation errors with GCC 6.1.0 2.32 ++QMAKE_CXXFLAGS += -std=gnu++98