Parallel make option and fix a nasty compile bug

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 30 insertions, 10 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 857217a5223c..746c44377c32 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.41 2009/07/21 21:02:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.42 2009/07/21 21:40:39 jokey Exp $
+
+  21 Jul 2009; Markus Ullmann <jokey@gentoo.org> webkit-gtk-0_p46126.ebuild,
+  +files/webkit-gtk-0_p46126-wx-parallel-make.patch:
+  Parallel make option and fix a nasty compile bug
 
   21 Jul 2009; Markus Ullmann <jokey@gentoo.org> webkit-gtk-0_p46126.ebuild:
   Fix Quoting
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 0a4bc07e54b1..4b821b2eaae4 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,6 @@
 AUX webkit-gtk-0_p40220-gcc44-aliasing.patch 31876 RMD160 19f850df93fd81d1a736dbcc5441d0193929ef35 SHA1 293465980ececa6f2dbdd55787edf2676f628edf SHA256 6aee86b94b443a088502a35d25ffc7f17fa36f6e89dd082dcca11042a7af110f
 AUX webkit-gtk-0_p46126-cxxmissing.patch 245 RMD160 82965bb2cbadfc4bafd80a2df04f65d8a324d0f0 SHA1 15459648122c7dfc218c1577d6ef195556660ab4 SHA256 199fe035ced332cfe9abd2a8a14f69be8ea49d5796d34082dc5612691fcfe9d1
+AUX webkit-gtk-0_p46126-wx-parallel-make.patch 636 RMD160 c050983cc3993cf50fbf71e5f6421d5c773b8b18 SHA1 2b26d200d3f1ccde7e49a81a49595c03238b33e0 SHA256 7df659acbe7d2316bf7e6bfd40c2002691e4734f5333d10602327311ed7f2a8c
 AUX webkit-gtk-0_p46126-wxslot-gentoo.patch 473 RMD160 5d3f75c4129dbfcdfedfcdd1f38acc255289300b SHA1 0be9ad004c94f16b2ca0b6488685fca58ffef694 SHA256 c76d788a22632bf7f6a589351ddd3b12129b0eead020719ac5b0076ea7da2785
 AUX webkit-gtk-CVE-2009-0945.patch 671 RMD160 a51f2326f44e05146eaeea5b3f0fcc973efdaeca SHA1 2a281b7ee69158daf7d088add2f21f99903506dd SHA256 65ccad453b147067725dac0f9ba8f07cd0d04970ab0f8d85f086ef07a6d0b3c3
 DIST WebKit-r40220.tar.bz2 10307835 RMD160 5700977d5a9a23680e58b1e3952ecb2fe1430e9a SHA1 2aa2bd3a9c60f53a1a1ef0bf810ea2c59b0a80e2 SHA256 223154d0e247336cd3cf808b030cfb00739103b7a258050e71703903df922020
@@ -8,9 +9,9 @@ DIST webkit-1.1.10.tar.gz 6343872 RMD160 c3d5a7b9793318d0fc9f4d170b7aeac7a6f3073
 DIST webkit-1.1.7.tar.gz 6205024 RMD160 63dea479e23b62ae6d0abb0e5559c35eed34466d SHA1 77d27ab8f0d74ddda349ea9e4416d27d9adb8b61 SHA256 1aaae2bc36ba7ffb27690647e1631f336c0aee56bad2fd91ee6ea906ff17945f
 DIST webkit-1.1.8.tar.gz 6232745 RMD160 6c0cda8cbcf88c7d7104e0bcc6b910eada9213c0 SHA1 3b858495e293c0998a2652993a93ccbedff71839 SHA256 984929e42c6904893f5cd73f6506f858a3859d2ee1a56d69b4f7e9f62a0d2ffa
 EBUILD webkit-gtk-0_p40220-r1.ebuild 1862 RMD160 15dd702925a88f251b83b8fa22f284536a3920f9 SHA1 2b5eaada034d6f8a40e9650eebdbd2f26bee3c52 SHA256 be2a20030398ee4aec6bd614fb8fe66168fcaee1f98875c7af57fb6c11f84fb6
-EBUILD webkit-gtk-0_p46126.ebuild 2087 RMD160 82f363fb0d5249996585fd84cc72b44135433d48 SHA1 2a449f2d456cb9a57187c7a6eecd86ca30dac3a3 SHA256 c452e54fe4d769a980694106e1bfa18623183aab9df443a550098bf24b33d248
+EBUILD webkit-gtk-0_p46126.ebuild 2198 RMD160 44e3ca5f2d0edfc26bd81e7d4b24624e8fd44a71 SHA1 b65db072f39f3f7d1cf3c7d0b83c117a7b5506a2 SHA256 1c6a658ba57e55f5867fa3c29c2585b7c8fd22682ca8704ac1393c395b8ffe6c
 EBUILD webkit-gtk-1.1.10.ebuild 2290 RMD160 6b06fdca47877a0e0712e9837d99b2454b209519 SHA1 3400115cf5506713ba42b3969d15d7c5d66d7cfd SHA256 59cf1b543c610b7ca501007f1157ca58bab841e16f1f60e4f92a5837056eaa3c
 EBUILD webkit-gtk-1.1.7.ebuild 1966 RMD160 9ffaf403e0987743564692874d45c032951dcb00 SHA1 30b067da607985115868015f283ee03fc04c6711 SHA256 0865ae435fdff7c25befd23a9b8167f364a9e1d43000a7dcd59eaf999034f582
 EBUILD webkit-gtk-1.1.8.ebuild 2288 RMD160 f7653f76d0d4b2d6214b3d205d031da481c73ab4 SHA1 3dc6fb65ccbe7d077bc92915716ab776501c2515 SHA256 ea8066a8d5be3cab3b51c29fd15bc9df5c5cd088469e45854270d5e812c0b762
