Gentoo Archives: gentoo-commits

From: Alexandre Restovtsev <tetromino@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/
Date: Mon, 05 Mar 2012 07:17:25
Message-Id: 1330931224.8759b58382def36d988deadc673b922e316db8b6.tetromino@gentoo
1 commit: 8759b58382def36d988deadc673b922e316db8b6
2 Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 5 07:07:04 2012 +0000
4 Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
5 CommitDate: Mon Mar 5 07:07:04 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8759b583
7
8 net-libs/webkit-gtk: also pax-mark jsc-1 and jsc-3 to prevent crashes on PaX systems
9
10 ---
11 net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild | 5 ++++-
12 net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild | 5 ++++-
13 2 files changed, 8 insertions(+), 2 deletions(-)
14
15 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
16 index f29db1e..4cd179b 100644
17 --- a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild
18 +++ b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild
19 @@ -5,7 +5,7 @@
20 EAPI="4"
21
22 # Don't define PYTHON_DEPEND: python only needed at build time
23 -inherit autotools eutils flag-o-matic eutils python virtualx gnome2-utils
24 +inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
25
26 MY_P="webkit-${PV}"
27 DESCRIPTION="Open source web browser engine"
28 @@ -188,6 +188,9 @@ src_install() {
29 # Remove .la files
30 find "${D}" -name '*.la' -exec rm -f '{}' +
31
32 + # Prevents crashes on PaX systems
33 + pax-mark m "${ED}usr/bin/jsc-1"
34 +
35 # File collisions with slot 3
36 # bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
37 rm -rf "${ED}usr/share/gtk-doc" || die
38
39 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
40 index 2d56cb9..c129a6f 100644
41 --- a/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild
42 +++ b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild
43 @@ -5,7 +5,7 @@
44 EAPI="4"
45
46 # Don't define PYTHON_DEPEND: python only needed at build time
47 -inherit autotools eutils flag-o-matic eutils python virtualx gnome2-utils
48 +inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
49
50 MY_P="webkit-${PV}"
51 DESCRIPTION="Open source web browser engine"
52 @@ -186,4 +186,7 @@ src_install() {
53
54 # Remove .la files
55 find "${D}" -name '*.la' -exec rm -f '{}' +
56 +
57 + # Prevents crashes on PaX systems
58 + pax-mark m "${ED}usr/bin/jsc-3"
59 }