[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/files/, x11-libs/qt-webkit/

["Michael Palimaka" <kensington@astralcloak.net>]

commit:     ddecfdc9da626d0fa0d8eb6afada13e75635d36e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 19:54:28 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Tue May 22 19:54:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ddecfdc9

[x11-libs/qt-webkit] Import patch from the main tree to fix building with GCC 4.7

(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)

---
 .../files/qt-webkit-4.8.1-no-use-ld-gold.patch     |   17 +++++++++++++++++
 x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild       |    1 +
 2 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.8.1-no-use-ld-gold.patch b/x11-libs/qt-webkit/files/qt-webkit-4.8.1-no-use-ld-gold.patch
new file mode 100644
index 0000000..d29d5da
--- /dev/null
+++ b/x11-libs/qt-webkit/files/qt-webkit-4.8.1-no-use-ld-gold.patch
@@ -0,0 +1,17 @@
+diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri
+--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri	2012-04-28 12:39:16.884473572 +0200
++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri	2012-04-28 12:41:14.245006363 +0200
+@@ -3,13 +3,6 @@
+ contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
+ contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
+ 
+-linux-g++ {
+-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
+-    message(Using gold linker)
+-    QMAKE_LFLAGS+=-fuse-ld=gold
+-}
+-}
+-
+ # We use this flag on production branches
+ # See https://bugs.webkit.org/show_bug.cgi?id=60824
+ CONFIG += production

diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index 70be3aa..15d2954 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch"
 	"${FILESDIR}/${PN}-4.8.1+glib-2.31.patch"
+	"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
 )
 
 pkg_setup() {