From d81e78c00c90df01129182a3a747d23879f8bc16a5ad37a957c5ca4aa52cba6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Thu, 27 Dec 2018 08:07:02 +0000
Subject: [PATCH] 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
---
 webkit2gtk3.changes | 8 ++++++++
 webkit2gtk3.spec    | 8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes
index 8e56677..e3cac13 100644
--- a/webkit2gtk3.changes
+++ b/webkit2gtk3.changes
@@ -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
 
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index a0b954a..ff17ecf 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -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