rpms/arora/devel arora-0.10.2-declare-qwebelement-metatype.patch, NONE, 1.1 arora.spec, 1.29, 1.30

[Jaroslav Reznik]

Author: jreznik

Update of /cvs/pkgs/rpms/arora/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1986

Modified Files:
	arora.spec 
Added Files:
	arora-0.10.2-declare-qwebelement-metatype.patch 
Log Message:
* Mon May 17 2010 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-4
- QWebElement metatype redeclaration in QtWebKit 2.0


arora-0.10.2-declare-qwebelement-metatype.patch:
 webview.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE arora-0.10.2-declare-qwebelement-metatype.patch ---
diff -up arora-0.10.2/src/webview.cpp.declare-qwebelement-metatype arora-0.10.2/src/webview.cpp
--- arora-0.10.2/src/webview.cpp.declare-qwebelement-metatype	2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/webview.cpp	2010-05-17 17:32:44.048050041 +0200
@@ -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>


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- arora.spec	13 May 2010 10:59:51 -0000	1.29
+++ arora.spec	17 May 2010 15:39:36 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           arora
 Version:        0.10.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
@@ -10,6 +10,11 @@ Source0:        http://arora.googlecode.
 Patch0:         arora-0.10.2-gitversion.patch
 Patch1:         arora-0.10.0-fedorabookmarks.patch
 Patch2:         arora-0.10.2-fedorahome.patch
+
+# upstream patches
+# commit 5ca8d4b93a284d2e96ba
+Patch100:       arora-0.10.2-declare-qwebelement-metatype.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -41,6 +46,7 @@ Adds Arora to Preferred Applications lis
 %patch0 -p1 -b .gitversion
 %patch1 -p1 -b .fedorabookmarks
 %patch2 -p1 -b .fedorahome
+%patch100 -p1 -b .declare-qwebelement-metatype
 
 %build
 qmake-qt4 PREFIX=%{_prefix}
@@ -100,6 +106,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Mon May 17 2010 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-4
+- QWebElement metatype redeclaration in QtWebKit 2.0
+
 * Thu May 13 2010 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-3
 - qt4-webkit-devel BuildRequires preparation