Attachment #432978 for bug #578008

View | Details | Raw Unified | Return to bug 578008 | Differences between
Collapse All | Expand All




++ net-libs/webkit-gtk/webkit-gtk-2.12.2.ebuild

# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

EAPI=6
CMAKE_MAKEFILE_GENERATOR="ninja"
GCONF_DEBUG="no"
PYTHON_COMPAT=( python2_7 )
USE_RUBY="ruby20 ruby21 ruby22 ruby23"

inherit autotools check-reqs cmake-utils flag-o-matic gnome2-utils pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx xdg

MY_P="webkitgtk-${PV}"
DESCRIPTION="Open source web browser engine"


LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"

IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
# seccomp

	gles2? ( egl )
	introspection? ( gstreamer )
	nsplugin? ( X )
	webgl? ( gstreamer
		^^ ( gles2 opengl ) )
	!webgl? ( ?? ( gles2 opengl ) )
	webgl? ( gstreamer )
	|| ( aqua wayland X )
"


RDEPEND="
	dev-db/sqlite:3=
	>=dev-libs/glib-2.36:2
	dev-libs/hyphen
	>=dev-libs/icu-3.8.1-r1:=
	>=dev-libs/libxml2-2.8:2
	>=dev-libs/libxslt-1.1.7

	>=dev-lang/perl-5.10
	>=app-accessibility/at-spi2-core-2.5.3
	>=dev-libs/atk-2.8.0
	dev-libs/hyphen
	>=dev-util/gtk-doc-am-1.10
	>=dev-util/gperf-3.0.1
	>=sys-devel/bison-2.4.3


CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307

PATCHES=(
	# https://bugs.gentoo.org/show_bug.cgi?id=555504
	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch

	# https://bugs.gentoo.org/show_bug.cgi?id=564352
	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch

	# https://bugs.webkit.org/show_bug.cgi?id=148379
	"${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
)

pkg_pretend() {
	if [[ ${MERGE_TYPE} != "binary" ]] ; then
		if is-flagq "-g*" && ! is-flagq "-g*0" ; then

}

src_prepare() {
	xdg_src_prepare
	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch

	# https://bugs.gentoo.org/show_bug.cgi?id=564352
	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch

	# https://bugs.webkit.org/show_bug.cgi?id=148379
	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch

	gnome2_environment_reset
	gnome2_omf_fix
	gnome2_disable_deprecation_warning
	elibtoolize
}

