diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2016-08-09 17:16:52 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-08-09 17:23:25 +0000 |
| commit | f034050d57150a78025afd4c03c53a910b830b28 (patch) | |
| tree | bfbb985a875dafaae837ed490f8d8eb0301889e9 /main/qt/qt-everywhere-opensource-src-4.8.7-gcc6.patch | |
| parent | eb7ba51d42919306642bed0b08856d51329e67de (diff) | |
| download | aports-f034050d57150a78025afd4c03c53a910b830b28.tar.bz2 aports-f034050d57150a78025afd4c03c53a910b830b28.tar.xz | |
main/qt: fix build on gcc6 and aarch64
Diffstat (limited to 'main/qt/qt-everywhere-opensource-src-4.8.7-gcc6.patch')
| -rw-r--r-- | main/qt/qt-everywhere-opensource-src-4.8.7-gcc6.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/main/qt/qt-everywhere-opensource-src-4.8.7-gcc6.patch b/main/qt/qt-everywhere-opensource-src-4.8.7-gcc6.patch new file mode 100644 index 0000000000..aaf1c497f2 --- /dev/null +++ b/main/qt/qt-everywhere-opensource-src-4.8.7-gcc6.patch @@ -0,0 +1,35 @@ +diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure +--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500 ++++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500 +@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in + *-g++*) + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 5*|4*|3.4*) ++ 8*|7*|6*|5*|4*|3.4*) + ;; + 3.3*) + canBuildWebKit="no" +@@ -8060,7 +8060,7 @@ g++*) + 3.*) + COMPILER_VERSION="3.*" + ;; +- 5*|4.*) ++ 8*|7*|6*|5*|4.*) + COMPILER_VERSION="4" + ;; + *) +diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 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.gcc6 2015-05-07 09:14:48.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500 +@@ -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: |