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 D6065138010 for ; Sat, 27 Oct 2012 08:44:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7ABDEE0630; Sat, 27 Oct 2012 08:43:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C394BE062C for ; Sat, 27 Oct 2012 08:43:56 +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 D0D7933D931 for ; Sat, 27 Oct 2012 08:43:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 77A48E5440 for ; Sat, 27 Oct 2012 08:43:54 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1351327325.84bc77e71b9eaa92fbf991abc8ab40cc2ee2b8eb.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 84bc77e71b9eaa92fbf991abc8ab40cc2ee2b8eb X-VCS-Branch: master Date: Sat, 27 Oct 2012 08:43:54 +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: 55ad3379-e387-437e-bcb4-d4a44967aeaa X-Archives-Hash: fd58169fa3bb3e54bde477124d8b133b commit: 84bc77e71b9eaa92fbf991abc8ab40cc2ee2b8eb Author: Priit Laes plaes org> AuthorDate: Sat Oct 27 08:37:57 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Sat Oct 27 08:42:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=84bc77e7 net-libs/webkit-gtk: Add masked 1.11.1 to overlay --- .../webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch | 24 +++ net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild | 216 ++++++++++++++++++++ 2 files changed, 240 insertions(+), 0 deletions(-) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch new file mode 100644 index 0000000..50f2729 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch @@ -0,0 +1,24 @@ +https://bugs.webkit.org/show_bug.cgi?id=96602 + +--- configure.ac (revision 132329) ++++ configure.ac (working copy) +@@ -278,6 +278,10 @@ + AC_SUBST([OLE32_LIBS]) + + ++AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])]) ++AC_SUBST([DLOPEN_LIBS]) ++ ++ + # determine the GTK+ version to use + AC_MSG_CHECKING([the GTK+ version to use]) + AC_ARG_WITH([gtk], +@@ -1039,7 +1043,7 @@ + if test "$enable_glx" = "yes"; then + acceleration_backend_description+=", glx" + fi +- OPENGL_LIBS+=" -ldl" ++ OPENGL_LIBS+=" $DLOPEN_LIBS" + acceleration_backend_description+=")" + fi + AC_SUBST([OPENGL_LIBS]) diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild new file mode 100644 index 0000000..cb7ffec --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild @@ -0,0 +1,216 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r301.ebuild,v 1.5 2012/06/20 06:34:59 ssuominen Exp $ + +EAPI="4" + +# Don't define PYTHON_DEPEND: python only needed at build time +inherit autotools flag-o-matic gnome2-utils pax-utils python 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 LGPL-2.1 BSD" +SLOT="3" +#KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="" +# geoclue +IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl" +# bugs 372493, 416331 +REQUIRED_USE="introspection? ( geoloc gstreamer )" + +# use sqlite, svg by default +# dependency on >=x11-libs/gtk+-2.13:2 for gail +# Aqua support in gtk3 is untested +# gtk2 is needed for plugin process support +# TODO: There's 3 acceleration backends: opengl, egl and gles2 +RDEPEND=" + dev-libs/libxml2:2 + dev-libs/libxslt + virtual/jpeg + >=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?] + >=dev-libs/icu-3.8.1-r1 + >=net-libs/libsoup-2.39.2:2.4[introspection?] + dev-db/sqlite:3 + >=x11-libs/pango-1.21 + x11-libs/libXrender + >=x11-libs/gtk+-2.13:2 + + geoloc? ( app-misc/geoclue ) + + gstreamer? ( + media-libs/gstreamer:0.10 + >=media-libs/gst-plugins-base-0.10.30:0.10 ) + + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + + spell? ( >=app-text/enchant-0.22 ) + + webgl? ( + virtual/opengl + x11-libs/libXcomposite + x11-libs/libXdamage ) +" +# paxctl needed for bug #407085 +DEPEND="${RDEPEND} + dev-lang/perl + =dev-lang/python-2* + virtual/rubygems + sys-devel/bison + >=sys-devel/flex-2.5.33 + sys-devel/gettext + dev-util/gperf + virtual/pkgconfig + dev-util/gtk-doc-am + app-accessibility/at-spi2-core + + >=sys-devel/make-3.82-r4 + + doc? ( >=dev-util/gtk-doc-1.10 ) + introspection? ( jit? ( sys-apps/paxctl ) ) + test? ( + x11-themes/hicolor-icon-theme + jit? ( sys-apps/paxctl ) ) +" +# Need real bison, not yacc + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + # Needed for CodeGeneratorInspector.py + python_set_active_version 2 + python_pkg_setup + if is-flagq "-g*" ; then + einfo "You need ~23GB of free space to build this package with debugging CFLAGS." + fi +} + +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 + + # Drop DEPRECATED flags + LC_ALL=C sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die + + # Don't force -O2 + sed -i 's/-O2//g' "${S}"/configure.ac || 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 + + # 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 + sed -e '/Programs\/unittests\/testwebinspector/ d' \ + -e '/Programs\/unittests\/testkeyevents/ d' \ + -e '/Programs\/unittests\/testmimehandling/ d' \ + -e '/Programs\/unittests\/testwebdatasource/ d' \ + -i Source/WebKit/gtk/GNUmakefile.am || die + if ! use gstreamer; then + # webkit2's TestWebKitWebView requires