Signed-off-by: Khem Raj <raj.k...@gmail.com> --- recipes-qt4/qt4/qt4-4.8.7.inc | 4 ++++ ...6-qt-everywhere-opensource-src-4.8.7-gcc6.patch | 24 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 recipes-qt4/qt4/qt4-4.8.7/0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch
diff --git a/recipes-qt4/qt4/qt4-4.8.7.inc b/recipes-qt4/qt4/qt4-4.8.7.inc index 9720605..aa4f73c 100644 --- a/recipes-qt4/qt4/qt4-4.8.7.inc +++ b/recipes-qt4/qt4/qt4-4.8.7.inc @@ -26,6 +26,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever file://0032-aarch64_add_header.patch \ file://0034-Fix-kmap2qmap-build-with-clang.patch \ file://0035-Add-nios2-support.patch \ + file://0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch \ file://Fix-QWSLock-invalid-argument-logs.patch \ file://add_check_for_aarch64_32.patch \ file://g++.conf \ @@ -41,6 +42,9 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" +# workaround for class std::auto_ptr' is deprecated with gcc-6 +CXXFLAGS += "-std=gnu++98 -Wno-deprecated" + # disable webkit for mips64 n32 temporarily that fails to compile, # qt upstream defect: # https://bugreports.qt-project.org/browse/QTBUG-39224 diff --git a/recipes-qt4/qt4/qt4-4.8.7/0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch b/recipes-qt4/qt4/qt4-4.8.7/0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch new file mode 100644 index 0000000..6e0f18d --- /dev/null +++ b/recipes-qt4/qt4/qt4-4.8.7/0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch @@ -0,0 +1,24 @@ +Avoid implicit conversions, which are now flagged by gcc6 + +| api/qcoloroutput_p.h:74:60: error: shift expression '(1048575 << 20)' overflows [-fpermissive] +| api/qcoloroutput_p.h:74:63: error: enumerator value for 'BackgroundMask' is not an integer constant +| BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift + + +Upstream-Status: Inappropriate [Frozen upstream] +Signed-off-by: Khem Raj <raj.k...@gmail.com> + +diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.than qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h +--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.than 2016-02-03 11:43:04.567757448 +0100 ++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-02-04 13:12:26.394350271 +0100 +@@ -70,8 +70,8 @@ namespace QPatternist + ForegroundShift = 10, + BackgroundShift = 20, + SpecialShift = 20, +- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift, +- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift ++ ForegroundMask = 0x1f << ForegroundShift, ++ BackgroundMask = 0x7 << BackgroundShift + }; + + public: -- 1.9.1 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
