From 5edff6e1de0199ed4ebb4f96a2735027f54578d6 Mon Sep 17 00:00:00 2001
From: sibel <lesibel at free dot fr>
Date: Wed, 22 Sep 2010 09:20:49 +0200
Subject: maj de arora#0.10.2-2

---
 extra/arora/.md5sum                             |  1 +
 extra/arora/Pkgfile                             |  7 ++++--
 extra/arora/arora-0.10.2_qt_4.7_build_fix.patch | 29 +++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 extra/arora/arora-0.10.2_qt_4.7_build_fix.patch

(limited to 'extra/arora')

diff --git a/extra/arora/.md5sum b/extra/arora/.md5sum
index 69a79f6b5..6b15ffafa 100644
--- a/extra/arora/.md5sum
+++ b/extra/arora/.md5sum
@@ -1 +1,2 @@
 ccef0f214e0f03828cde8c521f7a5225  arora-0.10.2.tar.gz
+36587a3b61abbb3a46c5815bc703639e  arora-0.10.2_qt_4.7_build_fix.patch
diff --git a/extra/arora/Pkgfile b/extra/arora/Pkgfile
index f366c02eb..d7a206df0 100644
--- a/extra/arora/Pkgfile
+++ b/extra/arora/Pkgfile
@@ -6,11 +6,14 @@
 
 name=arora
 version=0.10.2
-release=1
-source=(http://arora.googlecode.com/files/$name-$version.tar.gz)
+release=2
+source=(http://arora.googlecode.com/files/$name-$version.tar.gz
+	arora-0.10.2_qt_4.7_build_fix.patch)
 
 build() {
 	cd $name-$version
+	patch -Np1 -i ../arora-0.10.2_qt_4.7_build_fix.patch
+
 	qmake PREFIX="/usr"
 	make
 	make INSTALL_ROOT=$PKG install
diff --git a/extra/arora/arora-0.10.2_qt_4.7_build_fix.patch b/extra/arora/arora-0.10.2_qt_4.7_build_fix.patch
new file mode 100644
index 000000000..120cdc9f2
--- /dev/null
+++ b/extra/arora/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
+
-- 
cgit v1.2.3-54-g00ecf