Accepting request 661511 from GNOME:Next

- Pass DENABLE_ACCELERATED_2D_CANVAS=ON to cmake, build accelerated
  2d canvas support, we already build the needed support in cairo.
- Switch to Ninja build, add ninja BuildRequires and pass GNinja to
  cmake and use ninja_build and ninja_make macros.

OBS-URL: https://build.opensuse.org/request/show/661511
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=196
This commit is contained in:
Bjørn Lie 2018-12-27 08:07:02 +00:00 committed by Git OBS Bridge
parent a30c918155
commit d81e78c00c
2 changed files with 14 additions and 2 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 26 19:21:01 UTC 2018 - bjorn.lie@gmail.com
- Pass DENABLE_ACCELERATED_2D_CANVAS=ON to cmake, build accelerated
2d canvas support, we already build the needed support in cairo.
- Switch to Ninja build, add ninja BuildRequires and pass GNinja to
cmake and use ninja_build and ninja_make macros.
-------------------------------------------------------------------
Wed Dec 26 16:54:29 UTC 2018 - schwab@suse.de

View File

@ -56,6 +56,7 @@ Source99: webkit2gtk3.keyring
Patch0: webkit2gtk3-python3.patch
# PATCh-FIX-UPSTREAM webkit2gtk3-boo1088932-a11y-state-set.patch boo#1088932 webkit#184366 mgorse@suse.com -- fix crash when atk_object_ref_state_set is called on an AtkObject that's being destroyed.
Patch1: webkit2gtk3-boo1088932-a11y-state-set.patch
BuildRequires: Mesa-libEGL-devel
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLESv1_CM-devel
@ -74,6 +75,7 @@ BuildRequires: gperf >= 3.0.1
BuildRequires: hyphen-devel
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: ninja
BuildRequires: perl >= 5.10.0
BuildRequires: pkgconfig
BuildRequires: ruby >= 1.8.7
@ -312,6 +314,7 @@ export PYTHON=%{_bindir}/python3
%global optflags %(echo %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads | sed 's/-g /-g1 /')
%endif
%cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \
-DPORT=GTK \
@ -326,6 +329,7 @@ export PYTHON=%{_bindir}/python3
-DENABLE_MEDIA_SOURCE=OFF \
%endif
-DENABLE_MINIBROWSER=ON \
-DENABLE_ACCELERATED_2D_CANVAS=ON \
%if %{with python3}
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
%endif
@ -340,10 +344,10 @@ export PYTHON=%{_bindir}/python3
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread"
make -j $max_link_jobs
%ninja_build -j $max_link_jobs
%install
%cmake_install
%ninja_install -C build
%find_lang WebKit2GTK-4.0
%post -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig