Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/
Date: Fri, 15 Mar 2019 13:16:38
Message-Id: 1552655721.8b519b169720d73f7fe734f0adbcf41fa68e6b04.leio@gentoo
1 commit: 8b519b169720d73f7fe734f0adbcf41fa68e6b04
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 15 13:14:35 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 15 13:15:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b519b16
7
8 net-libs/webkit-gtk: non-unified build option doesn't work; remove
9
10 USE=-jumbo-build fails to build; remove the option for now if it
11 fails anyways.
12
13 Bug: https://bugs.gentoo.org/680382
14 Package-Manager: Portage-2.3.52, Repoman-2.3.12
15 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
16
17 net-libs/webkit-gtk/metadata.xml | 1 -
18 net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild | 4 ++--
19 2 files changed, 2 insertions(+), 3 deletions(-)
20
21 diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
22 index 27c7a387561..0d69dc72c24 100644
23 --- a/net-libs/webkit-gtk/metadata.xml
24 +++ b/net-libs/webkit-gtk/metadata.xml
25 @@ -10,7 +10,6 @@
26 <flag name="egl">Enable EGL support</flag>
27 <flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
28 <flag name="gles2">Enable GLESv2 support</flag>
29 - <flag name="jumbo-build">Combine source files to speed up build process</flag>
30 <flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag>
31 <flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
32 </use>
33
34 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
35 index e56d04ca4c5..21907cebe6e 100644
36 --- a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
37 +++ b/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
38 @@ -17,7 +17,7 @@ LICENSE="LGPL-2+ BSD"
39 SLOT="4/37" # soname version of libwebkit2gtk-4.0
40 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
41
42 -IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit jpeg2k +jumbo-build libnotify nsplugin +opengl spell wayland +webgl +X"
43 +IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
44
45 # webgl needs gstreamer, bug #560612
46 # gstreamer with opengl/gles2 needs egl
47 @@ -227,7 +227,7 @@ src_configure() {
48 fi
49
50 local mycmakeargs=(
51 - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
52 + #-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.0
53 -DENABLE_QUARTZ_TARGET=$(usex aqua)
54 -DENABLE_API_TESTS=$(usex test)
55 -DENABLE_GTKDOC=$(usex doc)