From efd81faa882d0a43103eecae7718c8dc485a077c Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Tue, 9 Nov 2010 23:06:29 +0100
Subject: arora, port nettoyé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/arora/Pkgfile                             |  2 +-
 extra/arora/arora-0.10.2_qt_4.7_build_fix.patch | 29 -------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 extra/arora/arora-0.10.2_qt_4.7_build_fix.patch

(limited to 'extra/arora')

diff --git a/extra/arora/Pkgfile b/extra/arora/Pkgfile
index d7a206df0..569879a7e 100644
--- a/extra/arora/Pkgfile
+++ b/extra/arora/Pkgfile
@@ -8,7 +8,7 @@ name=arora
 version=0.10.2
 release=2
 source=(http://arora.googlecode.com/files/$name-$version.tar.gz
-	arora-0.10.2_qt_4.7_build_fix.patch)
+	http://nutyx.meticul.eu/files/patchs/$name/arora-0.10.2_qt_4.7_build_fix.patch)
 
 build() {
 	cd $name-$version
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
deleted file mode 100644
index 120cdc9f2..000000000
--- a/extra/arora/arora-0.10.2_qt_4.7_build_fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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-70-g09d2