From 4bf02c91f9619707514563323324bac257fadf15 Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Thu, 12 Jun 2014 10:05:08 -0700 Subject: disable webkit1 until linking issues on arm get sorted out --- net-libs/webkit-gtk/Manifest | 3 + .../files/webkit-gtk-2.2.6-fix-linking-issue.patch | 63 +++++ net-libs/webkit-gtk/webkit-gtk-2.2.6.ebuild | 271 +++++++++++++++++++++ 3 files changed, 337 insertions(+) create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.2.6-fix-linking-issue.patch create mode 100644 net-libs/webkit-gtk/webkit-gtk-2.2.6.ebuild (limited to 'net-libs') diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index a229c81..d539906 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -13,8 +13,11 @@ AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f AUX webkit-gtk-2.2.5-ia64-malloc.patch 780 SHA256 4a057c94f3e83101dc48401897a2e9295106e395bdf2a7abcad8334afb26f22b SHA512 09d3287fb41dbe5f87e483874f9c81b0e5dbcc1eed709285aaa4f0232377ba19865491ed0f2e5a108bbc8f3d486bc6ab30f3c940cb68dc8515c1826b181051df WHIRLPOOL 4f97a8d74b95cdfe1d223391b93c6de0dbe0944fd9872bf81c5e1d357f677ca6650beb73ad44e50dd51dc4505807592b2caaee4010e271cbb6ada772c6b2a72d AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072 AUX webkit-gtk-2.2.5-sparc64-build.patch 1169 SHA256 fe6c7c345eb46a0f6856b5f1c547a65185b36c314d6f55a7980c640da0a53b56 SHA512 c59c6aed45ce237d68e58e5b03f46dc66ae4b73cd8a78f7eab9429ef3fe13882d0985da33f30fb425e0b5945298502ac35f9888e666c177fe2467f3f1ed35892 WHIRLPOOL f5a55fcaafc203352583e9ded39e79edca8e9d13cb1cf6e6574e905729fc8e9f92ccd75cd9309b66734f91830847164ebe9011c149e17c85af5549bd40b04f90 +AUX webkit-gtk-2.2.6-fix-linking-issue.patch 2187 SHA256 fab1eeb1c392a57edff65943039760bf1875f5e7ca812d22dab404949993b3c3 SHA512 101c7783f69fc357b4ccfc5b2522413ba6994d2a99c2f1f5e00eb1f75d5cc881f466b63bf09d1ff8acca2c019577b2cdb00221ec6714e83596ff68388e44398c WHIRLPOOL bb7acd07d5277fe3607dc899025b850397ce282e083c34a505a6eddfeca9b35adf2b8d76ec167451907f67f16656401f92eb67161b034984ab55f1e5764f4a38 AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925 DIST webkitgtk-2.2.2.tar.xz 9378852 SHA256 4a45768695ccded14fdc47f99dbcdb750076f55dad61560cadac7b55db0b304d SHA512 8098b69438cebc298796d4f1bdd5528bcf2e57102214caccc05256d9f393ae2d925dfdba8e7219f41791c094311f90beb80a957d648ca382df7a110272c0caab WHIRLPOOL 20db7d729eabe958faded0b92655eb1cbdb38803739bb3ec0edb5e3331c1ada26d9013c34d88c80e1e6cca68a8762b736812227f18f2530ae70c89d41800d111 DIST webkitgtk-2.2.4.tar.xz 9393040 SHA256 5e1aee1bfca3602cb02920d6984c584c775c661b30c33955e35ff9a21b4c4d74 SHA512 9467abb72dda5839274702ee9173d8d83599196446f80537cf18e9be4b42fb7e23fdeb7d053d87a0143de5b499163d693dd09c4f035a315df78c46d9f7408705 WHIRLPOOL 216f0ab3d51916e608d4e8e7c71a5c753a5a3e668bb9d095d42456d37dc43087551f569a864c5820fce1c7e6fccce215e07eded90b00d3ff8fde03215b3628d5 +DIST webkitgtk-2.2.6.tar.xz 9400300 SHA256 157ee7377ae97a27bb3b9bd2733d9353979632543c3d078b6578aeeb1319bf06 SHA512 9a90109ee8f591ae34ac2282e21aeee872292d82d1f66ebc69fb506c89a8ec952e373b35d1db7cc68307ea6ee90949c5c447ed206f14ec77374f8d68ab56021d WHIRLPOOL 47e5ffa17b53238f6282b17e2eb3e988dac7f295dd6757c097ea81d826770b1929d04d79f8a0e03abe5e30bfeb8626c42ad06c6a13aa0e9626120f590b55a931 EBUILD webkit-gtk-2.2.2.ebuild 9319 SHA256 c6a83bd39f1950a81e42ba829ab3a2c63ac6cf99285294b2f85f5991de67c060 SHA512 02766da78a7aa5cd31b44f07a9faab8ba120c517299ab993ffb4c57f9bf2a0281aaa5d617be0733a57540b55b039f3a4186eb77c40c70f484a6de06186cc3df8 WHIRLPOOL c691c7ccbde6c3f345af8053c5e46ed1e410abbdf65b8894695d6affd5a5611eaa1d4ca63c2bb577fd7fddf0cd985b291d88836f8b126c30105f7ff7313a6305 EBUILD webkit-gtk-2.2.4-r200.ebuild 9169 SHA256 52f77a8c13cc892e9ecc53dc6dea9ae7525891ae37c13f705a05664278837265 SHA512 d8e77fbc76528a47c147efc2fb7fdab0a2a12138c4ac039af16c78eb62a8e7fd7c6f2559e3a4e246dce5745066d0918ceffb012847968888d24c958848401724 WHIRLPOOL 6ee4177e52b932c15cba0bdd60b8f776f0a1cf601639ffab9d3cfbc474f98a0c8540ebefe53b1fe02985df3717d2994dd481c647887db3d95815325fa517d7e5 +EBUILD webkit-gtk-2.2.6.ebuild 8901 SHA256 e340271adf1bd242688150dbdfabb44af7ef2049b876adbae6888f03029e296f SHA512 991b54ce14d062a2a4d0d5b6181615a0212e699cc39dc0574c175386bd0b0de906f7ecde7d25e58baf5cd4ecc67a92c1d0e904a8b7aef70c3ab915f03cb33a04 WHIRLPOOL 30b8c45f5df60f9997a20a5db52773b7dc3d64b9c3546cab6338a3fa06c46b309aac0e5717da283c2465ea926d379902826e0591188abc21252c640868df3ac6 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-fix-linking-issue.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-fix-linking-issue.patch new file mode 100644 index 0000000..ce1c687 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-fix-linking-issue.patch @@ -0,0 +1,63 @@ +From 09088da56f3de17ab1cc537627cda6bf808eaf4c Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 27 Feb 2014 14:17:29 +0100 +Subject: [PATCH 3/3] Fix linking issue + +* inline function is sometimes not included soon enough + + Partialy taken from: + https://bugs.webkit.org/show_bug.cgi?id=124152 + +Signed-off-by: Martin Jansa +--- + Source/JavaScriptCore/llint/LLIntEntrypoint.cpp | 3 +++ + Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp | 3 +++ + Source/JavaScriptCore/runtime/SymbolTable.cpp | 4 ++++ + 3 files changed, 10 insertions(+) + +diff --git a/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp b/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp +index 5d91be6..73cba31 100644 +--- a/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp ++++ b/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp +@@ -31,6 +31,9 @@ + #include "CodeBlock.h" + #include "JITCode.h" + #include "JSObject.h" ++#include "JSCellInlines.h" ++#include "JSDestructibleObject.h" ++#include "SlotVisitorInlines.h" + #include "LLIntThunks.h" + #include "LowLevelInterpreter.h" + #include "MaxFrameExtentForSlowPathCall.h" +diff --git a/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp b/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp +index d0583fc..4be5ec3 100644 +--- a/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp ++++ b/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp +@@ -25,6 +25,9 @@ + + #include "config.h" + #include "FunctionExecutableDump.h" ++#include "JSCellInlines.h" ++#include "JSDestructibleObject.h" ++#include "SlotVisitorInlines.h" + + #include "CodeBlock.h" + +diff --git a/Source/JavaScriptCore/runtime/SymbolTable.cpp b/Source/JavaScriptCore/runtime/SymbolTable.cpp +index 6eb0239..21450df 100644 +--- a/Source/JavaScriptCore/runtime/SymbolTable.cpp ++++ b/Source/JavaScriptCore/runtime/SymbolTable.cpp +@@ -33,6 +33,10 @@ + #include "JSCInlines.h" + #include "SlotVisitorInlines.h" + ++#include "JSCellInlines.h" ++#include "JSDestructibleObject.h" ++#include "SlotVisitorInlines.h" ++ + namespace JSC { + + const ClassInfo SymbolTable::s_info = { "SymbolTable", 0, 0, 0, CREATE_METHOD_TABLE(SymbolTable) }; +-- +1.9.0 + diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.6.ebuild new file mode 100644 index 0000000..8e611c7 --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.2.6.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +PYTHON_COMPAT=( python{2_6,2_7} ) +GCONF_DEBUG="no" + +inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 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="3/29" # soname version +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl -webkit1" +# bugs 372493, 416331 +REQUIRED_USE=" + geoloc? ( introspection ) + introspection? ( gstreamer ) + gles2? ( egl ) + webgl? ( ^^ ( gles2 opengl ) ) + !webgl? ( ?? ( gles2 opengl ) ) +" + +# use sqlite, svg by default +# Aqua support in gtk3 is untested +# gtk2 is needed for plugin process support +# gtk3-3.10 required for wayland +RDEPEND=" + dev-libs/libxml2:2 + dev-libs/libxslt + media-libs/harfbuzz:=[icu(+)] + media-libs/libwebp:= + virtual/jpeg:0= + >=media-libs/libpng-1.4:0= + >=x11-libs/cairo-1.10:=[X] + >=dev-libs/glib-2.36.0:2 + >=x11-libs/gtk+-3.6.0:3[aqua=,introspection?] + >=dev-libs/icu-3.8.1-r1:= + >=net-libs/libsoup-2.42.0:2.4[introspection?] + dev-db/sqlite:3= + >=x11-libs/pango-1.30.0.0 + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/gtk+-2.24.10:2 + + egl? ( media-libs/mesa[egl] ) + geoloc? ( app-misc/geoclue:0 ) + gles2? ( media-libs/mesa[gles2] ) + gstreamer? ( + >=media-libs/gstreamer-1.2:1.0 + >=media-libs/gst-plugins-base-1.2:1.0 ) + introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) + libsecret? ( app-crypt/libsecret ) + opengl? ( virtual/opengl ) + spell? ( >=app-text/enchant-0.22:= ) + webgl? ( + x11-libs/cairo[opengl] + x11-libs/libXcomposite + x11-libs/libXdamage ) +" + +# paxctl needed for bug #407085 +# Need real bison, not yacc +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-lang/perl + || ( + virtual/rubygems[ruby_targets_ruby20] + virtual/rubygems[ruby_targets_ruby21] + virtual/rubygems[ruby_targets_ruby19] + ) + >=app-accessibility/at-spi2-core-2.5.3 + >=dev-libs/atk-2.8.0 + >=dev-util/gtk-doc-am-1.10 + dev-util/gperf + >=sys-devel/bison-2.4.3 + >=sys-devel/flex-2.5.33 + || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 ) + sys-devel/gettext + >=sys-devel/make-3.82-r4 + virtual/pkgconfig + + 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" ]] && 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.7.x or Clang >= 3.0 for C++11-specific compiler flags" + fi +} + +pkg_setup() { + # Check whether any of the debugging flags is enabled + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then + if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then + replace-flags -ggdb -g + ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS." + ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too" + ewarn "large for current binutils releases (bug #432784) and has very" + ewarn "high temporary build space and memory requirements." + ewarn "If you really want to build ${PN} with \"-ggdb\", add" + ewarn "WEBKIT_GTK_GGDB=yes" + ewarn "to your make.conf file." + fi + einfo "You need to have at least 18GB of temporary build space available" + einfo "to build ${PN} with debugging CFLAGS. Note that it might still" + einfo "not be enough, as the total space requirements depend on the flags" + einfo "(-ggdb vs -g1) and enabled features." + check-reqs_pkg_setup + fi + + [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup +} + +src_prepare() { + DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install + + # intermediate MacPorts hack while upstream bug is not fixed properly + # https://bugs.webkit.org/show_bug.cgi?id=28727 + use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch + + # Don't force -O2 + sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || die + + # Failing tests + # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744 + # * keyevents is interactive + # * mimehandling test sometimes fails under Xvfb (works fine manually), bug #??? + # * webdatasource test needs a network connection and intermittently fails with icedtea-web + # * webplugindatabase intermittently fails with icedtea-web, bug #???? + sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \ + -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \ + -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \ + -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \ + -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \ + -i Source/WebKit/gtk/GNUmakefile.am || die + + # Respect CC, otherwise fails on prefix #395875 + tc-export CC + + # bug #459978, upstream bug #113397 + epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch" + + # Do not build unittests unless requested, upstream bug #128163 + epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch + + # Deadlock causing infinite compilations with nvidia-drivers: + # https://bugs.gentoo.org/show_bug.cgi?id=463960 + # http://osdyson.org/issues/161 + # https://bugs.webkit.org/show_bug.cgi?id=125651 + epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch + + # Debian patches to fix support for some arches + # https://bugs.webkit.org/show_bug.cgi?id=129540 + epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch + # https://bugs.webkit.org/show_bug.cgi?id=129542 + epatch "${FILESDIR}"/${PN}-2.2.5-ia64-malloc.patch + + # OpenBSD patches to fix support for some arches + # https://bugs.webkit.org/show_bug.cgi?id=86835 + epatch "${FILESDIR}"/${PN}-2.2.5-sparc64-build.patch + + # take stab at fixing arm linker/opengl crap + #epatch "${FILESDIR}"/${PN}-2.2.6-fix-linking-issue.patch + + AT_M4DIR=Source/autotools eautoreconf + + gnome2_src_prepare +} + +src_configure() { + # 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 doesn't compile on alpha without this in LDFLAGS, bug #??? + use alpha && append-ldflags "-Wl,--no-relax" + + # 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-getLD) --version | grep -q "GNU gold"; then + append-ldflags "-Wl,--reduce-memory-overheads" + fi + + local myconf="" + + if has_version "virtual/rubygems[ruby_targets_ruby21]"; then + myconf="${myconf} RUBY=$(type -P ruby21)" + elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then + myconf="${myconf} RUBY=$(type -P ruby20)" + else + myconf="${myconf} RUBY=$(type -P ruby19)" + fi + + # TODO: Check Web Audio support + # should somehow let user select between them? + # + # * Aqua support in gtk3 is untested + # * dependency-tracking is required so parallel builds won't fail + gnome2_src_configure \ + $(use_enable webkit1) \ + $(use_enable coverage) \ + $(use_enable debug) \ + $(use_enable egl) \ + $(use_enable geoloc geolocation) \ + $(use_enable gles2) \ + $(use_enable gstreamer video) \ + $(use_enable gstreamer web-audio) \ + $(use_enable introspection) \ + $(use_enable jit) \ + $(use_enable libsecret credential_storage) \ + $(use_enable opengl glx) \ + $(use_enable spell spellcheck) \ + --with-gtk=3.0 \ + --enable-dependency-tracking \ + --disable-gtk-doc \ + $(usex aqua "--with-font-backend=pango --with-target=quartz" "") + ${myconf} +} + +src_test() { + # Tests expect an out-of-source build in WebKitBuild + ln -s . WebKitBuild || die "ln failed" + + # Prevents test failures on PaX systems + use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* + + unset DISPLAY + # Tests need virtualx, bug #294691, bug #310695 + # Parallel tests sometimes fail + Xemake -j1 check +} + +src_install() { + # https://bugs.webkit.org/show_bug.cgi?id=129242 + MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install + + newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk + newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore + newdoc Source/WebCore/ChangeLog ChangeLog.WebCore + + # Prevents crashes on PaX systems + use jit && pax-mark m "${ED}usr/bin/jsc-3" +} -- cgit v1.2.3-65-gdbad