diff --git a/libqt4-4.8.7-gcc-6.1.0.patch b/libqt4-4.8.7-gcc-6.1.0.patch new file mode 100644 index 0000000..aaf1c49 --- /dev/null +++ b/libqt4-4.8.7-gcc-6.1.0.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: diff --git a/libqt4.spec b/libqt4.spec index 04cf2fd..2de2531 100644 --- a/libqt4.spec +++ b/libqt4.spec @@ -23,7 +23,7 @@ Name: libqt4 Version: 4.8.7 -Release: 1mamba +Release: 2mamba Summary: A multiplatform, C++ GUI application development framework Group: System/Libraries Vendor: openmamba @@ -52,6 +52,7 @@ Patch5: libqt4-4.8.4-set-alpha-flags-after-converto32-in-eglcreatesurface Patch6: libqt4-4.8.6-glib-honor-ExcludeSocketNotifiers-flag.patch Patch7: libqt4-4.8.6-qclipboard_fix_recursive.patch Patch8: libqt4-4.8.6-qclipboard_delay.patch +Patch9: libqt4-4.8.7-gcc-6.1.0.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -545,6 +546,7 @@ Phonon development files for %{name}. %patch6 -p1 %patch7 -p0 %patch8 -p0 +%patch9 -p1 sed -i -e "s|-O2|%{optflags}|g" mkspecs/%{platform}/qmake.conf @@ -554,6 +556,8 @@ export qtbuilddir=`pwd` export PATH=$qtbuilddir/bin:$PATH export MANPATH=$qtbuilddir/doc/man:$MANPATH export LD_LIBRARY_PATH=$qtbuilddir/lib:$LD_LIBRARY_PATH +# workaround for class std::auto_ptr' is deprecated with gcc-6 +export CXXFLAGS="%{optflags} -std=gnu++98 -Wno-deprecated" ./configure \ -prefix %{_qt4_prefix} \ @@ -576,7 +580,7 @@ export LD_LIBRARY_PATH=$qtbuilddir/lib:$LD_LIBRARY_PATH %ifarch arm -egl \ %endif - -release \ + -debug \ -shared \ -cups \ -fontconfig \ @@ -629,10 +633,10 @@ for d in QtDeclarative QtCore QtScript QtGui; do done # install libwebcore.a and libjscore.a -install -m755 src/3rdparty/webkit/Source/WebCore/release/libwebcore.a %{buildroot}%{_libdir}/libwebcore.a -install -m644 src/3rdparty/webkit/Source/WebCore/release/libwebcore.prl %{buildroot}%{_libdir}/libwebcore.prl -install -m755 src/3rdparty/webkit/Source/JavaScriptCore/release/libjscore.a %{buildroot}%{_libdir}/libjscore.a -install -m644 src/3rdparty/webkit/Source/JavaScriptCore/release/libjscore.prl %{buildroot}%{_libdir}/libjscore.prl +#install -m755 src/3rdparty/webkit/Source/WebCore/release/libwebcore.a %{buildroot}%{_libdir}/libwebcore.a +#install -m644 src/3rdparty/webkit/Source/WebCore/release/libwebcore.prl %{buildroot}%{_libdir}/libwebcore.prl +#install -m755 src/3rdparty/webkit/Source/JavaScriptCore/release/libjscore.a %{buildroot}%{_libdir}/libjscore.a +#install -m644 src/3rdparty/webkit/Source/JavaScriptCore/release/libjscore.prl %{buildroot}%{_libdir}/libjscore.prl install -p -m644 LICENSE.GPL3 %{buildroot}%{_qt4_prefix}/ @@ -985,10 +989,10 @@ echo "\ %{_qt4_headerdir}/QtDeclarative/ %{?build_phonon:%exclude %{_qt4_headerdir}/phonon/} #%{?build_phonon:%exclude %{_qt4_headerdir}/Qt/phonon*} -%{_qt4_libdir}/libwebcore.a -%{_qt4_libdir}/libwebcore.prl -%{_qt4_libdir}/libjscore.a -%{_qt4_libdir}/libjscore.prl +#%{_qt4_libdir}/libwebcore.a +#%{_qt4_libdir}/libwebcore.prl +#%{_qt4_libdir}/libjscore.a +#%{_qt4_libdir}/libjscore.prl %{_qt4_libdir}/libQtUiTools.a %{_qt4_libdir}/libQt3Support.la %{_qt4_libdir}/libQt3Support.prl @@ -1159,6 +1163,9 @@ echo "\ %endif %changelog +* Mon Jul 04 2016 Silvan Calarco 4.8.7-2mamba +- rebuilt with debug enabled + * Sun Jun 07 2015 Automatic Build System 4.8.7-1mamba - automatic version update by autodist