-MISC ChangeLog 9532 RMD160 5249af41fa2fead9ebcbb62335c03fec4512b89b SHA1 f91f069e4ba922fb210c1f661c5e76c9827fd980 SHA256 41c67aa7706a2da7d88927a81fab7c6101bb988a27579b39ee76c2571cd5e127
+MISC ChangeLog 9714 RMD160 925680121888113ef4cf4e4981bc6b1946e91e32 SHA1 53e393c4ed4718828de2e86fb1da8fe35ecebec9 SHA256 263d27d09f65d15d6262ef91e85fd270e64a86b515af7e4116b7c742e321b187
 MISC metadata.xml 531 RMD160 285606a7b4b22a9fd2f4374009b6bc920daa36f2 SHA1 abc9aa9a98cdd9eed2323509a8a9c92e9dc731e9 SHA256 c378730cdc83d29b2c94aee6dedece01b4f97a8fac3da2135510c32eea05a246
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-wx-parallel-make.patch b/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-wx-parallel-make.patch
new file mode 100644
index 000000000000..6a1f3cd28086
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-wx-parallel-make.patch
@@ -0,0 +1,12 @@
+diff -urN ./WebKitTools.orig/wx/build-wxwebkit ./WebKitTools/wx/build-wxwebkit
+--- ./WebKitTools.orig/wx/build-wxwebkit	2009-06-30 21:27:58.000000000 +0200
++++ ./WebKitTools/wx/build-wxwebkit	2009-07-21 23:16:29.542350407 +0200
+@@ -179,7 +179,7 @@
+         cd $olddir
+     else
+         if [ -f $dir/GNUmakefile ]; then
+-            make -C $dir -f GNUmakefile $MAKE_ARGS CXXFLAGS="$cxxflags -fvisibility=hidden -fvisibility-inlines-hidden" $@
++            make -C $dir -f GNUmakefile $MAKEOPTS $MAKE_ARGS CXXFLAGS="${CXXFLAGS} $cxxflags -fvisibility=hidden -fvisibility-inlines-hidden" $@
+         fi
+     fi
+     if [ $? != 0 ]; then
diff --git a/net-libs/webkit-gtk/webkit-gtk-0_p46126.ebuild b/net-libs/webkit-gtk/webkit-gtk-0_p46126.ebuild
index 644472c58cd7..e0b8f5e57c18 100644
--- a/net-libs/webkit-gtk/webkit-gtk-0_p46126.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-0_p46126.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-0_p46126.ebuild,v 1.2 2009/07/21 21:02:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-0_p46126.ebuild,v 1.3 2009/07/21 21:40:39 jokey Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ SRC_URI="http://nightly.webkit.org/files/trunk/src/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 -ia64 ~ppc -sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 -ia64 ppc -sparc x86 ~x86-fbsd"
 IUSE="coverage debug gstreamer pango soup sqlite svg wxwidgets xslt"
 
 RDEPEND=">=x11-libs/gtk+-2.8
@@ -31,7 +31,7 @@ RDEPEND=">=x11-libs/gtk+-2.8
 	soup? ( >=net-libs/libsoup-2.27.4 )
 	xslt? ( dev-libs/libxslt )
 	pango? ( x11-libs/pango )
-	wxwidgets? ( x11-libs/wxGTK dev-util/bakefile )"
+	wxwidgets? ( x11-libs/wxGTK )"
 
 DEPEND="${RDEPEND}
 	dev-util/gperf
@@ -43,6 +43,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	epatch "${FILESDIR}/${P}-cxxmissing.patch"
 	epatch "${FILESDIR}/${P}-wxslot-gentoo.patch"
+	epatch "${FILESDIR}/${P}-wx-parallel-make.patch"
 	gtkdocize
 	eautoreconf
 }
@@ -52,8 +53,8 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	local myconf
-		use pango && myconf="${myconf} --with-font-backend=pango"
-		use soup && myconf="${myconf} --with-http-backend=soup"
+	use pango && myconf="${myconf} --with-font-backend=pango"
+	use soup && myconf="${myconf} --with-http-backend=soup"
 
 	econf \
 		$(use_enable sqlite database) \
@@ -71,9 +72,11 @@ src_configure() {
 
 src_compile() {
 	emake || die "emake failed"
-
+	read
 	if use wxwidgets ; then
-		cd "${S}"/WebKitTools/wx
+		# Upstream without further comment
+		cp DerivedSources/JSDataGridC* bindings/js
+		cd ${S}/WebKitTools/wx
 		./build-wxwebkit || die "wxwebkit build failed"
 	fi
 }