commit: 99df390c1aca00ed26be791bae90a5e10b727068
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 24 14:10:55 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jun 24 14:13:37 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=99df390c
[dev-qt/qtwebkit] Remove patch wrt bug #514924.
The code the patch removes has been removed upstream.
Package-Manager: portage-2.2.10
---
.../qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch | 17 -----------------
dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild | 1 -
dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 1 -
3 files changed, 19 deletions(-)
diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
b/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
deleted file mode 100644
index d29d5da..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
index fcddbfe..d3719f0 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
@@ -35,7 +35,6 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
)
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
index fcddbfe..d3719f0 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
@@ -35,7 +35,6 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
)
