# HG changeset patch # User Stanislas Leduc # Date 1693697615 0 # Node ID 63b31b012ead0d8de5ba701291ed446b29eb59fd # Parent 03352f30e977db164201b8a8cdf185d1624f167a Patch qt4 to ensure enable xmlpatterns module diff -r 03352f30e977 -r 63b31b012ead qt4/receipt --- a/qt4/receipt Sat Sep 02 22:03:07 2023 +0000 +++ b/qt4/receipt Sat Sep 02 23:33:35 2023 +0000 @@ -71,6 +71,7 @@ -gtkstyle \ -no-openvg \ -no-reduce-relocations \ + -xmlpatterns \ -no-phonon \ -no-phonon-backend \ -graphicssystem raster \ diff -r 03352f30e977 -r 63b31b012ead qt4/stuff/gcc6_build_fix.patch --- a/qt4/stuff/gcc6_build_fix.patch Sat Sep 02 22:03:07 2023 +0000 +++ b/qt4/stuff/gcc6_build_fix.patch Sat Sep 02 23:33:35 2023 +0000 @@ -27,3 +27,28 @@ - +# Fixes compilation errors with GCC 6.1.0 +QMAKE_CXXFLAGS += -std=gnu++98 + +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 + +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: