From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RK6h7-0005xR-GG for garchives@archives.gentoo.org; Sat, 29 Oct 2011 11:03:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A507F21C02A; Sat, 29 Oct 2011 11:03:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5D3FC21C02A for ; Sat, 29 Oct 2011 11:03:11 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 914FE1B4006 for ; Sat, 29 Oct 2011 11:03:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E2E0A80042 for ; Sat, 29 Oct 2011 11:03:09 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: 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.7.1-r200.ebuild net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: f2a4de279c82f695d949eae803d99bf4a7356138 Date: Sat, 29 Oct 2011 11:03:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e3cf4f9a6a2924d911deb966de8bbf70 commit: f2a4de279c82f695d949eae803d99bf4a7356138 Author: Priit Laes plaes org> AuthorDate: Sat Oct 29 10:52:09 2011 +0000 Commit: Priit Laes plaes org> CommitDate: Sat Oct 29 10:52:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Df2a4de27 net-libs/webkit-gtk: Bumped to 1.7.1 --- net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild | 149 ++++++++++++++++= ++++ net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild | 163 ++++++++++++++++= ++++++ 2 files changed, 312 insertions(+), 0 deletions(-) diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild b/net-libs/= webkit-gtk/webkit-gtk-1.7.1-r200.ebuild new file mode 100644 index 0000000..31710c3 --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2011 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.6.1-= r200.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $ + +EAPI=3D"4" + +inherit autotools eutils flag-o-matic eutils virtualx + +MY_P=3D"webkit-${PV}" +DESCRIPTION=3D"Open source web browser engine" +HOMEPAGE=3D"http://www.webkitgtk.org/" +# Upstream is still shipping silly gzip files +SRC_URI=3D"http://www.webkitgtk.org/${MY_P}.tar.gz" +#SRC_URI=3D"mirror://gentoo/${P}.tar.xz" + +LICENSE=3D"LGPL-2 LGPL-2.1 BSD" +SLOT=3D"2" +KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +# geoclue +IUSE=3D"aqua coverage debug +gstreamer +introspection +jit spell webgl" +# bug 372493 +REQUIRED_USE=3D"introspection? ( gstreamer )" + +# use sqlite, svg by default +# dependency on >=3Dx11-libs/gtk+-2.13:2 for gail +RDEPEND=3D" + dev-libs/libxml2:2 + dev-libs/libxslt + virtual/jpeg + >=3Dmedia-libs/libpng-1.4:0 + >=3Dx11-libs/cairo-1.10 + >=3Ddev-libs/glib-2.27.90:2 + >=3Dx11-libs/gtk+-2.13:2[aqua=3D,introspection?] + >=3Ddev-libs/icu-3.8.1-r1 + >=3Dnet-libs/libsoup-2.33.6:2.4[introspection?] + dev-db/sqlite:3 + >=3Dx11-libs/pango-1.12 + x11-libs/libXrender + + gstreamer? ( + media-libs/gstreamer:0.10 + >=3Dmedia-libs/gst-plugins-base-0.10.30:0.10 ) + + introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) + + spell? ( >=3Dapp-text/enchant-0.22 ) + + webgl? ( virtual/opengl ) +" +DEPEND=3D"${RDEPEND} + >=3Dsys-devel/flex-2.5.33 + sys-devel/gettext + virtual/yacc + dev-util/gperf + dev-util/pkgconfig + dev-util/gtk-doc-am + test? ( x11-themes/hicolor-icon-theme ) +" + +S=3D"${WORKDIR}/${MY_P}" + +src_prepare() { + DOCS=3D"ChangeLog NEWS" # other ChangeLog files handled by src_install + + # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC + # https://bugs.webkit.org/show_bug.cgi?id=3D19775 + use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch + + # intermediate MacPorts hack while upstream bug is not fixed properly + # https://bugs.webkit.org/show_bug.cgi?id=3D28727 + use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch + + # Fix build on Darwin8 (10.4 Tiger) + # XXX: Fails to apply + #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch + + # Don't force -O2 + sed -i 's/-O2//g' "${S}"/configure.ac + + # Don't build tests if not needed, part of bug #343249 + # XXX: Fails to apply + #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch" + + # Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=3D69085 + mkdir -p DerivedSources/ANGLE + + # Prevent maintainer mode from being triggered during make + AT_M4DIR=3DSource/autotools eautoreconf +} + +src_configure() { + # It doesn't compile on alpha without this in LDFLAGS + use alpha && append-ldflags "-Wl,--no-relax" + + # Sigbuses on SPARC with mcpu and co. + use sparc && filter-flags "-mcpu=3D*" "-mvis" "-mtune=3D*" + + # https://bugs.webkit.org/show_bug.cgi?id=3D42070 , #301634 + use ppc64 && append-flags "-mminimal-toc" + + local myconf + + # XXX: Check Web Audio support + # WebKit2 can only be built with gtk3 + # API documentation (gtk-doc) is built in webkit-gtk:3, always disable = here + myconf=3D" + $(use_enable coverage) + $(use_enable debug) + $(use_enable debug debug-features) + $(use_enable spell spellcheck) + $(use_enable introspection) + $(use_enable gstreamer video) + $(use_enable jit) + $(use_enable webgl) + --enable-web-sockets + --with-gtk=3D2.0 + --disable-gtk-doc + --disable-webkit2 + $(use aqua && echo "--with-font-backend=3Dpango --with-target=3Dquartz= ")" + + econf ${myconf} +} + +src_compile() { + # Fix sandbox error with USE=3D"introspection" + # https://bugs.webkit.org/show_bug.cgi?id=3D35471 + emake XDG_DATA_HOME=3D"${T}/.local" +} + +src_test() { + unset DISPLAY + # Tests need virtualx, bug #294691, bug #310695 + # Set XDG_DATA_HOME for introspection tools, bug #323669 + # Parallel tests sometimes fail + Xemake -j1 check XDG_DATA_HOME=3D"${T}/.local" +} + +src_install() { + default + + newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk + newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po + newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore + newdoc Source/WebCore/ChangeLog ChangeLog.WebCore + + # Remove .la files + find "${D}" -name '*.la' -exec rm -f '{}' + +} diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild b/net-libs/= webkit-gtk/webkit-gtk-1.7.1-r300.ebuild new file mode 100644 index 0000000..a2a1f7a --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2011 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.6.1-= r300.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $ + +EAPI=3D"4" + +inherit autotools eutils flag-o-matic eutils virtualx + +MY_P=3D"webkit-${PV}" +DESCRIPTION=3D"Open source web browser engine" +HOMEPAGE=3D"http://www.webkitgtk.org/" +# Upstream is still shipping silly gzip files +SRC_URI=3D"http://www.webkitgtk.org/${MY_P}.tar.gz" +#SRC_URI=3D"mirror://gentoo/${P}.tar.xz" + +LICENSE=3D"LGPL-2 LGPL-2.1 BSD" +SLOT=3D"3" +KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +# geoclue +IUSE=3D"aqua coverage debug doc +gstreamer +introspection +jit spell web= gl" +# bug 372493 +REQUIRED_USE=3D"introspection? ( gstreamer )" + +# use sqlite, svg by default +# dependency on >=3Dx11-libs/gtk+-2.13:2 for gail +# Aqua support in gtk3 is untested +# gtk2 is needed for plugin process support +RDEPEND=3D" + dev-libs/libxml2:2 + dev-libs/libxslt + virtual/jpeg + >=3Dmedia-libs/libpng-1.4:0 + >=3Dx11-libs/cairo-1.10 + >=3Ddev-libs/glib-2.27.90:2 + >=3Dx11-libs/gtk+-3.0:3[aqua=3D,introspection?] + >=3Ddev-libs/icu-3.8.1-r1 + >=3Dnet-libs/libsoup-2.33.6:2.4[introspection?] + dev-db/sqlite:3 + >=3Dx11-libs/pango-1.12 + x11-libs/libXrender + + gstreamer? ( + media-libs/gstreamer:0.10 + >=3Dmedia-libs/gst-plugins-base-0.10.30:0.10 ) + + introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) + + spell? ( >=3Dapp-text/enchant-0.22 ) + + webgl? ( virtual/opengl ) +" +DEPEND=3D"${RDEPEND} + >=3Dsys-devel/flex-2.5.33 + sys-devel/gettext + virtual/yacc + dev-util/gperf + dev-util/pkgconfig + dev-util/gtk-doc-am + doc? ( >=3Ddev-util/gtk-doc-1.10 ) + test? ( x11-themes/hicolor-icon-theme ) +" + +S=3D"${WORKDIR}/${MY_P}" + +src_prepare() { + DOCS=3D"ChangeLog NEWS" # other ChangeLog files handled by src_install + + # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC + # https://bugs.webkit.org/show_bug.cgi?id=3D19775 + use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch + + # intermediate MacPorts hack while upstream bug is not fixed properly + # https://bugs.webkit.org/show_bug.cgi?id=3D28727 + use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch + + # Fix build on Darwin8 (10.4 Tiger) + # XXX: Fails to apply + #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch + + # Don't force -O2 + sed -i 's/-O2//g' "${S}"/configure.ac + + # Don't build tests if not needed, part of bug #343249 + # XXX: Fails to apply + #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch" + + # Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=3D69085 + mkdir -p DerivedSources/ANGLE + + # Prevent maintainer mode from being triggered during make + AT_M4DIR=3DSource/autotools eautoreconf +} + +src_configure() { + # It doesn't compile on alpha without this in LDFLAGS + use alpha && append-ldflags "-Wl,--no-relax" + + # Sigbuses on SPARC with mcpu and co. + use sparc && filter-flags "-mcpu=3D*" "-mvis" "-mtune=3D*" + + # https://bugs.webkit.org/show_bug.cgi?id=3D42070 , #301634 + use ppc64 && append-flags "-mminimal-toc" + + local myconf + + # XXX: Check Web Audio support + # XXX: files for generating DerivedSources/WebKit2/* are missing, see + # https://bugs.webkit.org/show_bug.cgi?id=3D66527 + myconf=3D" + $(use_enable coverage) + $(use_enable debug) + $(use_enable debug debug-features) + $(use_enable doc gtk-doc) + $(use_enable spell spellcheck) + $(use_enable introspection) + $(use_enable gstreamer video) + $(use_enable jit) + $(use_enable webgl) + --enable-web-sockets + --with-gtk=3D3.0 + --disable-webkit2 + $(use aqua && echo "--with-font-backend=3Dpango --with-target=3Dquartz= ")" + # Aqua support in gtk3 is untested + + econf ${myconf} +} + +src_compile() { + # Fix sandbox error with USE=3D"introspection" + # https://bugs.webkit.org/show_bug.cgi?id=3D35471 + emake XDG_DATA_HOME=3D"${T}/.local" + + # ${PN} neither ships, nor builds documentation on its own + if use doc; then + emake -C "${S}/Source/WebKit/gtk/docs" + fi +} + +src_test() { + unset DISPLAY + # Tests need virtualx, bug #294691, bug #310695 + # Set XDG_DATA_HOME for introspection tools, bug #323669 + # Parallel tests sometimes fail + Xemake -j1 check XDG_DATA_HOME=3D"${T}/.local" +} + +src_install() { + default + + # ${PN} doesn't install documentation on its own + if use doc; then + emake DESTDIR=3D${D} -C "${S}/Source/WebKit/gtk/docs" install + fi + + newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk + newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po + newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore + newdoc Source/WebCore/ChangeLog ChangeLog.WebCore + + # Remove .la files + find "${D}" -name '*.la' -exec rm -f '{}' + +}