diff --git a/qt-everywhere-opensource-src-4.8.7-gcc6.patch b/qt-everywhere-opensource-src-4.8.7-gcc6.patch new file mode 100644 index 0000000..b2cc28f --- /dev/null +++ b/qt-everywhere-opensource-src-4.8.7-gcc6.patch @@ -0,0 +1,14 @@ +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: diff --git a/qt.spec b/qt.spec index 9f7cf78..88c7e4a 100644 --- a/qt.spec +++ b/qt.spec @@ -44,7 +44,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.7 -Release: 7%{?dist} +Release: 8%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -172,6 +172,9 @@ Patch89: qt-everywhere-opensource-src-4.8.6-QTBUG-38585.patch # build against the system clucene09-core Patch90: qt-everywhere-opensource-src-4.8.6-system-clucene.patch +# fix build issue with gcc6 +Patch100: qt-everywhere-opensource-src-4.8.7-gcc6.patch + # upstream patches # backported from Qt5 (essentially) # http://bugzilla.redhat.com/702493 @@ -571,6 +574,7 @@ and invoke methods on those objects. # delete bundled copy rm -rf src/3rdparty/clucene %endif +%patch100 -p1 -b .gcc6 # upstream patches %patch102 -p1 -b .qgtkstyle_disable_gtk_theme_check @@ -1332,6 +1336,9 @@ fi %changelog +* Thu Feb 04 2016 Than Ngo - 1:4.8.7-8 +- fix build issue with gcc6 + * Tue Feb 02 2016 Rex Dieter 1:4.8.7-7 - macros.qt4 : cleanup, introduce %%_qt4_optflags, %%_qt4_ldflags, %%_qt4_qmake_flags