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 1C43E138247 for ; Sun, 17 Nov 2013 23:35:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7B7AE0956; Sun, 17 Nov 2013 23:35:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DC22E0956 for ; Sun, 17 Nov 2013 23:35:38 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E686033F102 for ; Sun, 17 Nov 2013 23:35:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C7FF5E5459 for ; Sun, 17 Nov 2013 23:35:35 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1384708922.d89b834410a4c7345232ea927a60f7c6aa8a02b5.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/webkit-gtk-1.11.90-r300.ebuild net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild X-VCS-Directories: net-libs/webkit-gtk/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: d89b834410a4c7345232ea927a60f7c6aa8a02b5 X-VCS-Branch: master Date: Sun, 17 Nov 2013 23:35:35 +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: a2b56eed-f643-43a0-bc8e-b754e2641abc X-Archives-Hash: 3550dfe32daebc285caa15dc8281418b commit: d89b834410a4c7345232ea927a60f7c6aa8a02b5 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Nov 17 17:22:02 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Nov 17 17:22:02 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d89b8344 net-libs/webkit-gtk: 2.0.4 → 2.2.2 --- ...1.11.90-r300.ebuild => webkit-gtk-2.2.2.ebuild} | 150 +++++++++++++-------- 1 file changed, 94 insertions(+), 56 deletions(-) diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.90-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild similarity index 61% rename from net-libs/webkit-gtk/webkit-gtk-1.11.90-r300.ebuild rename to net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild index 641baea..3e6c3a9 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.11.90-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild @@ -4,89 +4,110 @@ EAPI="5" -inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils virtualx +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit autotools check-reqs eutils flag-o-matic gnome2-utils 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" -#SRC_URI="mirror://gentoo/${P}.tar.xz" LICENSE="LGPL-2+ BSD" -SLOT="3" +SLOT="3/29" # soname version 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 debug +geoloc +gstreamer +introspection +jit spell +webgl" +IUSE="aqua coverage debug +geoloc +gstreamer libsecret +introspection +jit spell +webgl" # bugs 372493, 416331 -REQUIRED_USE="introspection? ( geoloc gstreamer )" +REQUIRED_USE=" + geoloc? ( introspection ) + introspection? ( gstreamer ) +" # use sqlite, svg by default # Aqua support in gtk3 is untested # gtk2 is needed for plugin process support +# gtk3-3.10 required for wayland # TODO: There's 3 acceleration backends: opengl, egl and gles2 RDEPEND=" - app-crypt/libsecret dev-libs/libxml2:2 dev-libs/libxslt + media-libs/harfbuzz:=[icu(+)] media-libs/libwebp - virtual/jpeg:= + virtual/jpeg:0= >=media-libs/libpng-1.4:0= - >=x11-libs/cairo-1.10:= - >=dev-libs/glib-2.32:2 - >=x11-libs/gtk+-3.4:3[aqua=,introspection?] + >=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.40.0:2.4[introspection?] + >=net-libs/libsoup-2.42.0:2.4[introspection?] dev-db/sqlite:3= - >=x11-libs/pango-1.21 + >=x11-libs/pango-1.30.0.0 x11-libs/libXrender - >=x11-libs/gtk+-2.13:2 + >=x11-libs/gtk+-2.24.10:2 geoloc? ( app-misc/geoclue ) gstreamer? ( >=media-libs/gstreamer-1.0.3:1.0 >=media-libs/gst-plugins-base-1.0.3:1.0 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) + libsecret? ( app-crypt/libsecret ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( virtual/opengl + 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 - =dev-lang/python-2* - || ( virtual/rubygems[ruby_targets_ruby19] - virtual/rubygems[ruby_targets_ruby18] ) - app-accessibility/at-spi2-core + || ( + virtual/rubygems[ruby_targets_ruby20] + virtual/rubygems[ruby_targets_ruby19] + virtual/rubygems[ruby_targets_ruby18] ) + >=app-accessibility/at-spi2-core-2.5.3 >=dev-util/gtk-doc-am-1.10 dev-util/gperf sys-devel/bison >=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 ) ) " -# Need real bison, not yacc 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*" ; then + nvidia_check || die #463960 + + 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() { + nvidia_check || die #463960 + # Check whether any of the debugging flags is enabled - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then + 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." @@ -103,6 +124,8 @@ pkg_setup() { einfo "(-ggdb vs -g1) and enabled features." check-reqs_pkg_setup fi + + [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup } src_prepare() { @@ -116,21 +139,21 @@ src_prepare() { sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || die # Build-time segfaults under PaX with USE="introspection jit", bug #404215 - if use introspection && use jit; then - epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch" - cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die - fi + #if use introspection && use jit; then + # epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch" + # cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die + #fi # We need to reset some variables to prevent permissions problems and failures # like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669 gnome2_environment_reset - # XXX: failing tests - # https://bugs.webkit.org/show_bug.cgi?id=50744 - # testkeyevents is interactive - # mimehandling test sometimes fails under Xvfb (works fine manually) - # datasource test needs a network connection and intermittently fails with icedtea-web - # webplugindatabase intermittently fails with icedtea-web + # 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\/unittests\/testwebinspector/ d' \ -e '/Programs\/unittests\/testkeyevents/ d' \ -e '/Programs\/unittests\/testmimehandling/ d' \ @@ -139,45 +162,42 @@ src_prepare() { -i Source/WebKit/gtk/GNUmakefile.am || die if ! use gstreamer; then - # webkit2's TestWebKitWebView requires