diff --git a/konqueror.changes b/konqueror.changes index 5f7ccb7..8545e35 100644 --- a/konqueror.changes +++ b/konqueror.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 28 22:49:31 UTC 2018 - wbauer@tmo.at + +- Build with gcc7 on Leap 42.3, it doesn't compile with 4.8 anymore + ------------------------------------------------------------------- Thu Jul 26 13:00:51 UTC 2018 - lbeltrame@kde.org diff --git a/konqueror.spec b/konqueror.spec index af5bd75..d658c45 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -54,6 +54,15 @@ BuildRequires: pkgconfig(Qt5Script) >= 5.2.0 BuildRequires: pkgconfig(Qt5WebEngine) >= 5.6.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 +# Needed for 42.3 +%if 0%{?suse_version} < 1330 +# It does not build with the default compiler (GCC 4.8) on Leap 42.x +%if 0%{?sle_version} < 120300 +BuildRequires: gcc6-c++ +%else +BuildRequires: gcc7-c++ +%endif +%endif Recommends: dolphin-part Recommends: kwebkitpart Obsoletes: kde-baseapps5-libkonq < %{version} @@ -113,6 +122,16 @@ Development package for the konqueror libraries. %setup -q %build + %if 0%{?suse_version} < 1330 + # It does not build with the default compiler (GCC 4.8) on Leap 42.x + %if 0%{?sle_version} < 120300 + export CC=gcc-6 + export CXX=g++-6 + %else + export CC=gcc-7 + export CXX=g++-7 + %endif + %endif %cmake_kf5 -d build %make_jobs