src_configure() {

	fi

	local mycmakeargs=(
		-DENABLE_QUARTZ_TARGET="$(usex aqua)"
		-DENABLE_API_TESTS="$(usex test)"
		-DENABLE_GTKDOC="$(usex doc)"
		-DENABLE_GEOLOCATION="$(usex geoloc)"
		-DENABLE_OpenGLES2="$(usex gles2)"
		-DENABLE_GLES2="$(usex gles2)"
		-DENABLE_CREDENTIAL_STORAGE="$(usex gnome-keyring)"
		-DENABLE_VIDEO="$(usex gstreamer)"
		-DENABLE_WEB_AUDIO="$(usex gstreamer)"
		-DENABLE_INTROSPECTION="$(usex introspection)"
		-DENABLE_JIT="$(usex jit)"
		-DENABLE_PLUGIN_PROCESS_GTK2="$(usex nsplugin)"
		-DENABLE_SPELLCHECK="$(usex spell)"
		-DENABLE_WAYLAND_TARGET="$(usex wayland)"
		-DENABLE_WEBGL="$(usex webgl)"
		$(cmake-utils_use_find_package egl EGL)
		$(cmake-utils_use_find_package opengl OpenGL)
		-DENABLE_X11_TARGET="$(usex X)"
		-DENABLE_OPENGL=${opengl_enabled}
		-DCMAKE_BUILD_TYPE=Release
		-DPORT=GTK
++ net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch

--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -1146,6 +1146,7 @@
         list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)
     endif ()

 elseif (WTF_CPU_IA64)
 elseif (WTF_CPU_PPC)
 elseif (WTF_CPU_PPC64)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,8 @@
     set(WTF_CPU_ARM 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
++ net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch

 
Index: Source/WebKit2/PlatformGTK.cmake
===================================================================

Return to bug 578008

Line Link Here

(-)file_not_specified_in_diff (-39 / +46 lines)
0	-- net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild	0	++ net-libs/webkit-gtk/webkit-gtk-2.12.2.ebuild
Lines 1-14 Link Here
1	# Copyright 1999-2015 Gentoo Foundation	1	# Copyright 1999-2016 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Id$	3	# $Id$
4		4
5	EAPI="5"	5	EAPI=6
6	CMAKE_MAKEFILE_GENERATOR="ninja"	6	CMAKE_MAKEFILE_GENERATOR="ninja"
7	GCONF_DEBUG="no"	7	GCONF_DEBUG="no"
8	PYTHON_COMPAT=( python2_7 )	8	PYTHON_COMPAT=( python2_7 )
9	USE_RUBY="ruby20 ruby21 ruby22 ruby23"	9	USE_RUBY="ruby20 ruby21 ruby22 ruby23"
10		10
11	inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx	11	inherit autotools check-reqs cmake-utils flag-o-matic gnome2-utils pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx xdg
12		12
13	MY_P="webkitgtk-${PV}"	13	MY_P="webkitgtk-${PV}"
14	DESCRIPTION="Open source web browser engine"	14	DESCRIPTION="Open source web browser engine"
Lines 17-23 Link Here
17		17
18	LICENSE="LGPL-2+ BSD"	18	LICENSE="LGPL-2+ BSD"
19	SLOT="4/37" # soname version of libwebkit2gtk-4.0	19	SLOT="4/37" # soname version of libwebkit2gtk-4.0
20	KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"	20	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
21		21
22	IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"	22	IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
23	# seccomp	23	# seccomp
Lines 28-36 Link Here
28	gles2? ( egl )	28	gles2? ( egl )
29	introspection? ( gstreamer )	29	introspection? ( gstreamer )
30	nsplugin? ( X )	30	nsplugin? ( X )
31	webgl? ( ^^ ( gles2 opengl ) )	31	webgl? ( gstreamer
		32	^^ ( gles2 opengl ) )
32	!webgl? ( ?? ( gles2 opengl ) )	33	!webgl? ( ?? ( gles2 opengl ) )
33	webgl? ( gstreamer )
34	\|\| ( aqua wayland X )	34	\|\| ( aqua wayland X )
35	"	35	"
36		36
Lines 44-49 Link Here
44	RDEPEND="	44	RDEPEND="
45	dev-db/sqlite:3=	45	dev-db/sqlite:3=
46	>=dev-libs/glib-2.36:2	46	>=dev-libs/glib-2.36:2
		47	dev-libs/hyphen
47	>=dev-libs/icu-3.8.1-r1:=	48	>=dev-libs/icu-3.8.1-r1:=
48	>=dev-libs/libxml2-2.8:2	49	>=dev-libs/libxml2-2.8:2
49	>=dev-libs/libxslt-1.1.7	50	>=dev-libs/libxslt-1.1.7
Lines 98-104 Link Here
98	>=dev-lang/perl-5.10	99	>=dev-lang/perl-5.10
99	>=app-accessibility/at-spi2-core-2.5.3	100	>=app-accessibility/at-spi2-core-2.5.3
100	>=dev-libs/atk-2.8.0	101	>=dev-libs/atk-2.8.0
101	dev-libs/hyphen
102	>=dev-util/gtk-doc-am-1.10	102	>=dev-util/gtk-doc-am-1.10
103	>=dev-util/gperf-3.0.1	103	>=dev-util/gperf-3.0.1
104	>=sys-devel/bison-2.4.3	104	>=sys-devel/bison-2.4.3
Lines 121-126 Link Here
121		121
122	CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307	122	CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
123		123
		124	PATCHES=(
		125	# https://bugs.gentoo.org/show_bug.cgi?id=555504
		126	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
		127
		128	# https://bugs.gentoo.org/show_bug.cgi?id=564352
		129	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
		130
		131	# https://bugs.webkit.org/show_bug.cgi?id=148379
		132	"${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
		133	)
		134
124	pkg_pretend() {	135	pkg_pretend() {
125	if [[ ${MERGE_TYPE} != "binary" ]] ; then	136	if [[ ${MERGE_TYPE} != "binary" ]] ; then
126	if is-flagq "-g" && ! is-flagq "-g0" ; then	137	if is-flagq "-g" && ! is-flagq "-g0" ; then
Lines 147-162 Link Here
147	}	158	}
148		159
149	src_prepare() {	160	src_prepare() {
150	# https://bugs.gentoo.org/show_bug.cgi?id=555504	161	xdg_src_prepare
151	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
152
153	# https://bugs.gentoo.org/show_bug.cgi?id=564352
154	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
155
156	# https://bugs.webkit.org/show_bug.cgi?id=148379
157	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
158		162
159	gnome2_src_prepare	163	gnome2_environment_reset
		164	gnome2_omf_fix
		165	gnome2_disable_deprecation_warning
		166	elibtoolize
160	}	167	}
161		168
162	src_configure() {	169	src_configure() {
Lines 223-246 Link Here
223	fi	230	fi
224		231
225	local mycmakeargs=(	232	local mycmakeargs=(
226	$(cmake-utils_use_enable aqua QUARTZ_TARGET)	233	-DENABLE_QUARTZ_TARGET="$(usex aqua)"
227	$(cmake-utils_use_enable test API_TESTS)	234	-DENABLE_API_TESTS="$(usex test)"
228	$(cmake-utils_use_enable doc GTKDOC)	235	-DENABLE_GTKDOC="$(usex doc)"
229	$(cmake-utils_use_enable geoloc GEOLOCATION)	236	-DENABLE_GEOLOCATION="$(usex geoloc)"
230	$(cmake-utils_use_find_package gles2 OpenGLES2)	237	-DENABLE_OpenGLES2="$(usex gles2)"
231	$(cmake-utils_use_enable gles2 GLES2)	238	-DENABLE_GLES2="$(usex gles2)"
232	$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)	239	-DENABLE_CREDENTIAL_STORAGE="$(usex gnome-keyring)"
233	$(cmake-utils_use_enable gstreamer VIDEO)	240	-DENABLE_VIDEO="$(usex gstreamer)"
234	$(cmake-utils_use_enable gstreamer WEB_AUDIO)	241	-DENABLE_WEB_AUDIO="$(usex gstreamer)"
235	$(cmake-utils_use_enable introspection)	242	-DENABLE_INTROSPECTION="$(usex introspection)"
236	$(cmake-utils_use_enable jit)	243	-DENABLE_JIT="$(usex jit)"
237	$(cmake-utils_use_enable nsplugin PLUGIN_PROCESS_GTK2)	244	-DENABLE_PLUGIN_PROCESS_GTK2="$(usex nsplugin)"
238	$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)	245	-DENABLE_SPELLCHECK="$(usex spell)"
239	$(cmake-utils_use_enable wayland WAYLAND_TARGET)	246	-DENABLE_WAYLAND_TARGET="$(usex wayland)"
240	$(cmake-utils_use_enable webgl WEBGL)	247	-DENABLE_WEBGL="$(usex webgl)"
241	$(cmake-utils_use_find_package egl EGL)	248	$(cmake-utils_use_find_package egl EGL)
242	$(cmake-utils_use_find_package opengl OpenGL)	249	$(cmake-utils_use_find_package opengl OpenGL)
243	$(cmake-utils_use_enable X X11_TARGET)	250	-DENABLE_X11_TARGET="$(usex X)"
244	-DENABLE_OPENGL=${opengl_enabled}	251	-DENABLE_OPENGL=${opengl_enabled}
245	-DCMAKE_BUILD_TYPE=Release	252	-DCMAKE_BUILD_TYPE=Release
246	-DPORT=GTK	253	-DPORT=GTK
247	-- net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch	254	++ net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
Lines 1-5 Link Here
1	--- ./Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300	1	--- a/Source/JavaScriptCore/CMakeLists.txt
2	+++ ./Source/JavaScriptCore/CMakeLists.txt 2015-10-29 17:47:10.535712494 +0300	2	+++ b/Source/JavaScriptCore/CMakeLists.txt
3	@@ -1146,6 +1146,7 @@	3	@@ -1146,6 +1146,7 @@
4	list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)	4	list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)
5	endif ()	5	endif ()
Lines 9-16 Link Here
9	elseif (WTF_CPU_IA64)	9	elseif (WTF_CPU_IA64)
10	elseif (WTF_CPU_PPC)	10	elseif (WTF_CPU_PPC)
11	elseif (WTF_CPU_PPC64)	11	elseif (WTF_CPU_PPC64)
12	--- CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300	12	--- a/CMakeLists.txt
13	+++ CMakeLists.txt 2015-10-29 01:23:37.416886279 +0300	13	+++ b/CMakeLists.txt
14	@@ -82,6 +82,8 @@	14	@@ -82,6 +82,8 @@
15	set(WTF_CPU_ARM 1)	15	set(WTF_CPU_ARM 1)
16	elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")	16	elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
17	-- net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch	17	++ net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
Lines 9-16 Link Here
9		9
10	Index: Source/WebKit2/PlatformGTK.cmake	10	Index: Source/WebKit2/PlatformGTK.cmake
11	===================================================================	11	===================================================================