* [gentoo-commits] gentoo-x86 commit in www-client/arora/files: arora-0.10.2_qt_4.7_build_fix.patch
@ 2010-08-28 13:43 Alex Alexander (wired)
0 siblings, 0 replies; 2+ messages in thread
From: Alex Alexander (wired) @ 2010-08-28 13:43 UTC (permalink / raw
To: gentoo-commits
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
(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/files/arora-0.10.2_qt_4.7_build_fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/arora/files/arora-0.10.2_qt_4.7_build_fix.patch?rev=1.1&content-type=text/plain
Index: arora-0.10.2_qt_4.7_build_fix.patch
===================================================================
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-client/arora/files: arora-0.10.2_qt_4.7_build_fix.patch
@ 2012-03-28 17:03 Davide Pesavento (pesa)
0 siblings, 0 replies; 2+ messages in thread
From: Davide Pesavento (pesa) @ 2012-03-28 17:03 UTC (permalink / raw
To: gentoo-commits
pesa 12/03/28 17:03:20
Removed: arora-0.10.2_qt_4.7_build_fix.patch
Log:
Remove arora (has open security bug, dead upstream).
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-28 17:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-28 13:43 [gentoo-commits] gentoo-x86 commit in www-client/arora/files: arora-0.10.2_qt_4.7_build_fix.patch Alex Alexander (wired)
-- strict thread matches above, loose matches on Subject: below --
2012-03-28 17:03 Davide Pesavento (pesa)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox