diff --git a/arora-0.10.2-declare-qwebelement-metatype.patch b/arora-0.10.2-declare-qwebelement-metatype.patch new file mode 100644 index 0000000..c5299fa --- /dev/null +++ b/arora-0.10.2-declare-qwebelement-metatype.patch @@ -0,0 +1,13 @@ +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 + + #if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK) ++#if !defined(QTWEBKIT_VERSION) || QTWEBKIT_VERSION < 0x020000 + Q_DECLARE_METATYPE(QWebElement) ++#endif + #include + #include + #include diff --git a/arora.spec b/arora.spec index f9c8e7e..85df11a 100644 --- a/arora.spec +++ b/arora.spec @@ -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.com/files/%{name}-%{version}.tar.gz 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 list in Gnome Control Center. %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/hicolor &> /dev/null || : %changelog +* Mon May 17 2010 Jaroslav Reznik - 0.10.2-4 +- QWebElement metatype redeclaration in QtWebKit 2.0 + * Thu May 13 2010 Jaroslav Reznik - 0.10.2-3 - qt4-webkit-devel BuildRequires preparation