r3001 - in /unstable/evolution-rss/debian: changelog control patches/git_disable-webkit.patch patches/git_evolution322.patch patches/series watch
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Sat Aug 20 16:13:05 UTC 2016
Author: jbicha-guest
Date: Sat Aug 20 16:13:04 2016
New Revision: 3001
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=3001
Log:
Backport patches that add evolution 3.22 compatibility
Added:
unstable/evolution-rss/debian/patches/git_disable-webkit.patch
unstable/evolution-rss/debian/patches/git_evolution322.patch
Modified:
unstable/evolution-rss/debian/changelog
unstable/evolution-rss/debian/control
unstable/evolution-rss/debian/patches/series
unstable/evolution-rss/debian/watch
Modified: unstable/evolution-rss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/changelog?rev=3001&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog (original)
+++ unstable/evolution-rss/debian/changelog Sat Aug 20 16:13:04 2016
@@ -1,3 +1,10 @@
+evolution-rss (0.3.95-6) UNRELEASED; urgency=medium
+
+ * git_evolution322.patch, git_disable_webkit.patch:
+ - Backport patches that add evolution 3.22 compatibility
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Sat, 20 Aug 2016 01:43:34 -0400
+
evolution-rss (0.3.95-5) unstable; urgency=medium
* Team upload.
Modified: unstable/evolution-rss/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/control?rev=3001&op=diff
==============================================================================
--- unstable/evolution-rss/debian/control (original)
+++ unstable/evolution-rss/debian/control Sat Aug 20 16:13:04 2016
@@ -1,7 +1,8 @@
Source: evolution-rss
Section: gnome
Priority: optional
-Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers at lists.alioth.debian.org>
Uploaders: Jordi Mallach <jordi at debian.org>,
Josselin Mouette <joss at debian.org>
Build-Depends: debhelper (>= 9),
@@ -19,10 +20,9 @@
libgtk-3-dev (>= 2.99.3),
libsoup2.4-dev,
libsoup-gnome2.4-dev,
- libwebkitgtk-3.0-dev
Homepage: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
-Vcs-Svn: svn://anonscm.debian.org/pkg-evolution/unstable/evolution-rss
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution-rss
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-evolution/unstable/evolution-rss
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution-rss
Standards-Version: 3.9.8
Package: evolution-rss
Added: unstable/evolution-rss/debian/patches/git_disable-webkit.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/git_disable-webkit.patch?rev=3001&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/git_disable-webkit.patch (added)
+++ unstable/evolution-rss/debian/patches/git_disable-webkit.patch Sat Aug 20 16:13:04 2016
@@ -0,0 +1,27 @@
+From a5b4473b6cc55e016560ce4dcf26c715737da2d5 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Wed, 17 Aug 2016 19:12:27 +0200
+Subject: Auto-disable WebKit support when compiled against evolution 3.21.90+
+
+It's optional and the code uses the mail formatter, not its own web engine,
+which seems to be sufficient. Furthermore, evolution-rss uses WebKit1, but
+WebKit2 is used in the evolution since 3.21.90 and these two cannot be
+used together, thus rather disable WebKit code here.
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 629e663..27640b6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -259,6 +259,9 @@ AC_MSG_CHECKING([whether to include Webkit support])
+ AC_ARG_ENABLE([webkit],
+ AS_HELP_STRING([--disable-webkit],[Disable Webkit (Apple Upstream Webkit) support (default: enabled)]),
+ [],[enable_webkit=yes])
++if test "$evolution_version_int" -ge "32190"; then
++ enable_webkit="no, due to evolution 3.21.90+"
++fi
+ AC_MSG_RESULT([$enable_webkit])
+
+ if test "$enable_webkit" = "yes"; then
Added: unstable/evolution-rss/debian/patches/git_evolution322.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/git_evolution322.patch?rev=3001&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/git_evolution322.patch (added)
+++ unstable/evolution-rss/debian/patches/git_evolution322.patch Sat Aug 20 16:13:04 2016
@@ -0,0 +1,115 @@
+From 7741ef0cf3327cb5c719912358443b6aef3bdb59 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Wed, 17 Aug 2016 18:43:48 +0200
+Subject: Adapt to changes in evolution 3.21.90
+
+---
+ src/e-mail-formatter-evolution-rss.c | 11 +++++++++++
+ src/rss.c | 18 ++++++++++++++++++
+ 2 files changed, 29 insertions(+)
+
+diff --git a/src/e-mail-formatter-evolution-rss.c b/src/e-mail-formatter-evolution-rss.c
+index f71557d..afdf6cd 100644
+--- a/src/e-mail-formatter-evolution-rss.c
++++ b/src/e-mail-formatter-evolution-rss.c
+@@ -52,6 +52,7 @@ G_DEFINE_DYNAMIC_TYPE (
+
+ static const gchar* rss_formatter_mime_types[] = { "x-evolution/evolution-rss-feed", NULL };
+
++#if EVOLUTION_VERSION < 32190
+ static void
+ set_view_cb (GtkWidget *button,
+ gpointer *data)
+@@ -60,6 +61,8 @@ set_view_cb (GtkWidget *button,
+ rss_set_changed_view(1);
+ e_mail_display_reload (rss_get_display());
+ }
++#endif
++
+ #include "fetch.h"
+
+ typedef struct _HD HD;
+@@ -132,7 +135,11 @@ emfe_evolution_rss_format (EMailFormatterExtension *extension,
+ if (!rss_init)
+ goto fail;
+
++#if EVOLUTION_VERSION >= 32190
++ h = e_web_view_get_content_html_sync (E_WEB_VIEW (rss_get_display()), NULL, NULL);
++#else
+ h = g_strdup(e_web_view_get_html (E_WEB_VIEW (rss_get_display())));
++#endif
+
+ website = (gchar *)camel_medium_get_header (
+ CAMEL_MEDIUM (message), "Website");
+@@ -380,6 +387,7 @@ e_mail_formatter_evolution_rss_type_register (GTypeModule *type_module)
+ e_mail_formatter_evolution_rss_register_type (type_module);
+ }
+
++#if EVOLUTION_VERSION < 32190
+ static GtkWidget *
+ emfe_evolution_rss_get_widget (EMailFormatterExtension *extension,
+ EMailPartList *context,
+@@ -404,13 +412,16 @@ emfe_evolution_rss_get_widget (EMailFormatterExtension *extension,
+ gtk_widget_show(box);
+ return box;
+ }
++#endif
+
+ static void
+ e_mail_formatter_evolution_rss_class_init (EMailFormatterExtensionClass *class)
+ {
+ class->mime_types = rss_formatter_mime_types;
+ class->format = emfe_evolution_rss_format;
++#if EVOLUTION_VERSION < 32190
+ class->get_widget = emfe_evolution_rss_get_widget;
++#endif
+ class->display_name = _("Evolution-RSS");
+ class->description = _("Displaying RSS feed articles");
+ }
+diff --git a/src/rss.c b/src/rss.c
+index 20b6d33..e21f0f1 100644
+--- a/src/rss.c
++++ b/src/rss.c
+@@ -1326,15 +1326,24 @@ org_gnome_evolution_presend (EPlugin *ep, EMEventTargetComposer *t)
+
+ #if EVOLUTION_VERSION >= 31303
+ EHTMLEditor *editor;
++#if EVOLUTION_VERSION >= 32190
++ EContentEditor *cnt_editor;
++#else
+ EHTMLEditorView *view;
++#endif
+
+ editor = e_msg_composer_get_editor (t->composer);
++#if EVOLUTION_VERSION >= 32190
++ cnt_editor = e_html_editor_get_content_editor (editor);
++ text = e_content_editor_get_content (cnt_editor, E_CONTENT_EDITOR_GET_TEXT_HTML, NULL, NULL);
++#else
+ view = e_html_editor_get_view (editor);
+ #if EVOLUTION_VERSION >= 31390
+ text = e_html_editor_view_get_text_html (view, NULL, NULL);
+ #else
+ text = e_html_editor_view_get_text_html (view);
+ #endif
++#endif /* EVOLUTION_VERSION >= 32190 */
+ length = strlen (text);
+ #else
+ /* unfortunately e_msg_composer does not have raw get/set text body
+@@ -1352,8 +1361,17 @@ org_gnome_evolution_presend (EPlugin *ep, EMEventTargetComposer *t)
+ g_free (text);
+ text = g_strndup ((gchar *) buff, size);
+ editor = e_msg_composer_get_editor (t->composer);
++#if EVOLUTION_VERSION >= 32190
++ cnt_editor = e_html_editor_get_content_editor (editor);
++ e_content_editor_insert_content (
++ cnt_editor,
++ text,
++ E_CONTENT_EDITOR_INSERT_TEXT_HTML |
++ E_CONTENT_EDITOR_INSERT_REPLACE_ALL);
++#else
+ view = e_html_editor_get_view (editor);
+ e_html_editor_view_set_text_html (view, text);
++#endif
+ #else
+ gtkhtml_editor_set_text_html((GtkhtmlEditor *)t->composer, (gchar *)buff, size);
+ #endif
Modified: unstable/evolution-rss/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/series?rev=3001&op=diff
==============================================================================
--- unstable/evolution-rss/debian/patches/series (original)
+++ unstable/evolution-rss/debian/patches/series Sat Aug 20 16:13:04 2016
@@ -1 +1,3 @@
01_deprecated.patch
+git_evolution322.patch
+git_disable-webkit.patch
Modified: unstable/evolution-rss/debian/watch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/watch?rev=3001&op=diff
==============================================================================
--- unstable/evolution-rss/debian/watch (original)
+++ unstable/evolution-rss/debian/watch Sat Aug 20 16:13:04 2016
@@ -1,3 +1,2 @@
-version=4
-http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin http://gnome.eu.org/\
- @PACKAGE@@ANY_VERSION@\.tar\.xz
+version=2
+http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin http://gnome.eu.org/evolution-rss-(.*)\.tar\.xz
More information about the pkg-evolution-commits
mailing list