summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-11-09 23:06:29 +0100
committertnut <thierryn1 at hispeed dot ch>2010-11-09 23:06:29 +0100
commitefd81faa882d0a43103eecae7718c8dc485a077c (patch)
treecbcbd18bfd1ca77b795d6bd1a1b20451b62ee426 /extra
parent66816c70919e103a7385a22308e4a9bdb99885ff (diff)
downloadnutyx-extra-efd81faa882d0a43103eecae7718c8dc485a077c.tar.gz
nutyx-extra-efd81faa882d0a43103eecae7718c8dc485a077c.tar.bz2
nutyx-extra-efd81faa882d0a43103eecae7718c8dc485a077c.tar.xz
nutyx-extra-efd81faa882d0a43103eecae7718c8dc485a077c.zip
arora, port nettoyé
Diffstat (limited to 'extra')
-rw-r--r--extra/arora/Pkgfile2
-rw-r--r--extra/arora/arora-0.10.2_qt_4.7_build_fix.patch29
2 files changed, 1 insertions, 30 deletions
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
-