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

[Davide Pesavento]

commit:     a0a53ec318c331402c4561e680bc19d9c4c147cb
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jul  8 14:56:20 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 14:56:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a0a53ec3

[x11-libs/qt-webkit:4] Stop applying obsolete patch (bug 425164).

The build failure with glib >= 2.31 has been fixed upstream.
Thanks to Andreas Sturmlechner for reporting.

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

---
 .../files/qt-webkit-4.8.1+glib-2.31.patch          |   30 --------------------
 x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild       |    1 -
 2 files changed, 0 insertions(+), 31 deletions(-)

diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.8.1+glib-2.31.patch b/x11-libs/qt-webkit/files/qt-webkit-4.8.1+glib-2.31.patch
deleted file mode 100644
index ced3794..0000000
--- a/x11-libs/qt-webkit/files/qt-webkit-4.8.1+glib-2.31.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 -Naur qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h	2012-04-01 19:32:46.624395278 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h	2012-04-01 19:34:09.420360184 +0200
-@@ -39,7 +39,6 @@
- typedef struct _GAsyncResult GAsyncResult;
- typedef struct _GCancellable GCancellable;
- typedef struct _GCharsetConverter GCharsetConverter;
--typedef struct _GCond GCond;
- typedef struct _GDir GDir;
- typedef struct _GdkAtom* GdkAtom;
- typedef struct _GdkCursor GdkCursor;
-@@ -52,7 +51,6 @@
- typedef struct _GHashTable GHashTable;
- typedef struct _GInputStream GInputStream;
- typedef struct _GList GList;
--typedef struct _GMutex GMutex;
- typedef struct _GPatternSpec GPatternSpec;
- typedef struct _GPollableOutputStream GPollableOutputStream;
- typedef struct _GSocketClient GSocketClient;

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 d5f8b59..0f071b3 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -34,7 +34,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.8.1+glib-2.31.patch"
 	"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
 )