[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     e0a0c3db69c8072b7d1c8fc43f763748f1ebe7b7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 10 14:48:39 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul 10 14:48:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e0a0c3db

[dev-qt/qtwebkit:5] Apply the 5.5.0 rpath patch to 5.9999 as well.

Package-Manager: portage-2.2.20

 dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch | 13 -------------
 dev-qt/qtwebkit/qtwebkit-5.9999.ebuild           |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch
deleted file mode 100644
index ffe44d2..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Avoid insecure RPATH wrt bug #466216.
-
---- Tools/qmake/mkspecs/features/unix/default_post.prf
-+++ Tools/qmake/mkspecs/features/unix/default_post.prf
-@@ -60,8 +60,6 @@
-     }
- }
- 
--contains(TEMPLATE, app): CONFIG += rpath
--
- CONFIG(debug, debug|release)|force_debug_info|separate_debug_info {
-     # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
-     !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 8f55550..8f4987c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -64,7 +64,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4.1-leveldb.patch"
-	"${FILESDIR}/${PN}-5.4.1-rpath.patch"
+	"${FILESDIR}/${PN}-5.5.0-rpath.patch"
 )
 
 src_prepare() {