rpm/webkit2gtk3
SHA256
1
0
Fork 0
forked from pool/webkit2gtk3
Code Pull Requests Activity

Accepting request 526325 from GNOME:Factory

Browse Source 
- Drop gcc6-c++ build conditionals for SLE12 / Leap42. (forwarded request 526245 from zhangxiaofei)

OBS-URL: https://build.opensuse.org/request/show/526325
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/webkit2gtk3?expand=0&rev=44
This commit is contained in:
Dominique Leuenberger 2017-09-15 19:07:27 +00:00 committed by Git OBS Bridge
commit a47e186f8e
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webkit2gtk3.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 14 14:57:43 UTC 2017 - fezhang@suse.com
- Drop gcc6-c++ build conditionals for SLE12 / Leap42.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 11 08:07:29 UTC 2017 - zaitor@opensuse.org Mon Sep 11 08:07:29 UTC 2017 - zaitor@opensuse.org

9
webkit2gtk3.spec
View File

@ -82,12 +82,7 @@ BuildRequires: pkgconfig(zlib)
%ifnarch s390 s390x %ifnarch s390 s390x
BuildRequires: binutils-gold BuildRequires: binutils-gold
%endif %endif
%if 0%{?suse_version} == 1315
BuildRequires: gcc6-c++
#!BuildIgnore: libgcc_s1
%else
BuildRequires: gcc-c++ >= 4.9 BuildRequires: gcc-c++ >= 4.9
%endif
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
# We require gtk2 for the Gtk2 plugin wrapper # We require gtk2 for the Gtk2 plugin wrapper
BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10 BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10
@ -248,10 +243,6 @@ more.
%global optflags %(echo %{optflags} -Wl,--no-keep-memory | sed 's/-g /-g1 /') %global optflags %(echo %{optflags} -Wl,--no-keep-memory | sed 's/-g /-g1 /')
%endif %endif
%cmake \ %cmake \
%if 0%{?suse_version} == 1315
-DCMAKE_C_COMPILER=gcc-6 \
-DCMAKE_CXX_COMPILER=g++-6 \
%endif
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \
-DPORT=GTK \ -DPORT=GTK \