[evolution-rss] support newer webkit

Lucian Langa lucilanga at fedoraproject.org
Mon Jan 17 06:53:13 UTC 2011


commit 2794462dfccbdde8acb27234146f77f2f2525875
Author: Lucian Langa <lucilanga at gnome.org>
Date:   Mon Jan 17 08:52:28 2011 +0200

    support newer webkit

 evolution-rss.spec           |    7 ++++++-
 webkit-1.3.10-includes.patch |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/evolution-rss.spec b/evolution-rss.spec
index c8ca7b3..8fd3317 100644
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -10,11 +10,12 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.2.9
-Release:	13.%{snapshot}%{?dist}
+Release:	14.%{snapshot}%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Source:		%{tarfile}
+Patch0:		webkit-1.3.10-includes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -36,6 +37,7 @@ This is an evolution plugin which enables evolution to read rss feeds.
 
 %prep
 %setup -q -n evolution-rss-%{version}
+%patch0 -p1 -b .webkit-includes
 
 %build
 ./autogen.sh
@@ -91,6 +93,9 @@ fi
 %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so
 
 %changelog
+* Mon Jan 17 2011 Lucian Langa <cooly at gnome.eu.org> - 0.2.9-14.20101225git
+- support builds with newer webkit
+
 * Wed Jan 12 2011 Milan Crha <mcrha at redhat.com> - 0.2.9-13.20101225git
 - Rebuild against newer evolution-data-server
 
diff --git a/webkit-1.3.10-includes.patch b/webkit-1.3.10-includes.patch
new file mode 100644
index 0000000..1303837
--- /dev/null
+++ b/webkit-1.3.10-includes.patch
@@ -0,0 +1,14 @@
+diff --git a/../evolution-rss/src/rss.c b/src/rss.c
+index 828bc6d..8b9f5bc 100644
+--- a/../evolution-rss/src/rss.c
++++ b/src/rss.c
+@@ -125,6 +125,9 @@ int rss_verbose_debug = 0;
+ 	#include <WebKit/webkitwebview.h>
+ 	#else
+ 	#include <webkit/webkitwebview.h>
++#if (WEBKIT_VERSION >= 1003010)
++	#include <webkit/webkitglobals.h>
++#endif
+ 	#endif
+ 	#endif
+ #endif


More information about the scm-commits mailing list