wok-current rev 25610

Patch qt4 to ensure enable xmlpatterns module
author Stanislas Leduc <shann@slitaz.org>
date Sat Sep 02 23:33:35 2023 +0000 (9 months ago)
parents 03352f30e977
children eb2c6b438b3f
files qt4/receipt qt4/stuff/gcc6_build_fix.patch
line diff
     1.1 --- a/qt4/receipt	Sat Sep 02 22:03:07 2023 +0000
     1.2 +++ b/qt4/receipt	Sat Sep 02 23:33:35 2023 +0000
     1.3 @@ -71,6 +71,7 @@
     1.4  		-gtkstyle \
     1.5  		-no-openvg \
     1.6  		-no-reduce-relocations \
     1.7 +		-xmlpatterns \
     1.8  		-no-phonon \
     1.9  		-no-phonon-backend \
    1.10  		-graphicssystem raster \
     2.1 --- a/qt4/stuff/gcc6_build_fix.patch	Sat Sep 02 22:03:07 2023 +0000
     2.2 +++ b/qt4/stuff/gcc6_build_fix.patch	Sat Sep 02 23:33:35 2023 +0000
     2.3 @@ -27,3 +27,28 @@
     2.4  -
     2.5  +# Fixes compilation errors with GCC 6.1.0
     2.6  +QMAKE_CXXFLAGS += -std=gnu++98
     2.7 +
     2.8 +Avoid implicit conversions, which are now flagged by gcc6
     2.9 +
    2.10 +| api/qcoloroutput_p.h:74:60: error: shift expression '(1048575 << 20)' overflows [-fpermissive]
    2.11 +| api/qcoloroutput_p.h:74:63: error: enumerator value for 'BackgroundMask' is not an integer constant
    2.12 +|              BackgroundMask  = ((1 << BackgroundShift) - 1) << BackgroundShift
    2.13 +
    2.14 +
    2.15 +Upstream-Status: Inappropriate [Frozen upstream]
    2.16 +Signed-off-by: Khem Raj <raj.khem@gmail.com>
    2.17 +
    2.18 +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
    2.19 +--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.than	2016-02-03 11:43:04.567757448 +0100
    2.20 ++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h	2016-02-04 13:12:26.394350271 +0100
    2.21 +@@ -70,8 +70,8 @@ namespace QPatternist
    2.22 +             ForegroundShift = 10,
    2.23 +             BackgroundShift = 20,
    2.24 +             SpecialShift    = 20,
    2.25 +-            ForegroundMask  = ((1 << ForegroundShift) - 1) << ForegroundShift,
    2.26 +-            BackgroundMask  = ((1 << BackgroundShift) - 1) << BackgroundShift
    2.27 ++            ForegroundMask  = 0x1f << ForegroundShift,
    2.28 ++            BackgroundMask  = 0x7 << BackgroundShift
    2.29 +         };
    2.30 + 
    2.31 +     public: