pool/konqueror
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 625984 from home:wolfi323:branches:KDE:Applications

Browse Source 
- Build with gcc7 on Leap 42.3, it doesn't compile with 4.8 anymore

OBS-URL: https://build.opensuse.org/request/show/625984
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=74
This commit is contained in:
Luca Beltrame 2018-07-29 05:27:02 +00:00 committed by Git OBS Bridge
parent b549c22c7d
commit 34aef873d2
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
konqueror.changes
View File

@ -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 Thu Jul 26 13:00:51 UTC 2018 - lbeltrame@kde.org

19
konqueror.spec
View File

@ -54,6 +54,15 @@ BuildRequires: pkgconfig(Qt5Script) >= 5.2.0
BuildRequires: pkgconfig(Qt5WebEngine) >= 5.6.0 BuildRequires: pkgconfig(Qt5WebEngine) >= 5.6.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5X11Extras) >= 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: dolphin-part
Recommends: kwebkitpart Recommends: kwebkitpart
Obsoletes: kde-baseapps5-libkonq < %{version} Obsoletes: kde-baseapps5-libkonq < %{version}
@ -113,6 +122,16 @@ Development package for the konqueror libraries.
%setup -q %setup -q
%build %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 %cmake_kf5 -d build
%make_jobs %make_jobs