From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1506659CA3 for ; Tue, 15 Mar 2016 00:38:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EBD121C00D; Tue, 15 Mar 2016 00:38:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0019D21C00D for ; Tue, 15 Mar 2016 00:38:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16CB7340C50 for ; Tue, 15 Mar 2016 00:38:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BE96854 for ; Tue, 15 Mar 2016 00:38:31 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1458002938.604487515bdb3a80bdeacae697fbb9d55b5d5a04.blueness@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/ X-VCS-Repository: proj/musl X-VCS-Files: net-libs/webkit-gtk/Manifest net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 604487515bdb3a80bdeacae697fbb9d55b5d5a04 X-VCS-Branch: master Date: Tue, 15 Mar 2016 00:38:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 19a7cf2f-f661-49e4-ad52-e856888ec8f3 X-Archives-Hash: ac6e833cf31d913d6be50ca3f3d37f02 commit: 604487515bdb3a80bdeacae697fbb9d55b5d5a04 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Mar 15 00:27:51 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Mar 15 00:48:58 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=60448751 net-libs/webkit-gtk: apply musl patches to 2.10.7 net-libs/webkit-gtk/Manifest | 6 + .../webkit-gtk-2.10.7-remove-execinfo_h.patch | 37 +++ .../files/webkit-gtk-2.8.5-fix-alpha-build.patch | 22 ++ .../files/webkit-gtk-2.8.5-fix-ia64-build.patch | 21 ++ ...kit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch | 22 ++ net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild | 267 +++++++++++++++++++++ 6 files changed, 375 insertions(+) diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 3997772..9080f44 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,5 +1,6 @@ AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1 +AUX webkit-gtk-2.10.7-remove-execinfo_h.patch 1364 SHA256 ba69f07fcc325efc8b97bf828c2fbc145feeaa71b49195ccf08277d3ed6e185b SHA512 0738518490aedd5fe4dbec4cd21c3e67cb93dcbefe41fb621f66f4550a6439a370b61e836a6b3aea3709cd5ccb7643f2eac124b98cf069202b48f21d63f8dfb1 WHIRLPOOL e49766772e8a1cfa5f844dfe0024a238bedab42a977a5036476b0e02eb013b0785a6a744c5adca4eda46d8728ce7b018d970bde99d98377047ef2d118ab91e40 AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92 AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072 AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925 @@ -8,7 +9,12 @@ AUX webkit-gtk-2.4.4-jpeg-9a.patch 1258 SHA256 bd626ff2df4a44b98b0a82fa3f555a0a2 AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e623a2fd67e80111d624a2b3c01fde2fbbcd64e SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 WHIRLPOOL ba3f9b9dbee12f6dae05db9f343a46fd7d182d377e1a951e1785a5aff9a046d057bbf85821642e948c15a084e69d01054fe5632d7460892b196334adea582e72 AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256 d447d71943cacdec166f0a65f34258494f70719ba9cd951d5b512902e20200d0 SHA512 580531428c0498e996de358a20a499f36edaaa98a108088c5dde428a997a61e5a55293cf855d652655c193cd5cda8e25723cac360d3983fcd1fbce35aa9b41a0 WHIRLPOOL b68bc94045ef46f5959146b6d14e2e39c9a1e3c7a39a9e7164ece4db1d1fc9f3c846b26af5e7b2b81db5ee82913b4018097367c6843a8b41758316cd27371bcc AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512 f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e WHIRLPOOL f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364 +AUX webkit-gtk-2.8.5-fix-alpha-build.patch 910 SHA256 2e3ea0b6288ff3471349243edd75d1a97fbacdc6a426874f4c9be8a64d2c2b7f SHA512 748ef4b431c02b3b4ba8908b8bdf28f5b11b90a798ac21484d99a3941e0306102b9d8a298f177da63cd86579b64def31e6f2abe66044b5c211bb4382c5a57f86 WHIRLPOOL 4a8ee812d543c016a02321e5e6db83580c6f0301dd57b5cd5bf4e22b7a6f214ac6b41229160d60db42982fd37a11c5f654ef81a8c1b178a6d78e54ed6076ea11 +AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82 +AUX webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch 876 SHA256 50052d2a82d6c0d19af0bfb476824059e4448652c6533275084e24dfb5ef19c3 SHA512 ad0925070277d97fce3713f66ffcbfa193fdb3231d63717dfd8b217b420bf6f8665694eef2fcf9d2eef2abefe0fe5406759287395117497de34a00dba1b9c144 WHIRLPOOL d4da619b5bf1000d5dee409b07bcce6ba8da25f0e726e22433e2a3a610773ee4394becd55ccf7efaddebb86e74f1f97868e98240fa9bb80c0ab7a320f03c666e +DIST webkitgtk-2.10.7.tar.xz 10988396 SHA256 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b WHIRLPOOL 7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c +EBUILD webkit-gtk-2.10.7.ebuild 8050 SHA256 d680876d078bbe06d157e6b1ad870197a2ca41709feb10d41406dc4b0cb776b5 SHA512 190bd43e37ebb4f612aa0ae2ee236590a1f20c092dd5afc2f9552dbcf8dd2a9db03da66e10baa46cca61660e71623ee56c36d33b4155e9f238e11828b361d204 WHIRLPOOL d8ae2331d0f9c57f9191b8e697a74b7fd2639767eecdc4a50e0aeb344085b2b1739c6ee3a912b3b3b96151cbac0085857786eec6d37b71f70cfae132ee74723f EBUILD webkit-gtk-2.4.9-r200.ebuild 9355 SHA256 e575d08794b0c8ec2c1282c21c6eb82bb10b8b741924e8596504ff196397ca6b SHA512 8904f1e912bbcb8e817a0fb8343440279a0ec6b72d682d9957b4043492587f40823ee0e15d549377a4974b10bd5f7bc7579c9e41d268f749856e7bb1603549dc WHIRLPOOL cefbee06f3fbed09655107bdb58abdeda4da0d048111ece027277ebd19cc65c90de1f668836b40f28bfd94a04e20177a96ea1c5b1aeaee157c4178e20f492885 EBUILD webkit-gtk-2.4.9.ebuild 9834 SHA256 eaa6df05bbf906160c3864d181c7f582a54a2804a9d5400e462f56eaf54ce037 SHA512 c7436ea640c76f118ed1794fe0fc769ce10a0b57c9d92932f3da10cd57d33f085f5656b2b86e3fe3f2bd6992c9b88591f53eede9de6f61d57531f3f61eab8e2d WHIRLPOOL 1759d9515453ded2058bf1c8cae35e91ddc4882706eb7f83187a641c0217d7519fe1df18f73d6b3a76579d36cac0e2dfbade9723b0f7775c1b55eeae22240d20 MISC metadata.xml 717 SHA256 0b14a37b119705ad7c50e3857d51674eaade8148fed94caf07ca2afd5282fa58 SHA512 996dbd54e6670cde58d6fca941fd6d1a11a054e42791e1b451005c2c6b5b46d14454869cbc9e4911e5b7c0119b8a04096c95ac7c20f8389ab9cd866c9947b365 WHIRLPOOL 531accd99228e552b04a9644b470db00f9c633021a438bc1895e517e848ea73ce807ddb5225df5fd3f74af19b80e86ab83ae83c8254de4a6b246dea3f7cc1803 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch new file mode 100644 index 0000000..07705ac --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch @@ -0,0 +1,37 @@ +diff -Naur webkitgtk-2.10.7.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.10.7/Source/WTF/wtf/Assertions.cpp +--- webkitgtk-2.10.7.orig/Source/WTF/wtf/Assertions.cpp 2016-01-29 16:29:32.000000000 +0000 ++++ webkitgtk-2.10.7/Source/WTF/wtf/Assertions.cpp 2016-03-15 00:12:11.432000000 +0000 +@@ -71,7 +71,8 @@ + #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) + #include + #include +-#include ++// removed for musl - we need better intelligence here ++//#include + #endif + + extern "C" { +@@ -226,7 +227,8 @@ + void WTFGetBacktrace(void** stack, int* size) + { + #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) +- *size = backtrace(stack, *size); ++// removed for musl - we need better intelligence here ++// *size = backtrace(stack, *size); + #elif OS(WINDOWS) + // The CaptureStackBackTrace function is available in XP, but it is not defined + // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function +@@ -272,9 +274,10 @@ + void WTFPrintBacktrace(void** stack, int size) + { + #if USE(BACKTRACE_SYMBOLS) +- char** symbols = backtrace_symbols(stack, size); +- if (!symbols) +- return; ++// removed for musl - we need better intelligence here ++// char** symbols = backtrace_symbols(stack, size); ++// if (!symbols) ++// return; + #endif + + for (int i = 0; i < size; ++i) { diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch new file mode 100644 index 0000000..cafceb5 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch @@ -0,0 +1,22 @@ +--- ./Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300 ++++ ./Source/JavaScriptCore/CMakeLists.txt 2015-10-29 17:47:10.535712494 +0300 +@@ -1146,6 +1146,7 @@ + list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj) + endif () + elseif (WTF_CPU_ARM64) ++elseif (WTF_CPU_ALPHA) + elseif (WTF_CPU_HPPA) + elseif (WTF_CPU_IA64) + elseif (WTF_CPU_PPC) + elseif (WTF_CPU_PPC64) +--- CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300 ++++ CMakeLists.txt 2015-10-29 01:23:37.416886279 +0300 +@@ -82,6 +82,8 @@ + set(WTF_CPU_ARM 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(WTF_CPU_ARM64 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha") ++ set(WTF_CPU_ALPHA 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") + set(WTF_CPU_MIPS 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4") diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch new file mode 100644 index 0000000..6c88c49 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -98,6 +98,8 @@ + set(WTF_CPU_PPC64LE 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*") + set(WTF_CPU_HPPA 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ia64") ++ set(WTF_CPU_IA64 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390") + set(WTF_CPU_S390 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1147,6 +1147,7 @@ + endif () + elseif (WTF_CPU_ARM64) + elseif (WTF_CPU_HPPA) ++elseif (WTF_CPU_IA64) + elseif (WTF_CPU_PPC) + elseif (WTF_CPU_PPC64) + elseif (WTF_CPU_PPC64LE) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch new file mode 100644 index 0000000..79b57ae --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch @@ -0,0 +1,22 @@ +2015-08-24 Alexandre Rostovtsev + + webkit2gtkinjectedbundle requires forwarding headers + https://bugs.webkit.org/show_bug.cgi?id=148379 + + Fixes GTK build with -j1 + + * PlatformGTK.cmake: + +Index: Source/WebKit2/PlatformGTK.cmake +=================================================================== +--- Source/WebKit2/PlatformGTK.cmake (revision 188859) ++++ Source/WebKit2/PlatformGTK.cmake (working copy) +@@ -860,7 +860,7 @@ include_directories( + ) + + add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp") +-add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings) ++add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings WebKit2-forwarding-headers) + add_webkit2_prefix_header(webkit2gtkinjectedbundle) + + # Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild new file mode 100644 index 0000000..3b78e34 --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +CMAKE_MAKEFILE_GENERATOR="ninja" +GCONF_DEBUG="no" +PYTHON_COMPAT=( python2_7 ) +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx + +MY_P="webkitgtk-${PV}" +DESCRIPTION="Open source web browser engine" +HOMEPAGE="http://www.webkitgtk.org/" +SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" + +LICENSE="LGPL-2+ BSD" +SLOT="4/37" # soname version of libwebkit2gtk-4.0 +KEYWORDS="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 + +REQUIRED_USE=" + geoloc? ( introspection ) + gles2? ( egl ) + introspection? ( gstreamer ) + nsplugin? ( X ) + webgl? ( ^^ ( gles2 opengl ) ) + !webgl? ( ?? ( gles2 opengl ) ) + || ( aqua wayland X ) +" + +# Tests fail to link for inexplicable reasons +# https://bugs.webkit.org/show_bug.cgi?id=148210 +RESTRICT="test" + +# use sqlite, svg by default +# Aqua support in gtk3 is untested +# Dependencies found at Source/cmake/OptionsGTK.cmake +RDEPEND=" + dev-db/sqlite:3= + >=dev-libs/glib-2.36:2 + >=dev-libs/icu-3.8.1-r1:= + >=dev-libs/libxml2-2.8:2 + >=dev-libs/libxslt-1.1.7 + >=media-libs/fontconfig-2.8:1.0 + >=media-libs/freetype-2.4.2:2 + >=media-libs/harfbuzz-0.9.18:=[icu(+)] + >=media-libs/libpng-1.4:0= + media-libs/libwebp:= + >=net-libs/gnutls-3 + >=net-libs/libsoup-2.42:2.4[introspection?] + virtual/jpeg:0= + >=x11-libs/cairo-1.10.2:= + >=x11-libs/gtk+-3.14:3[introspection?] + x11-libs/libnotify + >=x11-libs/pango-1.30.0 + + aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) + egl? ( media-libs/mesa[egl] ) + geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) + gles2? ( media-libs/mesa[gles2] ) + gnome-keyring? ( app-crypt/libsecret ) + gstreamer? ( + >=media-libs/gstreamer-1.2:1.0 + >=media-libs/gst-plugins-base-1.2:1.0 + >=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] ) + introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) + nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) + opengl? ( virtual/opengl + x11-libs/cairo[opengl] ) + spell? ( >=app-text/enchant-0.22:= ) + wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) + webgl? ( + x11-libs/cairo[opengl] + x11-libs/libXcomposite + x11-libs/libXdamage ) + X? ( + x11-libs/cairo[X] + >=x11-libs/gtk+-3.14:3[X] + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXrender + x11-libs/libXt ) +" +# Control knob is private and set to off +# seccomp? ( sys-libs/libseccomp ) + +# paxctl needed for bug #407085 +# Need real bison, not yacc +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + ${RUBY_DEPS} + >=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 + >=sys-devel/flex-2.5.34 + || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) + sys-devel/gettext + virtual/pkgconfig + + doc? ( >=dev-util/gtk-doc-1.10 ) + geoloc? ( dev-util/gdbus-codegen ) + introspection? ( jit? ( sys-apps/paxctl ) ) + test? ( + dev-lang/python:2.7 + dev-python/pygobject:3[python_targets_python2_7] + x11-themes/hicolor-icon-theme + jit? ( sys-apps/paxctl ) ) +" + +S="${WORKDIR}/${MY_P}" + +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] ; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + + if ! test-flag-CXX -std=c++11 ; then + die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" + fi + + if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then + die 'The active compiler needs to be gcc 4.9 (or newer)' + fi + fi +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then + check-reqs_pkg_setup + fi + + [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup +} + +src_prepare() { + # https://bugs.gentoo.org/show_bug.cgi?id=555504 + epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch + + # musl patches + epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch + epatch "${FILESDIR}"/${PN}-2.10.7-remove-execinfo_h.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_src_prepare +} + +src_configure() { + # Respect CC, otherwise fails on prefix #395875 + tc-export CC + + # Arches without JIT support also need this to really disable it in all places + use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0 + + # It does not compile on alpha without this in LDFLAGS + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 + use alpha && append-ldflags "-Wl,--no-relax" + + # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 + use ia64 && append-ldflags "-Wl,--no-as-needed" + + # Sigbuses on SPARC with mcpu and co., bug #??? + use sparc && filter-flags "-mvis" + + # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 + use ppc64 && append-flags "-mminimal-toc" + + # Try to use less memory, bug #469942 (see Fedora .spec for reference) + # --no-keep-memory doesn't work on ia64, bug #502492 + if ! use ia64; then + append-ldflags "-Wl,--no-keep-memory" + fi + if ! tc-ld-is-gold ; then + append-ldflags "-Wl,--reduce-memory-overheads" + fi + + # older glibc needs this for INTPTR_MAX, bug #533976 + if has_version "