From 5d0d7089e11847ed7966bcaf35ce110d6baf615e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 21 Sep 2019 11:34:52 +0200 Subject: [PATCH] - reenable c++11 patch as the crash does not seem to be related to it - downgrade optimizations to O1 - rel 25 --- cxx11.patch | 2 +- qt4.spec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cxx11.patch b/cxx11.patch index 3ee7cac..34306fe 100644 --- a/cxx11.patch +++ b/cxx11.patch @@ -60,7 +60,7 @@ constructor.setupOffsets(); - return false; -+ return nullptr; ++ return NULL; }; diff --git a/qt4.spec b/qt4.spec index 7a124bc..ac36fe3 100644 --- a/qt4.spec +++ b/qt4.spec @@ -63,7 +63,7 @@ Summary(pl.UTF-8): Biblioteka Qt do tworzenia GUI Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt Name: qt4 Version: 4.8.7 -Release: 24 +Release: 25 License: LGPL v2.1 or GPL v3.0 Group: X11/Libraries Source0: http://download.qt-project.org/official_releases/qt/4.8/%{version}/qt-everywhere-opensource-src-%{version}.tar.gz @@ -1573,7 +1573,7 @@ Programas exemplo para o Qt versão. %patch50 -p1 %patch51 -p1 %patch52 -p1 -#%patch53 -p1 +%patch53 -p1 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \ mkspecs/common/linux.conf @@ -1585,9 +1585,9 @@ Programas exemplo para o Qt versão. s|QMAKE_LINK.*=.*g++|QMAKE_LINK\t\t= %{__cxx}|; s|QMAKE_LINK_SHLIB.*=.*g++|QMAKE_LINK_SHLIB\t= %{__cxx}|; s|QMAKE_CFLAGS_RELEASE.*|QMAKE_CFLAGS_RELEASE\t+= %{rpmcppflags} %{rpmcflags}|; - s|QMAKE_CXXFLAGS_RELEASE.*|QMAKE_CXXFLAGS_RELEASE\t+= %{rpmcppflags} %{rpmcxxflags} -std=gnu++98|; + s|QMAKE_CXXFLAGS_RELEASE.*|QMAKE_CXXFLAGS_RELEASE\t+= %{rpmcppflags} %{rpmcxxflags} -std=gnu++98 -O1|; s|QMAKE_CFLAGS_DEBUG.*|QMAKE_CFLAGS_DEBUG\t+= %{debugcflags}|; - s|QMAKE_CXXFLAGS_DEBUG.*|QMAKE_CXXFLAGS_DEBUG\t+= %{debugcflags} -std=gnu++98|; + s|QMAKE_CXXFLAGS_DEBUG.*|QMAKE_CXXFLAGS_DEBUG\t+= %{debugcflags} -std=gnu++98 -O1|; ' mkspecs/common/g++-base.conf %{__sed} -i -e ' @@ -1748,7 +1748,7 @@ echo '#QT_GRAPHICSSYSTEM=raster' > $RPM_BUILD_ROOT/etc/env.d/QT_GRAPHICSSYSTEM %{__make} install \ INSTALL_ROOT=$RPM_BUILD_ROOT -# this is only needed to build the library itself and breaks other build that use it +# this is only needed to build the library itself and breaks other builds that use it %{__sed} -i -e 's|-std=gnu++98||g' $RPM_BUILD_ROOT%{_datadir}/qt4/mkspecs/common/g++-base.conf # for qt-creator sth is messed up in the Makefile, nothing for make install -- 2.44.0