Fix build with >=dev-libs/glib-2.31 (bug 401855).

Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64

4 files changed, 53 insertions, 17 deletions

diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index aa45868b1c12..90d960c62e39 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.139 2012/03/29 22:17:41 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.140 2012/04/04 13:29:25 pesa Exp $
+
+  04 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/qt-webkit-4.8.1+glib-2.31.patch, qt-webkit-4.8.1.ebuild:
+  Fix build with >=dev-libs/glib-2.31 (bug 401855).
 
 *qt-webkit-4.8.1 (29 Mar 2012)
 
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index 8859d78307a9..8ff5725c25a7 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -4,6 +4,7 @@ Hash: SHA512
 AUX qt-webkit-4.6.0-solaris-strnstr.patch 820 RMD160 7303234fc296e5af2aa3a5e10b501776de3383b8 SHA1 e43d209055e7de4fc295a0334ac51054cd19983f SHA256 7ecb2f6317c0da2b0e986678f76f0908b0001e9fab694d5e16df922af75ec82c
 AUX qt-webkit-4.6.3-flash-plugin-segfault.patch 1789 RMD160 891fc8c55a3cbb06c28e81fa5e4b7e6a018097c4 SHA1 d17dbf440bd28553eba5b62409cc3ce27f6137e4 SHA256 c4d0f454407690be0f49ecb7fa36ea6dbb0cc71aa1dd7cc935383b7bd0c9a447
 AUX qt-webkit-4.8.0-c++0x-fix.patch 4886 RMD160 1983e6c19ebc4ea14114e33ce97b4af9f707b1ac SHA1 d09b4cd4ee7924080afc2eb7e7b99335fc265ded SHA256 986d83696feb008b8bc7f410c8598b700cec330b035e793d23e73db2e31620af
+AUX qt-webkit-4.8.1+glib-2.31.patch 1757 RMD160 a46ff98ec99fab5d805cfdc69b12e3634bbf8c11 SHA1 11ed9048befcde3e2d0abec9c8d5cdec38146aaa SHA256 769db484b945236cca8e184e12c7ed5d58940d497f2ec16594edd4138aa9a4b9
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 RMD160 3e47b09663a89973b1c8628506c995dfc2a5387c SHA1 af9016aa924a577f7b06ffd28c9773b56d74c939 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e
@@ -15,23 +16,23 @@ EBUILD qt-webkit-4.6.3.ebuild 1402 RMD160 bdc781c1073a100fe46532f4de77c93eb43578
 EBUILD qt-webkit-4.7.2.ebuild 1432 RMD160 1527244b7e58d0a2ad890c0a7e21602797d74251 SHA1 2a2d2e50e0b3edc419c93e3138a0121e4ed5bff4 SHA256 bb2bc83c40c2fddff5ba68c3a73169decc66052b1860fd4f30d415fb765135af
 EBUILD qt-webkit-4.7.4.ebuild 1434 RMD160 cbde9a9941e4e8e9ec0ac07b787ee39944063b7f SHA1 eb960db0749193aa99643db2920827dd4281c67d SHA256 7e4d9ad6bd55c204cebeecb4a961cca108d6b09afd23d3874fcbd2c540ef41c3
 EBUILD qt-webkit-4.8.0-r1.ebuild 1932 RMD160 4f769bcc83878d10b9443499a885dc235601c5bb SHA1 c0b9430ed81382bf13cbf4b5eb364c1f6a892852 SHA256 d86787745f1d0f76825e6152bda8bcac43a5f0e96bbe9ff8a72ff919722ccef0
-EBUILD qt-webkit-4.8.1.ebuild 1976 RMD160 36411030d41d6eccbdc912a74023051a5c6bbeb3 SHA1 da2ddbdcf4480b67ac662e6d6481fe57f151fbb9 SHA256 0770c2f1229e773abae15b8eae37e609211dcda9011bc66daddfbea08e37276b
-MISC ChangeLog 20731 RMD160 a76f25585feb830efe6df9192e61894de800ba7c SHA1 6e3a38548778a8b0d71fc7d10b4de3afa941f3a6 SHA256 722f8ba78f15944126e3efb409a1b194a0870d4d5cb24fea99e037a49be39ddf
+EBUILD qt-webkit-4.8.1.ebuild 2012 RMD160 41c8709ab39bac767b648f29853df28e016daf09 SHA1 22b725949a1a31c6140f268c382acfcacc361372 SHA256 1c851436844dfc48e15fe6d555ce6956c459db83f1f800050fb23644b040c9f6
+MISC ChangeLog 20900 RMD160 d47c583348b71c36017bf0b25f1330424745685b SHA1 087d5f17b09fba44073a2ba6b101642edaa2741e SHA256 84d01ad15e6fcb43b68e37a080607ec5b7a4a3a594595e175aa37fb74c812e79
 MISC metadata.xml 739 RMD160 dc601459869cc7369c2a5abfe7c5ec1f078d277a SHA1 0303b5284bc0d788074b1ba33cbfab768651dea4 SHA256 86ce6ed256d328d3471b43fdb45a97102ff3acbcd69b29a8b95fd1547c925722
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPdN+OAAoJENXLsxwXqFxy/lgP/jiHwnRJio6eo9mYeUaUeyVd
-JnrHU0H6f7eiKdEX8Duj1iHmXpGG3ZMTilZ0vJ/IoJBtlaXKg3oTgdGkcjIli0za
-4BTM9SLdTwSMs5/KpMbo7vPd+NEbCqd7e+2pGWl1JlwdqQDAASc8iFzUXHraysTv
-471gm/wPcGGVi1Y6/WHnp+gzKF872ZJDHaJQE+6LVmhB2/EZ0AROaSbOeGmravaM
-CaYnXeWOaSmjx2oYAKR/zl+I0ev8sWXI6d0RuG94/d0DscdWlVmq9nFsU0NZD2U8
-rtEGlEzIbn2Ziwy9vGevUIvlHtv7AR26P5xOo8PtEnJcSNYeonjP8wMlpTzvdvXB
-0iDukoZI3Ng+QeJ2GdgpMGO8i3Z+MZGRn0kWpzjAvu+JBf7+LAfRZfW9dyE+3J8J
-luzCFZUIyYhYWHJBnYT6jGsG/oaBzKCpKwI09LRlwNMVajPEntbm1H0k1vdED12j
-oSAuVkQIRInnKO4ECK22IaMGDPVBs/CfiIOrSGpFaY6sNzzankJIHL2GCn5bdyJL
-7dOAyldj6agIJ4OR0/oIK81Ttu3z4s5wOgtvka7GTeJZh9H5MDPVC3xuh6m957iq
-dAwGDWn54RYizCTbI8uqARxERR2bbwu7ny/2116GuQ5ZAyBwrVDnbmROXfdRuYfM
-eCYKjYFNjV/HV8+sJQ1p
-=+R6k
+iQIcBAEBCgAGBQJPfEzGAAoJENXLsxwXqFxyjMcP/jZHBaoxAXRTo2g546+u0OG/
+6BRMQWx6Tf6pSKb/G+bh7P+XkjmScqstPO+CYjoWCrJEaboAlpE09ibmplTyiHdO
+qGTg332wQUonUkGVn4ihRv59HRjGShsdWdh+XmsSPGMBQpzQidxe5GAei36uNq29
+WyEiPZOy2eEHDnVTv0DE1LNuhBWkHZInH9p69fnxf5f7KNuQGTvpDO2gZqEVnTW7
+5Qz76u2EC3yieEGyburRG+uCiLD9AwKxVyvmbPwMmLvDJmjQGjb0tu22BabMQDpW
+Zz7NhmmRtZ14mhuSLg+ogx+N25KOo0WAvHT2lkLUFHblzre6cdG1gnb/S5lUxv18
+M/nO7L0VMEHQ5f/7OS7HWAjmQ9gpcRd981g/OAyZFNhULqcC+ZRD9dHbHadxUi1o
+X4B6/DMeg3mUP4t8h7aAEv313j4uUNLy5MYiHq8QoSIn8P01Q6HTMF35SJ/g78vK
+NXankjeMRRmc4S17kVTuL2pvoM8z/zPfEHTlr9dthUsxHBm/d62qF3jipmtV3pQb
+3XPKwjQu8TX8scdIgaba9Mmgi8HYuHYd4MWU2NmIBNDTDdITi3bUrwPlDLNveoRi
+Pq9soXqMOTnBfWyDVveD+Y8HoakP5LUU42eklE0NR4HrxKf6LynUaFyXWo1z0q9s
+z6PwIGelPpkREvkZfR/c
+=0ucV
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..ced3794caed5
--- /dev/null
+++ b/x11-libs/qt-webkit/files/qt-webkit-4.8.1+glib-2.31.patch
@@ -0,0 +1,30 @@
+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.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild
index 8599ff7ffc78..b85345474a15 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.1.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.1.ebuild,v 1.1 2012/03/29 22:17:41 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild,v 1.2 2012/04/04 13:29:25 pesa Exp $
 
 EAPI=4
 
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch"
+	"${FILESDIR}/${P}+glib-2.31.patch"
 )
 
 pkg_setup() {