commit: c1de4752dd98902b0116e040b487db93168070dc Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Wed Jul 15 01:13:45 2015 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Wed Jul 15 01:13:45 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c1de4752
[dev-qt/qtwebkit] Extend rpath fix wrt bug #466216 comment #14. And use sed instead of a patch, should be easier to maintain. Package-Manager: portage-2.2.20 dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch | 11 ----------- dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild | 7 ++++++- dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild | 7 ++++++- dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 7 ++++++- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch deleted file mode 100644 index 583ca6c..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Tools/qmake/mkspecs/features/unix/default_post.prf.bak 2015-06-23 14:45:57.255212841 +0200 -+++ Tools/qmake/mkspecs/features/unix/default_post.prf 2015-06-23 14:46:31.703211791 +0200 -@@ -61,8 +61,6 @@ - } - } - --contains(TEMPLATE, app): CONFIG += rpath -- - CONFIG(debug, debug|release)|force_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.5.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild index 8f4987c..954a3aa 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild @@ -64,13 +64,18 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" - "${FILESDIR}/${PN}-5.5.0-rpath.patch" ) src_prepare() { # ensure bundled library cannot be used rm -r Source/ThirdParty/leveldb || die + # bug 466216 + sed -i -e '/CONFIG +=/s/rpath//' \ + Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ + Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ + || die + if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" elif ! use gstreamer; then diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild index 8f4987c..954a3aa 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild @@ -64,13 +64,18 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" - "${FILESDIR}/${PN}-5.5.0-rpath.patch" ) src_prepare() { # ensure bundled library cannot be used rm -r Source/ThirdParty/leveldb || die + # bug 466216 + sed -i -e '/CONFIG +=/s/rpath//' \ + Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ + Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ + || die + if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" elif ! use gstreamer; then diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild index 8f4987c..954a3aa 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild @@ -64,13 +64,18 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" - "${FILESDIR}/${PN}-5.5.0-rpath.patch" ) src_prepare() { # ensure bundled library cannot be used rm -r Source/ThirdParty/leveldb || die + # bug 466216 + sed -i -e '/CONFIG +=/s/rpath//' \ + Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ + Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ + || die + if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" elif ! use gstreamer; then