From 97af7359b0e18bd99d2adc5f5860a19a035e51cb3a7d2cf1126b4062d95834d9 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 29 Jul 2018 05:26:21 +0000 Subject: [PATCH] Accepting request 625983 from home:wolfi323:branches:KDE:Applications - Build with gcc7 on Leap 42.3, it doesn't compile with 4.8 anymore OBS-URL: https://build.opensuse.org/request/show/625983 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/gwenview5?expand=0&rev=107 --- gwenview5.changes | 5 +++++ gwenview5.spec | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/gwenview5.changes b/gwenview5.changes index f47865f..fc12945 100644 --- a/gwenview5.changes +++ b/gwenview5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 28 22:49:44 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:29 UTC 2018 - lbeltrame@kde.org diff --git a/gwenview5.spec b/gwenview5.spec index fba8ad7..f8de32b 100644 --- a/gwenview5.spec +++ b/gwenview5.spec @@ -56,6 +56,15 @@ BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.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 Provides: gwenview = %{version} Obsoletes: gwenview < %{version} Recommends: %{name}-lang @@ -72,6 +81,16 @@ hierarchies. %setup -q -n gwenview-%{version} %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 -- -DGWENVIEW_SEMANTICINFO_BACKEND="Baloo" %make_jobs