Accepting request 604017 from home:iznogood

Do not ack until https://build.opensuse.org/request/show/603977
is in Factory please, depends on that one.

- Enable pkgconfig(libbrotlidec), and add pkgconfig(libwoff2dec)
  BuildRequires and no longer pass -DUSE_WOFF2=false to cmake.
  Woff2 is now available in openSUSE.
- Pass -DENABLE_MINIBROWSER=ON to cmake, build the MiniBrowser and
  package it in devel subpackage. Usefull for developers.

OBS-URL: https://build.opensuse.org/request/show/604017
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=160
This commit is contained in:
Dominique Leuenberger 2018-05-14 07:27:59 +00:00 committed by Git OBS Bridge
parent 8d13902702
commit 6a60dff3b5
2 changed files with 15 additions and 3 deletions

View File

@ -20,6 +20,15 @@ Mon May 7 16:00:47 UTC 2018 - bjorn.lie@gmail.com
+ Fix several crashes and rendering issues. + Fix several crashes and rendering issues.
+ Security fixes: CVE-2018-4200. + Security fixes: CVE-2018-4200.
-------------------------------------------------------------------
Tue May 1 17:00:12 UTC 2018 - bjorn.lie@gmail.com
- Enable pkgconfig(libbrotlidec), and add pkgconfig(libwoff2dec)
BuildRequires and no longer pass -DUSE_WOFF2=false to cmake.
Woff2 is now available in openSUSE.
- Pass -DENABLE_MINIBROWSER=ON to cmake, build the MiniBrowser and
package it in devel subpackage. Usefull for developers.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 11 15:53:22 UTC 2018 - mgorse@suse.com Wed Apr 11 15:53:22 UTC 2018 - mgorse@suse.com

View File

@ -85,13 +85,13 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0
BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(harfbuzz) >= 0.9.2 BuildRequires: pkgconfig(harfbuzz) >= 0.9.2
# Currently passing -DUSE_WOFF2=false to cmake BuildRequires: pkgconfig(libbrotlidec) >= 1.0.1
# BuildRequires: pkgconfig(libbrotlidec) >= 1.0.1
BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libsoup-2.4) >= 2.61.90 BuildRequires: pkgconfig(libsoup-2.4) >= 2.61.90
BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libwoff2dec)
BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0
BuildRequires: pkgconfig(libxslt) >= 1.1.7 BuildRequires: pkgconfig(libxslt) >= 1.1.7
BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(sqlite3)
@ -293,7 +293,7 @@ export PYTHON=%{_bindir}/python3
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \
-DPORT=GTK \ -DPORT=GTK \
-DUSE_WOFF2=false \ -DENABLE_MINIBROWSER=ON \
%if %{with python3} %if %{with python3}
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \ -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
%endif %endif
@ -326,6 +326,8 @@ make -j $max_link_jobs
%endif %endif
# Exclude jsc - we package that on its own # Exclude jsc - we package that on its own
%exclude %{_libexecdir}/libwebkit2gtk%{_wk2sover}/jsc %exclude %{_libexecdir}/libwebkit2gtk%{_wk2sover}/jsc
# Exclude MiniBrowser, we package that in devel
%exclude %{_libexecdir}/libwebkit2gtk%{_wk2sover}/MiniBrowser
%{_libexecdir}/libwebkit2gtk%{_wk2sover}/ %{_libexecdir}/libwebkit2gtk%{_wk2sover}/
%{_libdir}/libwebkit2gtk-4.0.so.* %{_libdir}/libwebkit2gtk-4.0.so.*
%{_bindir}/WebKitWebDriver %{_bindir}/WebKitWebDriver
@ -361,6 +363,7 @@ make -j $max_link_jobs
%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc %{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc
%{_libdir}/pkgconfig/webkit2gtk-4.0.pc %{_libdir}/pkgconfig/webkit2gtk-4.0.pc
%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc %{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc
%{_libexecdir}/libwebkit2gtk%{_wk2sover}/MiniBrowser
%files -n webkit-jsc-%{_jscver} %files -n webkit-jsc-%{_jscver}
%{_libexecdir}/libwebkit2gtk%{_wk2sover}/jsc %{_libexecdir}/libwebkit2gtk%{_wk2sover}/jsc