diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2012-09-14 12:11:45 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2012-09-14 12:11:45 +0000 |
| commit | a0241d6d99044931b6b18a866643e993974f9290 (patch) | |
| tree | c80211ce2957811aa948691e1a5bb1de409ef0d4 /x11-libs/qt-webkit | |
| parent | sci-biology/seaview: Add missing deps, #432366 (diff) | |
| download | gentoo-2-a0241d6d99044931b6b18a866643e993974f9290.tar.gz gentoo-2-a0241d6d99044931b6b18a866643e993974f9290.tar.bz2 gentoo-2-a0241d6d99044931b6b18a866643e993974f9290.zip | |
Fix patches
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt-webkit')
| -rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/files/qt-webkit-4.8.3+glib-2.31.patch | 11 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild | 6 |
3 files changed, 19 insertions, 4 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index e508ba7c0e97..de12e3482ce0 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.167 2012/09/14 08:31:58 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.168 2012/09/14 12:11:45 yngwin Exp $ + + 14 Sep 2012; Ben de Groot <yngwin@gentoo.org> + +files/qt-webkit-4.8.3+glib-2.31.patch, qt-webkit-4.8.3.ebuild: + Fix patches *qt-webkit-4.8.3 (14 Sep 2012) diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.8.3+glib-2.31.patch b/x11-libs/qt-webkit/files/qt-webkit-4.8.3+glib-2.31.patch new file mode 100644 index 000000000000..fccf2dc5f7d5 --- /dev/null +++ b/x11-libs/qt-webkit/files/qt-webkit-4.8.3+glib-2.31.patch @@ -0,0 +1,11 @@ +diff -Naur qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h +--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h 2012-04-01 19:32:46.621395314 +0200 ++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h 2012-04-01 19:34:23.693181749 +0200 +@@ -24,6 +24,7 @@ + + #if ENABLE(GLIB_SUPPORT) + ++#include <glib.h> + #include <algorithm> + #include <wtf/Assertions.h> + #include <wtf/Noncopyable.h> diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild index d888cdc7b127..47ea615ab331 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild,v 1.1 2012/09/14 08:31:58 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild,v 1.2 2012/09/14 12:11:45 yngwin Exp $ EAPI=4 @@ -35,9 +35,9 @@ 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.3+glib-2.31.patch" "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch" - "${FILESDIR}/${PV}-javascriptcore-x32.patch" + "${FILESDIR}/4.8.2-javascriptcore-x32.patch" ) pkg_setup() { |