From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OpLgu-0000IU-Kl for garchives@archives.gentoo.org; Sat, 28 Aug 2010 13:43:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34F8CE10CC; Sat, 28 Aug 2010 13:43:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1A201E10CC for ; Sat, 28 Aug 2010 13:43:27 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8ED681B40FD for ; Sat, 28 Aug 2010 13:43:26 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2252) id 3147820054; Sat, 28 Aug 2010 13:43:25 +0000 (UTC) From: "Alex Alexander (wired)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, wired@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-client/arora/files: arora-0.10.2_qt_4.7_build_fix.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: arora-0.10.2_qt_4.7_build_fix.patch X-VCS-Directories: www-client/arora/files X-VCS-Committer: wired X-VCS-Committer-Name: Alex Alexander Content-Type: text/plain; charset=utf8 Message-Id: <20100828134325.3147820054@flycatcher.gentoo.org> Date: Sat, 28 Aug 2010 13:43:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4a8e1f9f-4d31-486d-9954-a7f721e404d7 X-Archives-Hash: f57f6e9b8e92c0929aa0c00f91cc8abc wired 10/08/28 13:43:25 Added: arora-0.10.2_qt_4.7_build_fix.patch Log: fixed compilation with qt 4.7, bug #335011 =20 (Portage version: 2.2_rc71/cvs/Linux x86_64) Revision Changes Path 1.1 www-client/arora/files/arora-0.10.2_qt_4.7_build_fix= .patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/arora/f= iles/arora-0.10.2_qt_4.7_build_fix.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/arora/f= iles/arora-0.10.2_qt_4.7_build_fix.patch?rev=3D1.1&content-type=3Dtext/pl= ain Index: arora-0.10.2_qt_4.7_build_fix.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From 5ca8d4b93a284d2e96ba9c2413c4060814258a95 Mon Sep 17 00:00:00 2001 From: Benjamin Poulain 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 =20 #if QT_VERSION >=3D 0x040600 || defined(WEBKIT_TRUNK) +#if !defined(QTWEBKIT_VERSION) || QTWEBKIT_VERSION < 0x020000 Q_DECLARE_METATYPE(QWebElement) +#endif #include #include #include --=20 1.7.2.2