# HG changeset patch # User Stanislas Leduc # Date 1693692187 0 # Node ID 03352f30e977db164201b8a8cdf185d1624f167a # Parent a91651fabf7cebc65e612b01eb32d21157f095b5 Patch qt4 to build with gcc 6 diff -r a91651fabf7c -r 03352f30e977 qt4/receipt --- a/qt4/receipt Sat Sep 02 20:54:38 2023 +0000 +++ b/qt4/receipt Sat Sep 02 22:03:07 2023 +0000 @@ -38,6 +38,9 @@ # Rules to configure and make the package. compile_rules() { + # Patch for build with gcc 6 + patch -p1 < $stuff/gcc6_build_fix.patch + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${src}/lib" ./configure\ -silent \ diff -r a91651fabf7c -r 03352f30e977 qt4/stuff/gcc6_build_fix.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt4/stuff/gcc6_build_fix.patch Sat Sep 02 22:03:07 2023 +0000 @@ -0,0 +1,29 @@ +This patch is needed so that build does not fail on C++11 errors such as the one below: + +In file included from ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastAllocBase.h:84:0, +from ../3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h:24, +from ../3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_exec.cpp:50: +../3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h:173:69: error: 'std::tr1' has not been declared +template struct HasTrivialConstructor : public std::tr1::has_trivial_constructor { }; +^ + +Signed-off-by: Lucas C. Villa Real + +--- qt-everywhere-opensource-src-4.8.6/src/script/script.pro.orig 2016-08-24 00:27:12.079214652 +0000 ++++ qt-everywhere-opensource-src-4.8.6/src/script/script.pro 2016-08-24 00:24:42.151217592 +0000 +@@ -107,3 +107,6 @@ integrity { + + # WebKit doesn't compile in C++0x mode + *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x ++ ++# Fixes compilation errors with GCC 6.1.0 ++QMAKE_CXXFLAGS += -std=gnu++98 +--- qt-everywhere-opensource-src-4.8.7/src/plugins/accessible/widgets/widgets.pro.orig 2016-08-24 02:40:02.819058359 +0000 ++++ qt-everywhere-opensource-src-4.8.7/src/plugins/accessible/widgets/widgets.pro 2016-08-24 02:40:31.543057795 +0000 +@@ -21,4 +21,5 @@ HEADERS += qaccessiblewidgets.h \ + qaccessiblemenu.h \ + itemviews.h + +- ++# Fixes compilation errors with GCC 6.1.0 ++QMAKE_CXXFLAGS += -std=gnu++98