[gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2011-02-23 20:28 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2011-02-23 20:28 UTC (permalink / raw
  To: gentoo-commits

commit:     8b54fafee2cb3f5739cb914c580fed39dad5e17b
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Feb 23 20:23:56 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Feb 23 20:23:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8b54fafe

net-libs/webkit-gtk: Bump to 1.3.12

---
 ...1-r200.ebuild => webkit-gtk-1.3.12-r200.ebuild} |   14 ++++++++------
 ...-gtk-1.3.11.ebuild => webkit-gtk-1.3.12.ebuild} |   19 +++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild
similarity index 92%
rename from net-libs/webkit-gtk/webkit-gtk-1.3.11-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild
index 58ff81a..869c130 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.3.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # aqua, geoclue
-IUSE="coverage debug doc +gstreamer +introspection +jit"
+IUSE="coverage debug doc spell +gstreamer +introspection +jit"
 
 # use sqlite, svg by default
 # dependency on >=x11-libs/gtk+-2.13:2 for gail
@@ -30,9 +30,8 @@ RDEPEND="
 	>=dev-libs/glib-2.27.90
 	>=x11-libs/gtk+-2.13:2
 	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.33.4
+	>=net-libs/libsoup-2.33.6
 	>=dev-db/sqlite-3
-	>=app-text/enchant-0.22
 	>=x11-libs/pango-1.12
 
 	gstreamer? (
@@ -40,7 +39,10 @@ RDEPEND="
 		>=media-libs/gst-plugins-base-0.10.25:0.10 )
 
 	introspection? (
-		>=dev-libs/gobject-introspection-0.9.5 )"
+		>=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? (
+		>=app-text/enchant-0.22 )"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.33
@@ -84,12 +86,12 @@ src_configure() {
 	myconf="
 		$(use_enable coverage)
 		$(use_enable debug)
+		$(use_enable spell spellcheck)
 		$(use_enable introspection)
 		$(use_enable gstreamer video)
 		$(use_enable jit)
-		--enable-blob
 		--with-gtk=2.0
-		--disable-WebGL
+		--disable-webgl
 		--disable-webkit2
 		--disable-web-sockets"
 		# quartz patch above does not apply anymore

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.3.12.ebuild
similarity index 91%
rename from net-libs/webkit-gtk/webkit-gtk-1.3.11.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.3.12.ebuild
index d655d6a..9603900 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.3.11.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.3.12.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # aqua, geoclue
-IUSE="coverage debug doc +gstreamer +introspection +jit"
+IUSE="coverage debug doc +gstreamer +introspection +jit spell"
 
 # use sqlite, svg by default
 # dependency on >=x11-libs/gtk+-2.13:2 for gail
@@ -28,11 +28,10 @@ RDEPEND="
 	media-libs/libpng
 	x11-libs/cairo
 	>=dev-libs/glib-2.27.90
-	>=x11-libs/gtk+-2.91.7:3
+	>=x11-libs/gtk+-3.0:3
 	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.33.4
+	>=net-libs/libsoup-2.33.6
 	>=dev-db/sqlite-3
-	>=app-text/enchant-0.22
 	>=x11-libs/pango-1.12
 
 	gstreamer? (
@@ -40,7 +39,11 @@ RDEPEND="
 		>=media-libs/gst-plugins-base-0.10.25:0.10 )
 
 	introspection? (
-		>=dev-libs/gobject-introspection-0.9.5 )"
+		>=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? (
+		>=app-text/enchant-0.22 )"
+
 
 DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.33
@@ -79,17 +82,17 @@ src_configure() {
 
 	# XXX: Check Web Audio support
 	# XXX: websockets disabled due to security issue in protocol
-	# XXX: WebGL fails compilation
+	# XXX: webgl fails compilation
 	# XXX: Wtf is WebKit2?
 	myconf="
 		$(use_enable coverage)
 		$(use_enable debug)
+		$(use_enable spell spellcheck)
 		$(use_enable introspection)
 		$(use_enable gstreamer video)
 		$(use_enable jit)
-		--enable-blob
+		--disable-webgl
 		--with-gtk=3.0
-		--disable-WebGL
 		--disable-webkit2
 		--disable-web-sockets"
 		# quartz patch above does not apply anymore



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2011-04-10 18:04 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-10 18:04 UTC (permalink / raw
  To: gentoo-commits

commit:     061020e276a588e7cc5700b02668571a66e5ad01
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 13:03:11 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 18:03:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=061020e2

net-libs/webkit-gtk: sync dependencies with gentoo-x86

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 net-libs/webkit-gtk/webkit-gtk-1.3.13-r200.ebuild |    2 +-
 net-libs/webkit-gtk/webkit-gtk-1.3.13.ebuild      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.13-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.3.13-r200.ebuild
index 59a9b40..7cb607a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.3.13-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.3.13-r200.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	virtual/jpeg
-	media-libs/libpng:0
+	>=media-libs/libpng-1.4:0
 	x11-libs/cairo
 	>=dev-libs/glib-2.27.90:2
 	>=x11-libs/gtk+-2.13:2[aqua=]

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.13.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.3.13.ebuild
index a59f6f8..e37d989 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.3.13.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.3.13.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	virtual/jpeg
-	media-libs/libpng:0
+	>=media-libs/libpng-1.4:0
 	x11-libs/cairo
 	>=dev-libs/glib-2.27.90:2
 	>=x11-libs/gtk+-3.0:3



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2011-04-27 22:22 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-27 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     69c8ffe721428048d8a93d4301c9b6c33c70e111
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 21:51:17 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 22:17:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=69c8ffe7

net-libs/webkit-gtk: 1.3.13 → 1.4.0

---
 ...13-r200.ebuild => webkit-gtk-1.4.0-r200.ebuild} |    0
 ...t-gtk-1.3.13.ebuild => webkit-gtk-1.4.0.ebuild} |    0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.13-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.0-r200.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-1.3.13-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.4.0-r200.ebuild

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.13.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.0.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-1.3.13.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.4.0.ebuild



^ permalink raw reply	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2011-05-22 20:47 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2011-05-22 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     42adc8d2813895087ecf328ae792fba5c5ddf7d6
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun May 22 20:46:50 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun May 22 20:46:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=42adc8d2

net-libs/webkit-gtk: Die with USE=-gstreamer (upstream issue)

---
 net-libs/webkit-gtk/webkit-gtk-1.4.0-r1.ebuild   |    6 ++++++
 net-libs/webkit-gtk/webkit-gtk-1.4.0-r201.ebuild |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.0-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.0-r1.ebuild
index 8c8b69b..d8cccec 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.4.0-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.4.0-r1.ebuild
@@ -54,6 +54,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if ! use gstreamer ; then
+		die "Build does not work with USE=-gstreamer due to upstream issue"
+	fi
+}
+
 src_prepare() {
 	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
 	# https://bugs.webkit.org/show_bug.cgi?id=19775

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.0-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.0-r201.ebuild
index 4f379e0..a45c33b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.4.0-r201.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.4.0-r201.ebuild
@@ -53,6 +53,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if ! use gstreamer ; then
+		die "Build does not work with USE=-gstreamer due to upstream issue"
+	fi
+}
+
 src_prepare() {
 	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
 	# https://bugs.webkit.org/show_bug.cgi?id=19775



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2011-10-29 11:03 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2011-10-29 11:03 UTC (permalink / raw
  To: gentoo-commits

commit:     f2a4de279c82f695d949eae803d99bf4a7356138
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Oct 29 10:52:09 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Oct 29 10:52:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f2a4de27

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="4"
+
+inherit autotools eutils flag-o-matic eutils virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+# Upstream is still shipping silly gzip files
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+#SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="LGPL-2 LGPL-2.1 BSD"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+IUSE="aqua coverage debug +gstreamer +introspection +jit spell webgl"
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+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.27.90:2
+	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.33.6:2.4[introspection?]
+	dev-db/sqlite:3
+	>=x11-libs/pango-1.12
+	x11-libs/libXrender
+
+	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 )
+"
+DEPEND="${RDEPEND}
+	>=sys-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="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	DOCS="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=19775
+	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=28727
+	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=69085
+	mkdir -p DerivedSources/ANGLE
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/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=*" "-mvis" "-mtune=*"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #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="
+		$(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=2.0
+		--disable-gtk-doc
+		--disable-webkit2
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Fix sandbox error with USE="introspection"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
+	emake XDG_DATA_HOME="${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="${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="4"
+
+inherit autotools eutils flag-o-matic eutils virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+# Upstream is still shipping silly gzip files
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+#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 ~x86-fbsd
+~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell webgl"
+# bug 372493
+REQUIRED_USE="introspection? ( 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
+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.27.90:2
+	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.33.6:2.4[introspection?]
+	dev-db/sqlite:3
+	>=x11-libs/pango-1.12
+	x11-libs/libXrender
+
+	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 )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	virtual/yacc
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	test? ( x11-themes/hicolor-icon-theme )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	DOCS="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=19775
+	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=28727
+	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=69085
+	mkdir -p DerivedSources/ANGLE
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/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=*" "-mvis" "-mtune=*"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #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=66527
+	myconf="
+		$(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=3.0
+		--disable-webkit2
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Aqua support in gtk3 is untested
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Fix sandbox error with USE="introspection"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
+	emake XDG_DATA_HOME="${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="${T}/.local"
+}
+
+src_install() {
+	default
+
+	# ${PN} doesn't install documentation on its own
+	if use doc; then
+		emake DESTDIR=${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 '{}' +
+}



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2011-10-30  2:57 Alexandre Restovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Restovtsev @ 2011-10-30  2:57 UTC (permalink / raw
  To: gentoo-commits

commit:     43ca4d99fc537fb7c963941fe5526b349a27123f
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 02:52:32 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Oct 30 02:56:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=43ca4d99

net-libs/webkit-gtk: python2 needed at build time

webkit-gtk-1.7 uses several python scripts at build time. At least one
of them (CodeGeneratorInspector.py) is python2-only.

Thanks to David Hicks (dhx1) for reporting on IRC.

---
 net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild |   10 +++++++++-
 net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild |   10 +++++++++-
 2 files changed, 18 insertions(+), 2 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
index 31710c3..1e7d478 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild
@@ -4,7 +4,8 @@
 
 EAPI="4"
 
-inherit autotools eutils flag-o-matic eutils virtualx
+# Don't define PYTHON_DEPEND: python only needed at build time
+inherit autotools eutils flag-o-matic eutils python virtualx
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -49,6 +50,7 @@ RDEPEND="
 	webgl? ( virtual/opengl )
 "
 DEPEND="${RDEPEND}
+	=dev-lang/python-2*
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext
 	virtual/yacc
@@ -60,6 +62,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	# Needed for CodeGeneratorInspector.py
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
 	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
 

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
index f79732a..9888ea5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
@@ -4,7 +4,8 @@
 
 EAPI="4"
 
-inherit autotools eutils flag-o-matic eutils virtualx
+# Don't define PYTHON_DEPEND: python only needed at build time
+inherit autotools eutils flag-o-matic eutils python virtualx
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -51,6 +52,7 @@ RDEPEND="
 	webgl? ( virtual/opengl )
 "
 DEPEND="${RDEPEND}
+	=dev-lang/python-2*
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext
 	virtual/yacc
@@ -63,6 +65,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	# Needed for CodeGeneratorInspector.py
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
 	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
 



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-01-26 22:47 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2012-01-26 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     bc7dc773075222875f6caedec9af620caa04c5d4
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Jan 26 22:35:28 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Thu Jan 26 22:35:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bc7dc773

net-libs/webkit-gtk: Work around parallel build issues

https://bugs.gentoo.org/show_bug.cgi?id=399709

---
 net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild |    2 ++
 net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild
index f62db47..b4b0f8b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild
@@ -109,6 +109,7 @@ src_configure() {
 	local myconf
 
 	# XXX: Check Web Audio support
+	# XXX: dependency-tracking is required so parallel builds won't fail
 	# WebKit2 can only be built with gtk3
 	# API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
 	myconf="
@@ -124,6 +125,7 @@ src_configure() {
 		--with-gtk=2.0
 		--disable-gtk-doc
 		--disable-webkit2
+		--enable-dependency-tracking
 		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
 
 	econf ${myconf}

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild
index 6adaa5e..8dd0c8c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild
@@ -112,6 +112,7 @@ src_configure() {
 	local myconf
 
 	# XXX: Check Web Audio support
+	# XXX: dependency-tracking is required so parallel builds won't fail
 	myconf="
 		$(use_enable coverage)
 		$(use_enable debug)
@@ -125,6 +126,7 @@ src_configure() {
 		--enable-web-sockets
 		--with-gtk=3.0
 		--disable-webkit2
+		--enable-dependency-tracking
 		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
 		# Aqua support in gtk3 is untested
 



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-02-08  7:52 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2012-02-08  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     67eda9314a17cd98b2a3f6f86488bc9208a96316
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Feb  7 10:59:36 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Feb  7 10:59:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=67eda931

net-libs/webkit-gtk: 1.7.4 → 1.7.5

Also drop old

---
 net-libs/webkit-gtk/webkit-gtk-1.7.3-r200.ebuild   |  156 -------------------
 net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild   |  160 --------------------
 ....4-r200.ebuild => webkit-gtk-1.7.5-r200.ebuild} |    0
 ....4-r300.ebuild => webkit-gtk-1.7.5-r300.ebuild} |    0
 4 files changed, 0 insertions(+), 316 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.3-r200.ebuild
deleted file mode 100644
index f62db47..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.3-r200.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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="4"
-
-# Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools eutils flag-o-matic eutils python virtualx
-
-MY_P="webkit-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
-#SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-# geoclue
-IUSE="aqua coverage debug +gstreamer +introspection +jit spell webgl"
-# bug 372493
-REQUIRED_USE="introspection? ( gstreamer )"
-
-# use sqlite, svg by default
-# dependency on >=x11-libs/gtk+-2.13:2 for gail
-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.27.90:2
-	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.33.6:2.4[introspection?]
-	dev-db/sqlite:3
-	>=x11-libs/pango-1.12
-	x11-libs/libXrender
-
-	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 )
-"
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	>=sys-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="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# Needed for CodeGeneratorInspector.py
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOCS="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=19775
-	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=28727
-	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=69085
-	mkdir -p DerivedSources/ANGLE
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/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=*" "-mvis" "-mtune=*"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #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="
-		$(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=2.0
-		--disable-gtk-doc
-		--disable-webkit2
-		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Fix sandbox error with USE="introspection"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	emake XDG_DATA_HOME="${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="${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.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild
deleted file mode 100644
index e896d47..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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="4"
-
-# Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools eutils flag-o-matic eutils python virtualx
-
-MY_P="webkit-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${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 ~x86-fbsd
-~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-# geoclue
-IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell webgl"
-# bug 372493
-REQUIRED_USE="introspection? ( 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
-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.27.90:2
-	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.37.2.1:2.4[introspection?]
-	dev-db/sqlite:3
-	>=x11-libs/pango-1.12
-	x11-libs/libXrender
-
-	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 )
-"
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	>=sys-devel/flex-2.5.33
-	sys-devel/gettext
-	virtual/yacc
-	dev-util/gperf
-	dev-util/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	test? ( x11-themes/hicolor-icon-theme )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# Needed for CodeGeneratorInspector.py
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOCS="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=19775
-	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=28727
-	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=69085
-	mkdir -p DerivedSources/ANGLE
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/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=*" "-mvis" "-mtune=*"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #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=66527
-	myconf="
-		$(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=3.0
-		--disable-webkit2
-		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
-		# Aqua support in gtk3 is untested
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Fix sandbox error with USE="introspection"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	emake XDG_DATA_HOME="${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="${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.4-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.5-r200.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.5-r200.ebuild

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.5-r300.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.5-r300.ebuild



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-02-27  3:30 Alexandre Restovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Restovtsev @ 2012-02-27  3:30 UTC (permalink / raw
  To: gentoo-commits

commit:     5c4b0368f1454094a7cfa8580980a6e1338103c7
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 03:26:54 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Feb 27 03:26:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5c4b0368

net-libs/webkit-gtk: missing geoclue dep (bug #405977)

Add geoloc USE flag that pulls in geoclue dependency (bug #405977,
thanks to ELIPTUS for reporting).

---
 net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild |    5 ++++-
 net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild
index 4e44011..bc59f8d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild
@@ -18,7 +18,7 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
-IUSE="aqua coverage debug +gstreamer +introspection +jit spell +webgl"
+IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
 # bug 372493
 REQUIRED_USE="introspection? ( gstreamer )"
 
@@ -38,6 +38,8 @@ RDEPEND="
 	>=x11-libs/pango-1.21
 	x11-libs/libXrender
 
+	geoloc? ( app-misc/geoclue )
+
 	gstreamer? (
 		media-libs/gstreamer:0.10
 		>=media-libs/gst-plugins-base-0.10.30:0.10 )
@@ -137,6 +139,7 @@ src_configure() {
 		$(use_enable coverage)
 		$(use_enable debug)
 		$(use_enable debug debug-features)
+		$(use_enable geoloc geolocation)
 		$(use_enable spell spellcheck)
 		$(use_enable introspection)
 		$(use_enable gstreamer video)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild
index bf6320a..6a740d7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
-IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell +webgl"
+IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl"
 # bug 372493
 REQUIRED_USE="introspection? ( gstreamer )"
 
@@ -39,6 +39,8 @@ RDEPEND="
 	>=x11-libs/pango-1.21
 	x11-libs/libXrender
 
+	geoloc? ( app-misc/geoclue )
+
 	gstreamer? (
 		media-libs/gstreamer:0.10
 		>=media-libs/gst-plugins-base-0.10.30:0.10 )
@@ -136,6 +138,7 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable debug debug-features)
 		$(use_enable doc gtk-doc)
+		$(use_enable geoloc geolocation)
 		$(use_enable spell spellcheck)
 		$(use_enable introspection)
 		$(use_enable gstreamer video)



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-03-05  7:17 Alexandre Restovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Restovtsev @ 2012-03-05  7:17 UTC (permalink / raw
  To: gentoo-commits

commit:     8759b58382def36d988deadc673b922e316db8b6
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 07:07:04 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Mar  5 07:07:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8759b583

net-libs/webkit-gtk: also pax-mark jsc-1 and jsc-3 to prevent crashes on PaX systems

---
 net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild |    5 ++++-
 net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild
index f29db1e..4cd179b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 
 # Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools eutils flag-o-matic eutils python virtualx gnome2-utils
+inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -188,6 +188,9 @@ src_install() {
 	# Remove .la files
 	find "${D}" -name '*.la' -exec rm -f '{}' +
 
+	# Prevents crashes on PaX systems
+	pax-mark m "${ED}usr/bin/jsc-1"
+
 	# File collisions with slot 3
 	# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
 	rm -rf "${ED}usr/share/gtk-doc" || die

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild
index 2d56cb9..c129a6f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 
 # Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools eutils flag-o-matic eutils python virtualx gnome2-utils
+inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -186,4 +186,7 @@ src_install() {
 
 	# Remove .la files
 	find "${D}" -name '*.la' -exec rm -f '{}' +
+
+	# Prevents crashes on PaX systems
+	pax-mark m "${ED}usr/bin/jsc-3"
 }



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-03-10 11:08 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2012-03-10 11:08 UTC (permalink / raw
  To: gentoo-commits

commit:     5fe00451b68d5c1fedc5f21b03d86167c345f289
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Mar 10 10:57:07 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Mar 10 10:57:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5fe00451

net-libs/webkit-gtk: 1.7.90 → 1.7.91

---
 ...0-r200.ebuild => webkit-gtk-1.7.91-r200.ebuild} |    0
 ...0-r300.ebuild => webkit-gtk-1.7.91-r300.ebuild} |    0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.91-r200.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.91-r200.ebuild

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.91-r300.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.91-r300.ebuild



^ permalink raw reply	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-03-17 19:33 Alexandre Restovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Restovtsev @ 2012-03-17 19:33 UTC (permalink / raw
  To: gentoo-commits

commit:     90e100bdfe2df9ff586575291d6a7a82fc258a44
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 19:31:51 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Mar 17 19:31:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=90e100bd

net-libs/webkit-gtk: sparc fix by Raúl Porcel for bug #389963

The 1.6.1-sparc-needs-alignment patch is not needed since it has been
applied upstream in 1.7.x.

---
 net-libs/webkit-gtk/webkit-gtk-1.7.91-r200.ebuild |    2 +-
 net-libs/webkit-gtk/webkit-gtk-1.7.91-r300.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.91-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.91-r200.ebuild
index 9ff8893..b245273 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.91-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.91-r200.ebuild
@@ -130,7 +130,7 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+	use sparc && filter-flags "-mvis"
 
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.91-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.91-r300.ebuild
index c5b5d47..8af62fe 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.91-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.91-r300.ebuild
@@ -130,7 +130,7 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+	use sparc && filter-flags "-mvis"
 
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-03-24 23:40 Alexandre Restovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Restovtsev @ 2012-03-24 23:40 UTC (permalink / raw
  To: gentoo-commits

commit:     bb89d9184993e899ea87b54b5bf91d368919bc05
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 23:36:59 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Mar 24 23:36:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bb89d918

net-libs/webkit-gtk: 1.7.91 → 1.7.92

Bump. Paxmark only if USE=jit (bug #404215, thanks to Maxim Kammerer).
Paxmark test suite executables so that tests with USE=jit can run on
hardened. Skip testwebdatasource (requires a network connection and
intermittently fails if icedtea plugin is installed).

---
 ...1-r200.ebuild => webkit-gtk-1.7.92-r200.ebuild} |   22 +++++++++++++------
 ...1-r300.ebuild => webkit-gtk-1.7.92-r300.ebuild} |   19 +++++++++++++---
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.91-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
similarity index 89%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.91-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
index b245273..2630771 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.91-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
@@ -60,7 +60,7 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	dev-util/pkgconfig
 	dev-util/gtk-doc-am
-	sys-apps/paxctl
+	introspection? ( jit? ( sys-apps/paxctl ) )
 	test? ( x11-themes/hicolor-icon-theme )
 "
 # Need real bison, not yacc
@@ -95,8 +95,10 @@ src_prepare() {
 	sed -i 's/-O2//g' "${S}"/configure.ac || die
 
 	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-	cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	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
@@ -106,14 +108,15 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
 
 	# XXX: failing tests
-	# https://bugs.webkit.org/show_bug.cgi?id=79599
 	# https://bugs.webkit.org/show_bug.cgi?id=50744
 	# testkeyevents is interactive
 	# mimehandling test sometimes fails under Xvfb (works fine manually)
-	sed -e '/Programs\/unittests\/testwebview/ d' \
-		-e '/Programs\/unittests\/testwebinspector/ d' \
+	# 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
 	# garbage collection test fails intermittently if icedtea-web is installed
 	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
@@ -173,6 +176,11 @@ src_compile() {
 }
 
 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/unittests/test*) \
+		Programs/unittests/.libs/test*
 	unset DISPLAY
 	# Tests need virtualx, bug #294691, bug #310695
 	# Parallel tests sometimes fail
@@ -191,7 +199,7 @@ src_install() {
 	find "${D}" -name '*.la' -exec rm -f '{}' +
 
 	# Prevents crashes on PaX systems
-	pax-mark m "${ED}usr/bin/jsc-1"
+	use jit && pax-mark m "${ED}usr/bin/jsc-1"
 
 	# File collisions with slot 3
 	# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.91-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
similarity index 89%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.91-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
index 8af62fe..cc3d132 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.91-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
@@ -61,8 +61,8 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	dev-util/pkgconfig
 	dev-util/gtk-doc-am
-	sys-apps/paxctl
 	doc? ( >=dev-util/gtk-doc-1.10 )
+	introspection? ( jit? ( sys-apps/paxctl ) )
 	test? ( x11-themes/hicolor-icon-theme )
 "
 # Need real bison, not yacc
@@ -97,8 +97,10 @@ src_prepare() {
 	sed -i 's/-O2//g' "${S}"/configure.ac || die
 
 	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-	cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	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
@@ -111,9 +113,12 @@ src_prepare() {
 	# 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
 	# garbage collection test fails intermittently if icedtea-web is installed
 	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
@@ -172,6 +177,12 @@ src_compile() {
 }
 
 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/unittests/test*) \
+		Programs/unittests/.libs/test*
 	unset DISPLAY
 	# Tests need virtualx, bug #294691, bug #310695
 	# Parallel tests sometimes fail
@@ -190,5 +201,5 @@ src_install() {
 	find "${D}" -name '*.la' -exec rm -f '{}' +
 
 	# Prevents crashes on PaX systems
-	pax-mark m "${ED}usr/bin/jsc-3"
+	use jit && pax-mark m "${ED}usr/bin/jsc-3"
 }



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-03-25  0:10 Alexandre Restovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Restovtsev @ 2012-03-25  0:10 UTC (permalink / raw
  To: gentoo-commits

commit:     3c799ae6353c2a8c1d2cc180283e21966beffc89
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 00:09:20 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Mar 25 00:09:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3c799ae6

net-libs/webkit-gtk: deps

paxctl is presumably needed for USE="jit test" also, for the same reason
as for USE="jit introspection".

---
 net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild |    3 ++-
 net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
index 2630771..d7195b6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
@@ -61,7 +61,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/gtk-doc-am
 	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? ( x11-themes/hicolor-icon-theme )
+	test? ( x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
 "
 # Need real bison, not yacc
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
index cc3d132..122e841 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
@@ -63,7 +63,9 @@ DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1.10 )
 	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? ( x11-themes/hicolor-icon-theme )
+	test? (
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
 "
 # Need real bison, not yacc
 



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-04-05 21:43 Alexandre Restovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Restovtsev @ 2012-04-05 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     40451cef09a9f05f9320696a6d75f26c516612d1
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  5 21:41:53 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Apr  5 21:43:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=40451cef

net-libs/webkit-gtk: work around yet another parallel make failure

Reported by Steev Klimaszewski on irc.

---
 net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild |    2 +-
 net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
index d7195b6..2ba8aef 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
@@ -168,7 +168,7 @@ src_configure() {
 src_compile() {
 	# Horrible failure of a hack to work around parallel make problems,
 	# see https://bugs.webkit.org/show_bug.cgi?id=79498
-	emake all-built-sources-local
+	emake -j1 all-built-sources-local
 	emake all-ltlibraries-local
 	emake all-programs-local
 	use introspection && emake WebKit-1.0.gir

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
index 122e841..743f185 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
@@ -170,7 +170,7 @@ src_configure() {
 src_compile() {
 	# Horrible failure of a hack to work around parallel make problems,
 	# see https://bugs.webkit.org/show_bug.cgi?id=79498
-	emake all-built-sources-local
+	emake -j1 all-built-sources-local
 	emake all-ltlibraries-local
 	emake all-programs-local
 	use introspection && emake WebKit-3.0.gir



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-07-22  4:41 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2012-07-22  4:41 UTC (permalink / raw
  To: gentoo-commits

commit:     52723beebd769ba9ab45736bc8a6d54690f49e5f
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Jul 22 04:25:25 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Jul 22 04:40:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=52723bee

net-libs/webkit-gtk: Add forgotten ruby dependency

---
 net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild
index 93fd313..57be911 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild
@@ -57,6 +57,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	=dev-lang/python-2*
+	dev-lang/ruby
 	sys-devel/bison
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-07-26 14:40 Nirbheek Chauhan
  0 siblings, 0 replies; 43+ messages in thread
From: Nirbheek Chauhan @ 2012-07-26 14:40 UTC (permalink / raw
  To: gentoo-commits

commit:     ab73f221307e759a49a7a1477503c42fbe468802
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 26 14:40:27 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Jul 26 14:40:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ab73f221

net-libs/webkit-gtk: needs not just ruby, but also rubygems

---
 net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild
index 57be911..1f9a992 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	=dev-lang/python-2*
-	dev-lang/ruby
+	virtual/rubygems
 	sys-devel/bison
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-08-24 21:35 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2012-08-24 21:35 UTC (permalink / raw
  To: gentoo-commits

commit:     6be7f9b3b79efda1a9fbea2bcd802dc561f24c58
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Aug 24 21:34:18 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Aug 24 21:35:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6be7f9b3

net-libs/webkit-gtk: 1.9.4 -> 1.9.90

---
 ...4-r300.ebuild => webkit-gtk-1.9.90-r300.ebuild} |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.9.90-r300.ebuild
similarity index 98%
rename from net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.9.90-r300.ebuild
index 1f9a992..08b15f6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.9.90-r300.ebuild
@@ -50,8 +50,9 @@ RDEPEND="
 
 	spell? ( >=app-text/enchant-0.22 )
 
-	webgl? ( virtual/opengl )
-
+	webgl? (
+		virtual/opengl
+		x11-libs/libXcomposite )
 "
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
@@ -66,6 +67,8 @@ DEPEND="${RDEPEND}
 	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? (
@@ -189,7 +192,8 @@ src_compile() {
 	#emake all-programs-local
 	#use introspection && emake WebKit-3.0.gir
 	#emake all-data-local
-	emake -j1
+	#emake -j1
+	default
 }
 
 src_test() {


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-09-05 15:09 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2012-09-05 15:09 UTC (permalink / raw
  To: gentoo-commits

commit:     ea8ff0429662f6841cce111770b90c538bfda262
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Sep  5 15:08:14 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Sep  5 15:08:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ea8ff042

net-libs/webkit-gtk: 1.9.90-r300 → 1.9.91-r300

---
 ...0-r300.ebuild => webkit-gtk-1.9.91-r300.ebuild} |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.9.90-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild
similarity index 92%
rename from net-libs/webkit-gtk/webkit-gtk-1.9.90-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild
index 08b15f6..338d8d6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.9.90-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	>=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.37.92:2.4[introspection?]
+	>=net-libs/libsoup-2.39.2:2.4[introspection?]
 	dev-db/sqlite:3
 	>=x11-libs/pango-1.21
 	x11-libs/libXrender
@@ -111,9 +111,6 @@ src_prepare() {
 	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
 	gnome2_environment_reset
 
-	# https://bugs.webkit.org/show_bug.cgi?id=79498
-	#epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
-
 	# XXX: failing tests
 	# https://bugs.webkit.org/show_bug.cgi?id=50744
 	# testkeyevents is interactive
@@ -184,18 +181,6 @@ src_configure() {
 	econf ${myconf}
 }
 
-src_compile() {
-	# Horrible failure of a hack to work around parallel make problems,
-	# see https://bugs.webkit.org/show_bug.cgi?id=79498
-	#emake -j1 all-built-sources-local
-	#emake all-ltlibraries-local
-	#emake all-programs-local
-	#use introspection && emake WebKit-3.0.gir
-	#emake all-data-local
-	#emake -j1
-	default
-}
-
 src_test() {
 	# Tests expect an out-of-source build in WebKitBuild
 	ln -s . WebKitBuild || die "ln failed"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-10-17 15:03 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2012-10-17 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     a515b1928bc1da2b8878af4092097be3065f3d6b
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Oct 17 15:02:09 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Oct 17 15:02:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a515b192

net-libs/webkit-gtk: 1.10.0 → 1.10.1

---
 ...0-r300.ebuild => webkit-gtk-1.10.1-r300.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.0-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-1.10.0-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild


^ permalink raw reply	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-10-28  7:08 Alexandre Rostovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Rostovtsev @ 2012-10-28  7:08 UTC (permalink / raw
  To: gentoo-commits

commit:     68ec7f9f3236b5ec846238c5a5a5ba1333f53284
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 07:05:07 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 07:07:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=68ec7f9f

net-libs/webkit-gtk: avoid pulling in five different ruby implementations

Especially since virtual/rubygems:5 pulls in rubinius, which blocks
recent llvm.

---
 net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild |    2 +-
 net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
index 1fb6329..73f9a97 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	=dev-lang/python-2*
-	virtual/rubygems
+	virtual/rubygems[ruby_targets_ruby18]
 	sys-devel/bison
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext

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
index cb7ffec..a0efe2c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild
@@ -61,7 +61,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	=dev-lang/python-2*
-	virtual/rubygems
+	virtual/rubygems[ruby_targets_ruby18]
 	sys-devel/bison
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-10-28  8:10 Alexandre Rostovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Rostovtsev @ 2012-10-28  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     892f0d6006273dde2fdd8f7fcd47d0df99d94594
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 08:01:58 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 08:01:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=892f0d60

net-libs/webkit-gtk: build fixes

It seems that explicitly generating JSNode.h is sufficient to fix
parallel make issues.

Also, pass the ruby interpeter path to configure, and force
gstreamer-0.10 to be used until gstreamer-1.0 is ready.

---
 net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild |    8 ++++++++
 net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild |    8 ++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
index 73f9a97..f457465 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
@@ -174,12 +174,20 @@ src_configure() {
 		$(use_enable webgl)
 		--with-gtk=3.0
 		--enable-dependency-tracking
+		--with-gstreamer=0.10
+		RUBY=$(type -P ruby18)
 		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
 		# Aqua support in gtk3 is untested
 
 	econf ${myconf}
 }
 
+src_compile() {
+	# Avoid parallel make failure with -j9
+	emake DerivedSources/WebCore/JSNode.h
+	default
+}
+
 src_test() {
 	# Tests expect an out-of-source build in WebKitBuild
 	ln -s . WebKitBuild || die "ln failed"

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
index a0efe2c..6f9fac9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild
@@ -181,12 +181,20 @@ src_configure() {
 		--disable-gles2
 		--with-gtk=3.0
 		--enable-dependency-tracking
+		--with-gstreamer=0.10
+		RUBY=$(type -P ruby18)
 		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
 		# Aqua support in gtk3 is untested
 
 	econf ${myconf}
 }
 
+src_compile() {
+	# Avoid parallel make failure with -j9
+	emake DerivedSources/WebCore/JSNode.h
+	default
+}
+
 src_test() {
 	# Tests expect an out-of-source build in WebKitBuild
 	ln -s . WebKitBuild || die "ln failed"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-10-28  9:46 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2012-10-28  9:46 UTC (permalink / raw
  To: gentoo-commits

commit:     bbe67a94063086730dcd76641d18e2c6a543be0b
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Oct 28 09:45:01 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Oct 28 09:45:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bbe67a94

net-libs/webkit-gtk: Update ruby reqs and add space checks

---
 net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild |   23 ++++++++++++++++----
 net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild |   23 ++++++++++++++++----
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
index f457465..5c32fff 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 
 # Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools flag-o-matic gnome2-utils pax-utils python virtualx
+inherit autotools check-reqs flag-o-matic gnome2-utils pax-utils python virtualx
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -58,7 +58,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	=dev-lang/python-2*
-	virtual/rubygems[ruby_targets_ruby18]
+	|| ( virtual/rubygems[ruby_targets_ruby19]
+	     virtual/rubygems[ruby_targets_ruby18] )
 	sys-devel/bison
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext
@@ -79,13 +80,25 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	if is-flagq "-g*" ; then
+		check-reqs_pkg_pretend
+	fi
+}
+
 pkg_setup() {
+	# Check whether any of the debugging flags is enabled
+	if is-flagq "-g*" ; then
+		check-reqs_pkg_setup
+		einfo "You have at least 6GB of temporary build space available, but "
+		einfo "it may still not be enough, as the total space requirements "
+		einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features."
+	fi
 	# 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() {

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
index 6f9fac9..a4795f1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 
 # Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools flag-o-matic gnome2-utils pax-utils python virtualx
+inherit autotools check-reqs flag-o-matic gnome2-utils pax-utils python virtualx
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -61,7 +61,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	=dev-lang/python-2*
-	virtual/rubygems[ruby_targets_ruby18]
+	|| ( virtual/rubygems[ruby_targets_ruby19]
+	     virtual/rubygems[ruby_targets_ruby18] )
 	sys-devel/bison
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext
@@ -82,13 +83,25 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	if is-flagq "-g*" ; then
+		check-reqs_pkg_pretend
+	fi
+}
+
 pkg_setup() {
+	# Check whether any of the debugging flags is enabled
+	if is-flagq "-g*" ; then
+		check-reqs_pkg_setup
+		einfo "You have at least 6GB of temporary build space available, but "
+		einfo "it may still not be enough, as the total space requirements "
+		einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features."
+	fi
 	# 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() {


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-10-28 18:54 Alexandre Rostovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Rostovtsev @ 2012-10-28 18:54 UTC (permalink / raw
  To: gentoo-commits

commit:     edbb40ba35792886cd67cc961e30239a4c4fe9b9
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 18:50:20 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 18:50:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=edbb40ba

net-libs/webkit-gtk: update RUBY configure arument

Since commit bbe67a94 allowed using ruby19 as well as ruby18.

---
 net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild |    7 ++++++-
 net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild |    7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
index 5c32fff..bb432bc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
@@ -188,10 +188,15 @@ src_configure() {
 		--with-gtk=3.0
 		--enable-dependency-tracking
 		--with-gstreamer=0.10
-		RUBY=$(type -P ruby18)
 		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
 		# Aqua support in gtk3 is untested
 
+	if has_version "virtual/rubygems[ruby_targets_ruby19]"; then
+		myconf="${myconf} RUBY=$(type -P ruby19)"
+	else
+		myconf="${myconf} RUBY=$(type -P ruby18)"
+	fi
+
 	econf ${myconf}
 }
 

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
index a4795f1..06e82f6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild
@@ -195,10 +195,15 @@ src_configure() {
 		--with-gtk=3.0
 		--enable-dependency-tracking
 		--with-gstreamer=0.10
-		RUBY=$(type -P ruby18)
 		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
 		# Aqua support in gtk3 is untested
 
+	if has_version "virtual/rubygems[ruby_targets_ruby19]"; then
+		myconf="${myconf} RUBY=$(type -P ruby19)"
+	else
+		myconf="${myconf} RUBY=$(type -P ruby18)"
+	fi
+
 	econf ${myconf}
 }
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-12-25 15:03 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2012-12-25 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     79629be794beb66606ed51791834c32ec4bb14d5
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Dec 25 15:00:54 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Dec 25 15:00:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=79629be7

net-libs/webkit-gtk: Bump to 1.1{0,1}.2

---
 ...1-r300.ebuild => webkit-gtk-1.10.2-r300.ebuild} |    0
 ...1-r300.ebuild => webkit-gtk-1.11.2-r300.ebuild} |    1 +
 2 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
similarity index 99%
rename from net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
index c92517f..748ddb6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
@@ -28,6 +28,7 @@ REQUIRED_USE="introspection? ( geoloc gstreamer )"
 # gtk2 is needed for plugin process support
 # TODO: There's 3 acceleration backends: opengl, egl and gles2
 RDEPEND="
+	app-crypt/libsecret
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	virtual/jpeg


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-12-25 23:55 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-25 23:55 UTC (permalink / raw
  To: gentoo-commits

commit:     9f66223deed143581fc3cf553f52cc05143eba5d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 23:24:28 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 23:55:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9f66223d

net-libs/webkit-gtk: moved 1.10 to gx86

    * Sync 1.11 with gx86 changes.

---
 net-libs/webkit-gtk/metadata.xml                  |   10 +-
 net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild |  238 ---------------------
 net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |   53 ++---
 3 files changed, 27 insertions(+), 274 deletions(-)

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 4232b5d..f18e5d4 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -3,14 +3,12 @@
 <pkgmetadata>
   <herd>gnome</herd>
   <use>
-	<flag name="coverage">Enable code coverage support</flag>
-	<flag name="geoloc">Enable geolocation support through
+    <flag name="coverage">Enable code coverage support</flag>
+    <flag name="geoloc">Enable geolocation support through
 		<pkg>app-misc/geoclue</pkg></flag>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
-	<flag name="webgl">Build support for the WebGL HTML API using
+    <flag name="webgl">Build support for the WebGL HTML API using
 		<pkg>virtual/opengl</pkg></flag>
-	<flag name="webkit2">Enable WebKit2 API that splits web content rendering
+    <flag name="webkit2">Enable WebKit2 API that splits web content rendering
 		and application UI into separate processes</flag>
   </use>
 </pkgmetadata>

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
deleted file mode 100644
index 8ab781d..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# 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 check-reqs 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+ 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"
-# 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
-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 )
-"
-# paxctl needed for bug #407085
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	|| ( virtual/rubygems[ruby_targets_ruby19]
-	     virtual/rubygems[ruby_targets_ruby18] )
-	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}"
-
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
-	if is-flagq "-g*" ; then
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	# Check whether any of the debugging flags is enabled
-	if is-flagq "-g*" ; then
-		check-reqs_pkg_setup
-		einfo "You have at least 6GB of temporary build space available, but "
-		einfo "it may still not be enough, as the total space requirements "
-		einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features."
-	fi
-	# Needed for CodeGeneratorInspector.py
-	python_set_active_version 2
-	python_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
-
-	# 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 <video> support
-		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
-			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
-	fi
-	# garbage collection test fails intermittently if icedtea-web is installed
-	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
-	# occasional test failure due to additional Xvfb process spawned
-	# TODO epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
-
-	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
-	epatch "${FILESDIR}/${PN}-1.9.91-libdl.patch"
-
-	# uclibc fix, bug #441674
-	epatch "${FILESDIR}/${PN}-1.10.1-disable-backtrace-uclibc.patch"
-
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-
-	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
-	# http://paludis.exherbo.org/trac/ticket/1230
-	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
-}
-
-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 "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	local myconf
-
-	# XXX: Check Web Audio support
-	# XXX: dependency-tracking is required so parallel builds won't fail
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable debug debug-features)
-		$(use_enable doc gtk-doc)
-		$(use_enable geoloc geolocation)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		$(use_enable webgl)
-		--with-gtk=3.0
-		--enable-dependency-tracking
-		--with-gstreamer=0.10
-		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
-		# Aqua support in gtk3 is untested
-
-	if has_version "virtual/rubygems[ruby_targets_ruby19]"; then
-		myconf="${myconf} RUBY=$(type -P ruby19)"
-	else
-		myconf="${myconf} RUBY=$(type -P ruby18)"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Avoid parallel make failure with -j9
-	emake DerivedSources/WebCore/JSNode.h
-	default
-}
-
-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() {
-	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 '{}' +
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
index 748ddb6..b6769a5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
@@ -1,11 +1,11 @@
 # 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 $
+# $Header: $
 
-EAPI="4"
+EAPI="5"
+PYTHON_COMPAT=( python2_{5,6,7} )
 
-# Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools check-reqs flag-o-matic gnome2-utils pax-utils python virtualx
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-single-r1 virtualx
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -17,13 +17,11 @@ LICENSE="LGPL-2+ 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"
+IUSE="aqua coverage debug +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
@@ -32,11 +30,11 @@ RDEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	virtual/jpeg
-	>=media-libs/libpng-1.4: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?]
-	>=dev-libs/icu-3.8.1-r1
+	>=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
@@ -44,15 +42,11 @@ RDEPEND="
 	>=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 )
-
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-
 	spell? ( >=app-text/enchant-0.22 )
-
 	webgl? (
 		virtual/opengl
 		x11-libs/libXcomposite
@@ -61,20 +55,18 @@ RDEPEND="
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	=dev-lang/python-2*
+	${PYTHON_DEPS}
 	|| ( virtual/rubygems[ruby_targets_ruby19]
 	     virtual/rubygems[ruby_targets_ruby18] )
+	app-accessibility/at-spi2-core
+	>=dev-util/gtk-doc-am-1.10
+	dev-util/gperf
 	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
+	virtual/pkgconfig
 
-	doc? ( >=dev-util/gtk-doc-1.10 )
 	introspection? ( jit? ( sys-apps/paxctl ) )
 	test? (
 		x11-themes/hicolor-icon-theme
@@ -101,8 +93,7 @@ pkg_setup() {
 		einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features."
 	fi
 	# Needed for CodeGeneratorInspector.py
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -132,13 +123,15 @@ src_prepare() {
 	# 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
+	# datasource test needs a network connection and intermittently fails with icedtea-web
+	# webplugindatabase 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' \
+		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
 		-i Source/WebKit/gtk/GNUmakefile.am || die
+
 	if ! use gstreamer; then
 		# webkit2's TestWebKitWebView requires <video> support
 		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
@@ -187,7 +180,6 @@ src_configure() {
 		$(use_enable coverage)
 		$(use_enable debug)
 		$(use_enable debug debug-features)
-		$(use_enable doc gtk-doc)
 		$(use_enable geoloc geolocation)
 		$(use_enable spell spellcheck)
 		$(use_enable introspection)
@@ -197,8 +189,10 @@ src_configure() {
 		--disable-egl
 		--disable-gles2
 		--with-gtk=3.0
+		--with-gstreamer=1.0
+		--with-accelerated-compositing
 		--enable-dependency-tracking
-		--with-gstreamer=0.10
+		--disable-gtk-doc
 		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
 		# Aqua support in gtk3 is untested
 
@@ -238,8 +232,7 @@ src_install() {
 	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
 	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
 
-	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' +
+	prune_libtool_files
 
 	# Prevents crashes on PaX systems
 	use jit && pax-mark m "${ED}usr/bin/jsc-3"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-12-26  7:59 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-26  7:59 UTC (permalink / raw
  To: gentoo-commits

commit:     ed53fcc874d8db5e75f3eb01934a5959dacac815
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 26 07:58:53 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Dec 26 07:58:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ed53fcc8

net-libs/webkit-gtk: fix src_prepare, bug #448616

---
 net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
index b6769a5..d49cb5a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
@@ -144,7 +144,7 @@ src_prepare() {
 	# TODO epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
 
 	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
-	epatch "${FILESDIR}/${P}-libdl.patch"
+	epatch "${FILESDIR}/${PN}-1.11.1-libdl.patch"
 
 	# uclibc fix, bug #441674
 	epatch "${FILESDIR}/${PN}-1.10.1-disable-backtrace-uclibc.patch"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2012-12-27  4:55 Alexandre Rostovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-27  4:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a49701f5b7760b062cb8b977d27702f43da1df7b
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 04:53:51 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 04:53:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a49701f5

net-libs/webkit-gtk: sync with gx86

Do not use python-r1.eclass: webkit-gtk needs python only at build time,
so use-expanded PYTHON_TARGETS do not make sense here.

---
 net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
index d49cb5a..aa2db30 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
@@ -3,9 +3,8 @@
 # $Header: $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
 
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-single-r1 virtualx
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils virtualx
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -29,14 +28,14 @@ RDEPEND="
 	app-crypt/libsecret
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	virtual/jpeg
+	virtual/jpeg:=
 	>=media-libs/libpng-1.4:0=
-	>=x11-libs/cairo-1.10
+	>=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
+	dev-db/sqlite:3=
 	>=x11-libs/pango-1.21
 	x11-libs/libXrender
 	>=x11-libs/gtk+-2.13:2
@@ -46,7 +45,7 @@ RDEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	spell? ( >=app-text/enchant-0.22 )
+	spell? ( >=app-text/enchant-0.22:= )
 	webgl? (
 		virtual/opengl
 		x11-libs/libXcomposite
@@ -55,7 +54,7 @@ RDEPEND="
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	${PYTHON_DEPS}
+	=dev-lang/python-2*
 	|| ( virtual/rubygems[ruby_targets_ruby19]
 	     virtual/rubygems[ruby_targets_ruby18] )
 	app-accessibility/at-spi2-core
@@ -92,8 +91,6 @@ pkg_setup() {
 		einfo "it may still not be enough, as the total space requirements "
 		einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features."
 	fi
-	# Needed for CodeGeneratorInspector.py
-	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -190,10 +187,11 @@ src_configure() {
 		--disable-gles2
 		--with-gtk=3.0
 		--with-gstreamer=1.0
-		--with-accelerated-compositing
+		--enable-accelerated-compositing
 		--enable-dependency-tracking
 		--disable-gtk-doc
-		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		PYTHON=$(type -P python2)
+		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
 		# Aqua support in gtk3 is untested
 
 	if has_version "virtual/rubygems[ruby_targets_ruby19]"; then


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2013-01-01 19:36 Alexandre Rostovtsev
  0 siblings, 0 replies; 43+ messages in thread
From: Alexandre Rostovtsev @ 2013-01-01 19:36 UTC (permalink / raw
  To: gentoo-commits

commit:     d2fc70e31198b9b280b0dc017e36da6a06a090dd
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  1 19:35:35 2013 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Jan  1 19:35:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d2fc70e3

net-libs/webkit-gtk: sync debugging flags check with gx86

Raise build space requirements to 18GB (bug #417307) and replace -ggdb with -g
(bug #432784).

---
 net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |   28 +++++++++++++++------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
index aa2db30..65ec3a7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -75,21 +75,33 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-CHECKREQS_DISK_BUILD="6G"
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
 
 pkg_pretend() {
-	if is-flagq "-g*" ; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then
+		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
 		check-reqs_pkg_pretend
 	fi
 }
 
 pkg_setup() {
 	# Check whether any of the debugging flags is enabled
-	if is-flagq "-g*" ; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; 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
-		einfo "You have at least 6GB of temporary build space available, but "
-		einfo "it may still not be enough, as the total space requirements "
-		einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features."
 	fi
 }
 
@@ -172,7 +184,7 @@ src_configure() {
 	# XXX: Check Web Audio support
 	# XXX: dependency-tracking is required so parallel builds won't fail
 	# XXX: There's 3 acceleration backends: opengl, egl and gles2
-    #      should somehow let user select between them?
+	#      should somehow let user select between them?
 	myconf="
 		$(use_enable coverage)
 		$(use_enable debug)


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2013-01-15 15:13 Priit Laes
  0 siblings, 0 replies; 43+ messages in thread
From: Priit Laes @ 2013-01-15 15:13 UTC (permalink / raw
  To: gentoo-commits

commit:     11e21669c5d08419ba9b20d9ddfc363baa82f45c
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan 15 15:10:03 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan 15 15:10:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=11e21669

net-libs/webkit-gtk: Drop keywords for 1.11.4 due to stability issues

Very crashy and breaks epiphany/evolution:
https://bugs.webkit.org/show_bug.cgi?id=106903

---
 net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild
index 126b24a..d941598 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild
@@ -14,7 +14,8 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ 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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS=""
 IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
 # bugs 372493, 416331
 REQUIRED_USE="introspection? ( geoloc gstreamer )"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2013-11-17 23:35 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-17 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     d89b834410a4c7345232ea927a60f7c6aa8a02b5
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 17:22:02 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> 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 <video> support
+		# webkit2's TestWebKitWebView requires <video> support, bug #????
 		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
 			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
 	fi
-	# garbage collection test fails intermittently if icedtea-web is installed
+	# garbage collection test fails intermittently if icedtea-web is installed, bug #????
 	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
 
-	# occasional test failure due to additional Xvfb process spawned
-	# TODO epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
-
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC
 
-	epatch "${FILESDIR}/${P}-gtk-docize-fix.patch"
+	# bug #459978, upstream bug #113397
+	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
-
-	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
-	# http://paludis.exherbo.org/trac/ticket/1230
-	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
 }
 
 src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS
+	# 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.
+	# 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"
 
-	local myconf
+	# Try to use less memory, bug #469942
+	append-ldflags "-Wl,--no-keep-memory"
 
-	# XXX: Check Web Audio support
-	# XXX: dependency-tracking is required so parallel builds won't fail
-	# XXX: There's 3 acceleration backends: opengl, egl and gles2
-	#      should somehow let user select between them?
+	local myconf
+	# TODO: Check Web Audio support
+	# TODO: There's 3 acceleration backends: opengl, egl and gles2
+	# should somehow let user select between them?
+	#
+	# * dependency-tracking is required so parallel builds won't fail
 	myconf="
 		$(use_enable coverage)
 		$(use_enable debug)
@@ -186,6 +206,7 @@ src_configure() {
 		$(use_enable introspection)
 		$(use_enable gstreamer video)
 		$(use_enable jit)
+		$(use_enable libsecret credential_storage)
 		$(use_enable webgl)
 		--disable-egl
 		--disable-gles2
@@ -193,11 +214,12 @@ src_configure() {
 		--enable-accelerated-compositing
 		--enable-dependency-tracking
 		--disable-gtk-doc
-		PYTHON=$(type -P python2)
 		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
 		# Aqua support in gtk3 is untested
 
-	if has_version "virtual/rubygems[ruby_targets_ruby19]"; then
+	if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+		myconf="${myconf} RUBY=$(type -P ruby20)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
 		myconf="${myconf} RUBY=$(type -P ruby19)"
 	else
 		myconf="${myconf} RUBY=$(type -P ruby18)"
@@ -206,11 +228,11 @@ src_configure() {
 	econf ${myconf}
 }
 
-src_compile() {
-	# Avoid parallel make failure with -j9
-	emake DerivedSources/WebCore/JSNode.h
-	default
-}
+#src_compile() {
+	# Avoid parallel make failure with -j9, bug #????
+#	emake DerivedSources/WebCore/JSNode.h
+#	default
+#}
 
 src_test() {
 	# Tests expect an out-of-source build in WebKitBuild
@@ -229,7 +251,6 @@ 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
 
@@ -238,3 +259,20 @@ src_install() {
 	# Prevents crashes on PaX systems
 	use jit && pax-mark m "${ED}usr/bin/jsc-3"
 }
+
+nvidia_check() {
+	if [[ ${MERGE_TYPE} != "binary" ]] &&
+	   use introspection &&
+	   has_version '=x11-drivers/nvidia-drivers-325*' &&
+	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+	then
+		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
+		eerror "used as the system OpenGL library."
+		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
+		eerror "Mesa as the system OpenGL library:"
+		eerror " # eselect opengl set xorg-x11"
+		eerror "See https://bugs.gentoo.org/463960 for more details."
+		eerror
+		return 1
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2013-11-17 23:35 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-17 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     b50ac474a79ad199aff897eb5184572d15a1aa91
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 23:34:34 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 23:34:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b50ac474

net-libs/webkit-gtk: enhance webgl support

Finally went through the crazy autofoo to figure out how to enable wegl
correctly.

Building with USE="gles2" fails on amd64 for me, but maybe someone else
will have better luck.

---
 net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild | 59 +++++++++++++++--------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
index 3e6c3a9..b4eb0ab 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
@@ -16,18 +16,19 @@ 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua coverage debug +geoloc +gstreamer libsecret +introspection +jit spell +webgl"
+IUSE="aqua coverage debug +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl"
 # bugs 372493, 416331
 REQUIRED_USE="
 	geoloc? ( introspection )
 	introspection? ( gstreamer )
+	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
-# TODO: There's 3 acceleration backends: opengl, egl and gles2
 RDEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
@@ -53,7 +54,8 @@ RDEPEND="
 	libsecret? ( app-crypt/libsecret )
 	spell? ( >=app-text/enchant-0.22:= )
 	webgl? (
-		virtual/opengl
+		gles2? ( media-libs/mesa[egl,gles2] )
+		opengl? ( media-libs/mesa[egl] )
 		x11-libs/cairo[opengl]
 		x11-libs/libXcomposite
 		x11-libs/libXdamage )
@@ -192,30 +194,7 @@ src_configure() {
 	# Try to use less memory, bug #469942
 	append-ldflags "-Wl,--no-keep-memory"
 
-	local myconf
-	# TODO: Check Web Audio support
-	# TODO: There's 3 acceleration backends: opengl, egl and gles2
-	# should somehow let user select between them?
-	#
-	# * dependency-tracking is required so parallel builds won't fail
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable geoloc geolocation)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		$(use_enable libsecret credential_storage)
-		$(use_enable webgl)
-		--disable-egl
-		--disable-gles2
-		--with-gtk=3.0
-		--enable-accelerated-compositing
-		--enable-dependency-tracking
-		--disable-gtk-doc
-		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
-		# Aqua support in gtk3 is untested
+	local myconf=""
 
 	if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
 		myconf="${myconf} RUBY=$(type -P ruby20)"
@@ -225,7 +204,31 @@ src_configure() {
 		myconf="${myconf} RUBY=$(type -P ruby18)"
 	fi
 
-	econf ${myconf}
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# * Aqua support in gtk3 is untested
+	# * egl is needed for gles2
+	# * dependency-tracking is required so parallel builds won't fail
+	econf \
+		$(use_enable coverage) \
+		$(use_enable debug) \
+		$(use_enable geoloc geolocation) \
+		$(use_enable gles2) \
+		$(use_enable gstreamer video) \
+		$(use_enable introspection) \
+		$(use_enable jit) \
+		$(use_enable libsecret credential_storage) \
+		$(use_enable opengl glx) \
+		$(use_enable spell spellcheck) \
+		$(use_enable webgl egl) \
+		$(use_enable webgl) \
+		--with-gtk=3.0 \
+		--enable-accelerated-compositing \
+		--enable-dependency-tracking \
+		--disable-gtk-doc \
+		$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
+		${myconf}
 }
 
 #src_compile() {


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2013-11-26 21:47 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-26 21:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ca4e1c43a6aae7bf2c3b4de199a3d7fa2ea5ec4f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 21:36:39 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 21:46:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ca4e1c43

net-libs/webkit-gtk: more webgl related enhancements

Try to provide the maximum acceleration possible with and without webgl.

accelerated-compositing implies canvas and css shaders, however css
shaders require webgl to be enabled to build.

egl and gles2 are linked by webkit libs, so hopefully they are used by
something even without webgl, untie their setup in ebuild.

---
 net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
index b4eb0ab..f968ffa 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
@@ -16,13 +16,13 @@ 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua coverage debug +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl"
+IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl"
 # bugs 372493, 416331
 REQUIRED_USE="
 	geoloc? ( introspection )
 	introspection? ( gstreamer )
 	webgl? ( ^^ ( gles2 opengl ) )
-
+	gles2? ( egl )
 "
 
 # use sqlite, svg by default
@@ -46,16 +46,17 @@ RDEPEND="
 	x11-libs/libXrender
 	>=x11-libs/gtk+-2.24.10:2
 
+	egl? ( media-libs/mesa[egl] )
 	geoloc? ( app-misc/geoclue )
+	gles2? ( media-libs/mesa[gles2] )
 	gstreamer? (
 		>=media-libs/gstreamer-1.0.3:1.0
 		>=media-libs/gst-plugins-base-1.0.3:1.0 )
 	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
 	libsecret? ( app-crypt/libsecret )
+	opengl? ( virtual/opengl )
 	spell? ( >=app-text/enchant-0.22:= )
 	webgl? (
-		gles2? ( media-libs/mesa[egl,gles2] )
-		opengl? ( media-libs/mesa[egl] )
 		x11-libs/cairo[opengl]
 		x11-libs/libXcomposite
 		x11-libs/libXdamage )
@@ -208,11 +209,11 @@ src_configure() {
 	# should somehow let user select between them?
 	#
 	# * Aqua support in gtk3 is untested
-	# * egl is needed for gles2
 	# * dependency-tracking is required so parallel builds won't fail
 	econf \
 		$(use_enable coverage) \
 		$(use_enable debug) \
+		$(use_enable egl) \
 		$(use_enable geoloc geolocation) \
 		$(use_enable gles2) \
 		$(use_enable gstreamer video) \
@@ -221,22 +222,15 @@ src_configure() {
 		$(use_enable libsecret credential_storage) \
 		$(use_enable opengl glx) \
 		$(use_enable spell spellcheck) \
-		$(use_enable webgl egl) \
 		$(use_enable webgl) \
+		$(use_enable webgl accelerated-compositing)
 		--with-gtk=3.0 \
-		--enable-accelerated-compositing \
 		--enable-dependency-tracking \
 		--disable-gtk-doc \
 		$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
 		${myconf}
 }
 
-#src_compile() {
-	# Avoid parallel make failure with -j9, bug #????
-#	emake DerivedSources/WebCore/JSNode.h
-#	default
-#}
-
 src_test() {
 	# Tests expect an out-of-source build in WebKitBuild
 	ln -s . WebKitBuild || die "ln failed"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2013-11-26 21:54 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-26 21:54 UTC (permalink / raw
  To: gentoo-commits

commit:     d3ab335c0ab315c5939f5394b156b1af266fd969
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 21:52:46 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 21:52:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d3ab335c

net-libs/webkit-gtk: fix unfortunate typo

---
 net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
index f968ffa..7e1b36d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
@@ -223,7 +223,7 @@ src_configure() {
 		$(use_enable opengl glx) \
 		$(use_enable spell spellcheck) \
 		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing)
+		$(use_enable webgl accelerated-compositing) \
 		--with-gtk=3.0 \
 		--enable-dependency-tracking \
 		--disable-gtk-doc \


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2013-11-27 23:32 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-27 23:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ba30e5ed34517bc4df11e4b201783dd8fdd462a2
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 23:31:15 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 23:31:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ba30e5ed

net-libs/webkit-gtk: fix metadata.xml

---
 net-libs/webkit-gtk/metadata.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index f18e5d4..be3bf86 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -4,11 +4,13 @@
   <herd>gnome</herd>
   <use>
     <flag name="coverage">Enable code coverage support</flag>
+    <flag name='egl'>Enable EGL support.</flag>
     <flag name="geoloc">Enable geolocation support through
-		<pkg>app-misc/geoclue</pkg></flag>
+        <pkg>app-misc/geoclue</pkg></flag>
+    <flag name='gles2'>Enable GLESv2 support.</flag>
+    <flag name="libsecret">Enable libsecret support to store login
+        credentials</flag>
     <flag name="webgl">Build support for the WebGL HTML API using
-		<pkg>virtual/opengl</pkg></flag>
-    <flag name="webkit2">Enable WebKit2 API that splits web content rendering
-		and application UI into separate processes</flag>
+        <pkg>virtual/opengl</pkg></flag>
   </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2014-02-12 23:48 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2014-02-12 23:48 UTC (permalink / raw
  To: gentoo-commits

commit:     74082fd9416c450f9a209a288c80f276c30c29db
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 23:19:54 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 23:19:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=74082fd9

net-libs/webkit-gtk: moved to gentoo-x86

---
 net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild | 278 ----------------------------
 1 file changed, 278 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
deleted file mode 100644
index 6afe3a6..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-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"
-
-LICENSE="LGPL-2+ BSD"
-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 +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	gles2? ( egl )
-"
-
-# 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/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( app-misc/geoclue )
-	gles2? ( media-libs/mesa[gles2] )
-	gstreamer? (
-		>=media-libs/gstreamer-1.0.3:1.0
-		>=media-libs/gst-plugins-base-1.0.3: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_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 ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	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*" && ! 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
-
-	# 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
-
-	# 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' \
-		-e '/Programs\/unittests\/testwebdatasource/ d' \
-		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
-		-i Source/WebKit/gtk/GNUmakefile.am || die
-
-	if ! use gstreamer; then
-		# webkit2's TestWebKitWebView requires <video> support, bug #????
-		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
-			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
-	fi
-	# garbage collection test fails intermittently if icedtea-web is installed, bug #????
-	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
-	# 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
-	epatch "${FILESDIR}"/${PN}-2.2.2-unittests-build.patch
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-}
-
-src_configure() {
-	# 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
-	append-ldflags "-Wl,--no-keep-memory"
-
-	local myconf=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		myconf="${myconf} RUBY=$(type -P ruby20)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
-		myconf="${myconf} RUBY=$(type -P ruby19)"
-	else
-		myconf="${myconf} RUBY=$(type -P ruby18)"
-	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
-	econf \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gstreamer video) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable libsecret credential_storage) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		--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() {
-	default
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	prune_libtool_files
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}
-
-nvidia_check() {
-	if [[ ${MERGE_TYPE} != "binary" ]] &&
-	   use introspection &&
-	   has_version '=x11-drivers/nvidia-drivers-325*' &&
-	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-		eerror "used as the system OpenGL library."
-		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-		eerror "Mesa as the system OpenGL library:"
-		eerror " # eselect opengl set xorg-x11"
-		eerror "See https://bugs.gentoo.org/463960 for more details."
-		eerror
-		return 1
-	fi
-}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2014-10-19 21:59 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-19 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     410ee456f47dfc255113cd53e99c572caf27b0c4
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 19 21:58:24 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 19 21:58:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=410ee456

net-libs/webkit-gtk: fix subslot

---
 net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
index fca08a6..2d2c5f9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.webkitgtk.org/"
 SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
-SLOT="4/25" # soname version of libwebkit2gtk-3.0
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE="coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
 # bugs 372493, 416331


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2014-11-03 23:24 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-03 23:24 UTC (permalink / raw
  To: gentoo-commits

commit:     a766c42ed53aae715650501c0e39a5757ff83431
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Tue Oct 28 14:32:25 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov  2 17:06:41 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a766c42e

net-libs/webkit-gtk: tune pax-marking

---
 net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
index 2d2c5f9..f509625 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
@@ -231,8 +231,8 @@ src_install() {
 	cmake-utils_src_install
 
 	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
+	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
 }
 
 nvidia_check() {


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2014-11-03 23:24 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-03 23:24 UTC (permalink / raw
  To: gentoo-commits

commit:     fac1a238edb6e28d484a3d55c0f59dc973e0f262
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  2 17:27:15 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov  2 17:27:15 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fac1a238

net-libs/webkit-gtk: 2.6.1 → 2.6.2

Do some ebuild cleanup as suggested by Pacho.

---
 ...it-gtk-2.6.1.ebuild => webkit-gtk-2.6.2.ebuild} | 38 +---------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.2.ebuild
similarity index 80%
rename from net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.6.2.ebuild
index f509625..7ecc397 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.2.ebuild
@@ -103,8 +103,6 @@ S="${WORKDIR}/${MY_P}"
 CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
 
 pkg_pretend() {
-	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
@@ -116,24 +114,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	nvidia_check || die #463960
-
-	# 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."
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
 		check-reqs_pkg_setup
 	fi
 
@@ -234,20 +215,3 @@ src_install() {
 	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
 	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
 }
-
-nvidia_check() {
-	if [[ ${MERGE_TYPE} != "binary" ]] &&
-	   use introspection &&
-	   has_version '=x11-drivers/nvidia-drivers-325*' &&
-	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-		eerror "used as the system OpenGL library."
-		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-		eerror "Mesa as the system OpenGL library:"
-		eerror " # eselect opengl set xorg-x11"
-		eerror "See https://bugs.gentoo.org/463960 for more details."
-		eerror
-		return 1
-	fi
-}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2014-11-30 20:14 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-30 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     4c1a2b8b02cac5df9309bfa516e637a9acaff06c
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 27 22:07:50 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 30 20:14:28 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4c1a2b8b

net-libs/webkit-gtk: 2.6.2 → 2.6.4

---
 .../webkit-gtk/{webkit-gtk-2.6.2.ebuild => webkit-gtk-2.6.4.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild
similarity index 98%
rename from net-libs/webkit-gtk/webkit-gtk-2.6.2.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild
index 7ecc397..6a4d3e7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	>=dev-libs/icu-3.8.1-r1:=
 	>=media-libs/fontconfig-2.8:1.0
 	>=media-libs/freetype-2.4.2:2
-	>=net-libs/libsoup-2.42.0:2.4[introspection?]
+	>=net-libs/libsoup-2.42:2.4[introspection?]
 	>=x11-libs/cairo-1.10.2:=[X]
 	>=x11-libs/gtk+-3.6.0:3[X?,introspection?]
 	dev-db/sqlite:3=
@@ -179,6 +179,7 @@ src_configure() {
 		$(cmake-utils_use_enable geoloc GEOLOCATION)
 		$(cmake-utils_use_enable gstreamer VIDEO)
 		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
+		$(cmake-utils_use_enable introspection)
 		$(cmake-utils_use_enable jit)
 		$(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
 		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
@@ -186,7 +187,6 @@ src_configure() {
 		$(cmake-utils_use_enable webgl WEBGL)
 		$(cmake-utils_use_enable X X11_TARGET)
 		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package introspection GobjectIntrospection)
 		$(cmake-utils_use_find_package opengl OpenGL)
 		-DPORT=GTK
 		-DENABLE_GTKDOC=ON


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2014-12-22 23:50 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-22 23:50 UTC (permalink / raw
  To: gentoo-commits

commit:     e8afc213d52337b6652f8fcbb67c9143d4147f68
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 22 23:47:42 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 22 23:47:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e8afc213

net-libs/webkit-gtk: moved to gentoo-x86

---
 net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild | 217 ----------------------------
 1 file changed, 217 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild
deleted file mode 100644
index 6a4d3e7..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils 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="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	introspection? ( gstreamer )
-	gles2? ( egl )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( wayland X )
-"
-
-# 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/glib-2.36.0:2
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	virtual/jpeg:0=
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=dev-libs/icu-3.8.1-r1:=
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	>=x11-libs/cairo-1.10.2:=[X]
-	>=x11-libs/gtk+-3.6.0:3[X?,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-2.1.5:2.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:= )
-	wayland? ( >=x11-libs/gtk+-3.12:3[wayland] )
-	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-5.10
-	|| (
-		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-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	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" ]] && 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.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.6.0-ia64-malloc.patch
-
-	# Fix building on ppc (from OpenBSD, only needed on slot 3)
-	# https://bugs.webkit.org/show_bug.cgi?id=130837
-	epatch "${FILESDIR}"/${PN}-2.6.0-atomic-ppc.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 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 ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm + libcxxabi
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLANG_TARGET)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_enable X X11_TARGET)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DPORT=GTK
-		-DENABLE_GTKDOC=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=ON
-		${ruby_interpreter}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
-}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2015-05-25  9:18 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-25  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     691af81f3e8a26d389ccee8dd0ec43887f3c0e6b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 09:01:47 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon May 25 09:18:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=691af81f

net-libs/webkit-gtk: 2.8.1 → 2.8.3

 .../webkit-gtk/{webkit-gtk-2.8.1.ebuild => webkit-gtk-2.8.3.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
similarity index 98%
rename from net-libs/webkit-gtk/webkit-gtk-2.8.1.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
index c11510c..3f0be82 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	>=x11-libs/cairo-1.10.2:=
 	>=x11-libs/gtk+-3.14:3[introspection?]
 	x11-libs/libnotify
-	>=x11-libs/pango-1.30.0.0
+	>=x11-libs/pango-1.30.0
 
 	>=x11-libs/gtk+-2.24.10:2
 
@@ -145,7 +145,7 @@ 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
+	# 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"
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
@ 2015-05-25 14:45 Gilles Dartiguelongue
  0 siblings, 0 replies; 43+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-25 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     3e5a4502a8e31ba2f36d530de49800aba46e23c2
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 14:41:43 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon May 25 14:41:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3e5a4502

net-libs/webkit-gtk: disable strict-aliasing optimizations, bug #547224

 net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
index 3f0be82..010ae95 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
@@ -169,6 +169,9 @@ src_configure() {
 		append-cppflags "-D__STDC_LIMIT_MACROS"
 	fi
 
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
 	local ruby_interpreter=""
 
 	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then


^ permalink raw reply related	[flat|nested] 43+ messages in thread

end of thread, other threads:[~2015-05-25 14:45 UTC | newest]

Thread overview: 43+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-22  4:41 [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/ Priit Laes
  -- strict thread matches above, loose matches on Subject: below --
2015-05-25 14:45 Gilles Dartiguelongue
2015-05-25  9:18 Gilles Dartiguelongue
2014-12-22 23:50 Gilles Dartiguelongue
2014-11-30 20:14 Gilles Dartiguelongue
2014-11-03 23:24 Gilles Dartiguelongue
2014-11-03 23:24 Gilles Dartiguelongue
2014-10-19 21:59 Gilles Dartiguelongue
2014-02-12 23:48 Gilles Dartiguelongue
2013-11-27 23:32 Gilles Dartiguelongue
2013-11-26 21:54 Gilles Dartiguelongue
2013-11-26 21:47 Gilles Dartiguelongue
2013-11-17 23:35 Gilles Dartiguelongue
2013-11-17 23:35 Gilles Dartiguelongue
2013-01-15 15:13 Priit Laes
2013-01-01 19:36 Alexandre Rostovtsev
2012-12-27  4:55 Alexandre Rostovtsev
2012-12-26  7:59 Gilles Dartiguelongue
2012-12-25 23:55 Gilles Dartiguelongue
2012-12-25 15:03 Priit Laes
2012-10-28 18:54 Alexandre Rostovtsev
2012-10-28  9:46 Priit Laes
2012-10-28  8:10 Alexandre Rostovtsev
2012-10-28  7:08 Alexandre Rostovtsev
2012-10-17 15:03 Priit Laes
2012-09-05 15:09 Priit Laes
2012-08-24 21:35 Priit Laes
2012-07-26 14:40 Nirbheek Chauhan
2012-04-05 21:43 Alexandre Restovtsev
2012-03-25  0:10 Alexandre Restovtsev
2012-03-24 23:40 Alexandre Restovtsev
2012-03-17 19:33 Alexandre Restovtsev
2012-03-10 11:08 Priit Laes
2012-03-05  7:17 Alexandre Restovtsev
2012-02-27  3:30 Alexandre Restovtsev
2012-02-08  7:52 Priit Laes
2012-01-26 22:47 Priit Laes
2011-10-30  2:57 Alexandre Restovtsev
2011-10-29 11:03 Priit Laes
2011-05-22 20:47 Priit Laes
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-10 18:04 Gilles Dartiguelongue
2011-02-23 20:28 Priit Laes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox