fixed compilation with qt 4.7, bug #335011

Package-Manager: portage-2.2_rc71/cvs/Linux x86_64

4 files changed, 57 insertions, 9 deletions

diff --git a/www-client/arora/ChangeLog b/www-client/arora/ChangeLog
index fbd1bfed103f..8b9abbc5411c 100644
--- a/www-client/arora/ChangeLog
+++ b/www-client/arora/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/arora
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/arora/ChangeLog,v 1.38 2010/05/11 16:35:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/ChangeLog,v 1.39 2010/08/28 13:43:24 wired Exp $
+
+  28 Aug 2010; Alex Alexander <wired@gentoo.org> arora-0.10.2-r1.ebuild,
+  +files/arora-0.10.2_qt_4.7_build_fix.patch:
+  fixed compilation with qt 4.7, bug #335011
 
   11 May 2010; Joseph Jezak <josejx@gentoo.org> arora-0.10.2-r1.ebuild:
   Marked ~ppc for bug #285889.
diff --git a/www-client/arora/Manifest b/www-client/arora/Manifest
index daa74b4ed00f..facbef99c131 100644
--- a/www-client/arora/Manifest
+++ b/www-client/arora/Manifest
@@ -1,16 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX arora-0.10.2_qt_4.7_build_fix.patch 867 RMD160 dcbbe312a43190ec672e2be9de2b828309b9712a SHA1 5dde2008782f315e37d9365b67031fa731919f44 SHA256 5530ab7248d2a8724d9b5f8a166e7cd2874309b78f75ac1636c0cc36aedaf806
 DIST arora-0.10.2.tar.gz 1064208 RMD160 ef61ca56087288fdafed4f7bfbe1e7178f92deb2 SHA1 843d6d3e073588b5f6164985170a3525450f6615 SHA256 7b5bdbb01dccc27776c65f7aa7e4557c5ac23b07494d935523ffce7d7cece9da
 DIST arora-0.7.1.tar.gz 896528 RMD160 31e48afa832101f0873a074cc75c8c36e89d5d66 SHA1 5dc87f5a4995c83de787969c99935b44a37818a4 SHA256 9bb09ea94672953debc87d63de5783a84d7db81ae6de8e08d7de8af9f2decaa7
-EBUILD arora-0.10.2-r1.ebuild 1948 RMD160 08aa9e2d2479afa70e41095c6f4af63dbd5e7c7d SHA1 0c5d1953827f9834ed870068d742795a3a135498 SHA256 769867c765cfef0b996e410e888ceebc0188a79ddeea7c4173a5dc61b8375832
+EBUILD arora-0.10.2-r1.ebuild 2132 RMD160 df31ff3575fb01fcd255bf46db3b8f1c0c3e9e2b SHA1 fd74b3f1126e2bed133a8b3cb434539cd0046836 SHA256 6c407c3c791f21bcf3266e030e020f56f7667ae127d4245ffdd87d0ce36309b5
 EBUILD arora-0.7.1.ebuild 1599 RMD160 937e3753a67c4d0187058fce6bf41b7adccc9658 SHA1 9863c946ceec4860076435d19fcccb7297326959 SHA256 646bc34a499e5ea8cc5854463d00b09ae5b1f3444aa2107745d2f9f17d139521
-MISC ChangeLog 5799 RMD160 5cddb0148534d85f985aaeb2bed29dad481b2626 SHA1 8ed6116c706f212b6d2e8d182f57f715905ccf19 SHA256 645f9660f423527cae2cbadd2415da4c683049825d092be88dcd71e5b3d152b8
+MISC ChangeLog 5963 RMD160 4b39961ee7c7b66520faa9aabe12c832ec232732 SHA1 ecacf0860af4b75499e388410900cb6bcacb2771 SHA256 082e550e6bdd1d6af74634693922dee875776fb804c249cec063f182f7a42f26
 MISC metadata.xml 218 RMD160 8ac5a6b1750a457d848b8b154fcaf7ca2b8decb1 SHA1 961504d4ab445fc56ba6bd0e9fd0c81270cf252e SHA256 f28447fb1cee5de814788da71f81ac68b66b24ac81cac98456698c7ce9bcc011
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkvphysACgkQcsIHjyDViGTApgCgxc/yUxGsm4yltUJt58Ut3b8n
-ocwAnRMDVFokUaQQN4G/Px2IdbG88q1A
-=dOcg
+iQIcBAEBCAAGBQJMeRKSAAoJEDZF8K7rm0r6HUQP/2ihNIcAmaYGPgIuVzmk3Wdh
+ny3EU5iWa+lP1eQq2Hz62xnGV8vjhSQYQc5x33aZJgvDsdLitihyrhMK/IMu3kSh
+U0lxN09aJTFbdRTIfAtin46+3FqXsmiqe24m0xhBnFQAZEbIr8H8s12XylyL1A+y
+HiXg+CCQrJBZFfwQZo+ToaHa2N+oWcrHcliXkMUiN+wB5KY5ZtCxOnqpBd51soTI
+aZ5gIgn3XmHhe6fhH4N7QBDmBEIlXvNkqC2rNaP8yNlbRcY0/M1tih2tzjbXGODe
+CktcqYVUHCSdXQtd3CtenJG/DqrmPg6ZYfFP22AuVSEFfCsZWwx+EmajjMMEcRhY
+MPo9Q8jyZP8edE39MA6LWCq5bWGvZNM66J/gb8JDmzcJSG89X9yK6zje6xTi3+I0
+hh212ppP/KBRDO/sLLLXBxoX2jW5oZHReku811iVAeum25ntrNmV6yK7Tzan+up+
+ZfArLdjU6QlJL5E3wrSvSaPv4KhFhE3Y6xKK1K5+lLYeTFUCaGZvKkKz4HMDSfsI
+V4DIp4PnleKRhujZJLmtazELc6gwRFQDjDlB7Oxn1yUNr9Z2fmRmc6XMiSBqBEPx
+2zKVLEzl8GXRcaa6jOCdWvQdTSSr6CDH2fMTMB8SdHSfUGRXf9SwoBzlmvyDrBdm
+O4d5yF8AFsatKkTsBVyr
+=Epdl
 -----END PGP SIGNATURE-----
diff --git a/www-client/arora/arora-0.10.2-r1.ebuild b/www-client/arora/arora-0.10.2-r1.ebuild
index d375eb48a31d..f2447603f559 100644
--- a/www-client/arora/arora-0.10.2-r1.ebuild
+++ b/www-client/arora/arora-0.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.10.2-r1.ebuild,v 1.7 2010/05/11 16:35:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.10.2-r1.ebuild,v 1.8 2010/08/28 13:43:24 wired Exp $
 
 EAPI=2
 inherit eutils qt4-r2
@@ -34,6 +34,10 @@ for L in $ARORA_NOLONGLANGS; do
 done
 
 src_prepare() {
+	# fix compilation with qt 4.7, bug #335011
+	# patch: http://github.com/Arora/arora/commit/5ca8d4b93a284d2e96ba9c2413c4060814258a95
+	epatch "${FILESDIR}"/"${P}"_qt_4.7_build_fix.patch
+
 	# use Gentoo lingua designations
 	mv src/locale/sr_RS@latin.ts src/locale/sr@latin.ts
 	mv src/locale/sr_RS.ts src/locale/sr_CS.ts
diff --git a/www-client/arora/files/arora-0.10.2_qt_4.7_build_fix.patch b/www-client/arora/files/arora-0.10.2_qt_4.7_build_fix.patch
new file mode 100644
index 000000000000..120cdc9f2e0f
--- /dev/null
+++ b/www-client/arora/files/arora-0.10.2_qt_4.7_build_fix.patch
@@ -0,0 +1,29 @@
+From 5ca8d4b93a284d2e96ba9c2413c4060814258a95 Mon Sep 17 00:00:00 2001
+From: Benjamin Poulain <benjamin.poulain@nokia.com>
+Date: Fri, 7 May 2010 12:28:32 +0200
+Subject: [PATCH 02/16] QtWebKit 2.0 declare a meta type for QWebElement
+
+Fix the compilation of Arora with QtWebKit 2.0. QtWebKit 2 already
+declare the meta type, declaring it in Arora results in a clash of
+symbols.
+---
+ src/webview.cpp |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/webview.cpp b/src/webview.cpp
+index 30df9a6..43eeeb9 100644
+--- a/src/webview.cpp
++++ b/src/webview.cpp
+@@ -87,7 +87,9 @@
+ #include <qwebframe.h>
+ 
+ #if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK)
++#if !defined(QTWEBKIT_VERSION) || QTWEBKIT_VERSION < 0x020000
+ Q_DECLARE_METATYPE(QWebElement)
++#endif
+ #include <qinputdialog.h>
+ #include <qlabel.h>
+ #include <qmessagebox.h>
+-- 
+1.7.2.2
+