diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index b00f25d..8a6aea3 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 4 21:04:10 UTC 2018 - mgorse@suse.com + +- Integrate changes needed for SLE 12 / leap 42.3: + + depend on gcc7-c++, and pass appropriate executables to cmake. + + Disable web crypto API: libgcrypt is too old. + + Define USE_GSTREAMER_GL=FALSE: needs gstreamer 1.10.0 or newer. +- disable libwoff2 for SLE 15/12 and Leap 15/42.3, since it is not + available there. + ------------------------------------------------------------------- Wed Sep 26 15:19:42 UTC 2018 - bjorn.lie@gmail.com diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index ab3afb9..d4a477e 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -60,7 +60,11 @@ BuildRequires: Mesa-libGLESv3-devel BuildRequires: bison >= 2.3 BuildRequires: cmake BuildRequires: enchant-devel +%if 0%{?suse_version} == 1315 +BuildRequires: gcc7-c++ +%else BuildRequires: gcc-c++ >= 4.9 +%endif BuildRequires: gobject-introspection-devel BuildRequires: gperf >= 3.0.1 BuildRequires: hyphen-devel @@ -97,7 +101,9 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-2.4) >= 2.61.90 BuildRequires: pkgconfig(libwebp) +%if 0%{?suse_version} > 1500 BuildRequires: pkgconfig(libwoff2dec) +%endif BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.1.7 BuildRequires: pkgconfig(sqlite3) @@ -305,6 +311,15 @@ export PYTHON=%{_bindir}/python3 -DCMAKE_BUILD_TYPE=Release \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \ -DPORT=GTK \ +%if 0%{?suse_version} == 1315 + -DCMAKE_C_COMPILER=gcc-7 \ + -DCMAKE_CXX_COMPILER=g++-7 \ + -DENABLE_WEB_CRYPTO=OFF \ + -DUSE_GSTREAMER_GL=false \ +%endif +%if 0%{?suse_version} <= 1500 + -DUSE_WOFF2=false \ +%endif -DENABLE_MINIBROWSER=ON \ %if %{with python3} -DPYTHON_EXECUTABLE=%{_bindir}/python3 \