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).

3 files changed, 33 insertions, 14 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4d8af082..9d4197ab 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,6 +5,6 @@ AUX webkit-gtk-1.6.3-paxctl-introspection.patch 929 RMD160 fe2eb5fb4d6830c377a72
 AUX webkit-gtk-1.7.5-linguas.patch 1447 RMD160 9e710c9e90836ff608915fef6942b7bd7f3ea04f SHA1 d7229ad0bef8d2b82f4332c684676266adfad54c SHA256 42cf057556cb1493a40b12db87fa91820c0e493e542e211e9aed10c86bcb3d74
 AUX webkit-gtk-1.7.90-parallel-make-hack.patch 592 RMD160 4387ab914cabd55e2e6592926f00b7594f8915a8 SHA1 b6d89e54a6c1af0c365b370bf3bf4ec895d510e1 SHA256 e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73
 AUX webkit-gtk-1.7.90-test_garbage_collection.patch 597 RMD160 793b6f75beb80c51b296e50f2f8b4341e63088c2 SHA1 d87927e9ce345197de41597ac16f7b69451231e0 SHA256 f2ca641430a0ff09001391d649aaf135c151177ce879a29136c78a68f2dfc4d0
-DIST webkit-1.7.91.tar.xz 7911292 RMD160 e63505c87798c5c36ff1d8ee050ed31ea4f4ba8c SHA1 92a703ca1ae4ece9f5c503e966b6fb5064cd4168 SHA256 9d9de6968c466b973988ce97e4f2f53535dd4f72356bd7b29b03ba9dab937545
-EBUILD webkit-gtk-1.7.91-r200.ebuild 5914 RMD160 fd94d63ecaba9f7d6d2b3d4776b718e227ed7985 SHA1 26fbae70b2bb77a738c5c8a81d0cb581c35ab13b SHA256 92898ffad7965422f864fc28f5642b03199d9051fba200f9ae594e954b094757
-EBUILD webkit-gtk-1.7.91-r300.ebuild 5732 RMD160 78296b8486d186dbcd2de99b06e027448c09c501 SHA1 f99b27783c8bce94dde0ba9a0a515147f09e2990 SHA256 a3ed529ccd64d6e22922bde32fd0475ae1988b6c3e4b88b2b0a82b47308aacc1
+DIST webkit-1.7.92.tar.xz 7978680 RMD160 50c93ad77fa0b4a5bb7be5de3f15e405140577b4 SHA1 746444e7df579c168708a5c5b1fe886d809bcd53 SHA256 b5f7b9eef333609d457a0e6b335ff8d9e31c92459019b8aa80e1e24767601bb0
+EBUILD webkit-gtk-1.7.92-r200.ebuild 6282 RMD160 dea52022d24f23cd2c5585d662c8230e27d21c91 SHA1 e6584db722b38121e2f4fb7747c78cbb0c8bf865 SHA256 5c2a4ae466afae86a042814ae48fb18d395f48a0fb73af6f263cc1635ca69f06
+EBUILD webkit-gtk-1.7.92-r300.ebuild 6196 RMD160 d330d786e40944fea420756bbd329814da06e5d0 SHA1 5bd2ccf09c146126c2f1e17f9167a3b10e22fd5e SHA256 ed81f6a761f96eaf60513cd3744a1ecbca4aeb7511bbaaf3b95ebd6e01f80860
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
index b245273d..2630771a 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
index 8af62fe3..cc3d132d 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"
 }