[arch-commits] Commit in evolution-rss/trunk (evo-3.21.90.patch evo-3.23.2.patch)
Balló György
bgyorgy at archlinux.org
Sun Mar 8 12:53:31 UTC 2020
Date: Sunday, March 8, 2020 @ 12:53:30
Author: bgyorgy
Revision: 591946
upgpkg: evolution-rss 0.3.96-1: Update to new version
Deleted:
evolution-rss/trunk/evo-3.21.90.patch
evolution-rss/trunk/evo-3.23.2.patch
-------------------+
evo-3.21.90.patch | 119 ----------------------------------------------------
evo-3.23.2.patch | 110 ------------------------------------------------
2 files changed, 229 deletions(-)
Deleted: evo-3.21.90.patch
===================================================================
--- evo-3.21.90.patch 2020-03-08 12:51:24 UTC (rev 591945)
+++ evo-3.21.90.patch 2020-03-08 12:53:30 UTC (rev 591946)
@@ -1,119 +0,0 @@
-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
-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
Deleted: evo-3.23.2.patch
===================================================================
--- evo-3.23.2.patch 2020-03-08 12:51:24 UTC (rev 591945)
+++ evo-3.23.2.patch 2020-03-08 12:53:30 UTC (rev 591946)
@@ -1,110 +0,0 @@
-diff -up evolution-rss-0.3.95/src/rss.c.evo-3.23.2 evolution-rss-0.3.95/src/rss.c
---- evolution-rss-0.3.95/src/rss.c.evo-3.23.2 2016-11-21 15:17:58.905081929 +0100
-+++ evolution-rss-0.3.95/src/rss.c 2016-11-21 15:17:58.907081929 +0100
-@@ -3951,7 +3951,8 @@ create_mail(create_feed *CF)
- #endif
-
- info = camel_message_info_new(NULL);
-- camel_message_info_set_flags(info, CAMEL_MESSAGE_SEEN, 1);
-+ /* Unset the Seen flag, thus the messages are marked as new/unread */
-+ camel_message_info_set_flags(info, CAMEL_MESSAGE_SEEN, 0);
-
- tmp = decode_entities(CF->subj);
- tmp2 = markup_decode(tmp);
-@@ -4239,7 +4240,11 @@ out:
- camel_object_unref(mail_folder);
- #endif
- #if (DATASERVER_VERSION >= 3011001)
-+ #if (DATASERVER_VERSION >= 3023002)
-+ g_clear_object (&info);
-+ #else
- camel_message_info_unref(info);
-+ #endif
- #else
- camel_message_info_free(info);
- #endif
-@@ -4717,10 +4722,18 @@ delete_oldest_article(CamelFolder *folde
- if (info) {
- if (rf->current_uid && !strcmp(rf->current_uid, uids->pdata[i]))
- goto out;
-+ #if (DATASERVER_VERSION >= 3023002)
-+ date = camel_message_info_get_date_sent (info);
-+ #else
- date = camel_message_info_date_sent(info);
-+ #endif
- if (!date)
- goto out;
-+ #if (DATASERVER_VERSION >= 3023002)
-+ flags = camel_message_info_get_flags (info);
-+ #else
- flags = camel_message_info_flags(info);
-+ #endif
- if (flags & CAMEL_MESSAGE_FLAGGED)
- goto out;
- if (flags & CAMEL_MESSAGE_DELETED)
-@@ -4753,7 +4766,11 @@ delete_oldest_article(CamelFolder *folde
- // i, j, q, min_date, ctime(&min_date), imax);
- out:
- #if (DATASERVER_VERSION >= 3011001)
-+ #if (DATASERVER_VERSION >= 3023002)
-+ g_clear_object (&info);
-+ #else
- camel_message_info_unref(info);
-+ #endif
- #else
- camel_message_info_free(info);
- #endif
-@@ -4840,7 +4857,11 @@ get_feed_age(RDF *r, gpointer name)
- }
- if (!match) {
- info = camel_folder_get_message_info(folder, uids->pdata[i]);
-+ #if (DATASERVER_VERSION >= 3023002)
-+ flags = camel_message_info_get_flags (info);
-+ #else
- flags = camel_message_info_flags(info);
-+ #endif
- if ((del_unread) && !(flags & CAMEL_MESSAGE_FLAGGED)) {
- gchar *feed_dir, *feed_name;
- camel_folder_delete_message(folder, uids->pdata[i]);
-@@ -4853,7 +4874,11 @@ get_feed_age(RDF *r, gpointer name)
- g_free(feed_name);
- }
- #if (DATASERVER_VERSION >= 3011001)
-+ #if (DATASERVER_VERSION >= 3023002)
-+ g_clear_object (&info);
-+ #else
- camel_message_info_unref(info);
-+ #endif
- #else
- camel_folder_free_message_info(folder, info);
- #endif
-@@ -4882,9 +4907,17 @@ get_feed_age(RDF *r, gpointer name)
- if (info == NULL)
- continue;
- if (rf->current_uid && strcmp(rf->current_uid, uids->pdata[i])) {
-+ #if (DATASERVER_VERSION >= 3023002)
-+ date = camel_message_info_get_date_sent (info);
-+ #else
- date = camel_message_info_date_sent(info);
-+ #endif
- if (date < now - del_days * 86400) {
-+ #if (DATASERVER_VERSION >= 3023002)
-+ flags = camel_message_info_get_flags (info);
-+ #else
- flags = camel_message_info_flags(info);
-+ #endif
- if (!(flags & CAMEL_MESSAGE_SEEN)) {
- if ((del_unread) && !(flags & CAMEL_MESSAGE_FLAGGED)) {
- camel_folder_delete_message(folder, uids->pdata[i]);
-@@ -4896,7 +4929,11 @@ get_feed_age(RDF *r, gpointer name)
- }
- }
- #if (DATASERVER_VERSION >= 3011001)
-+ #if (DATASERVER_VERSION >= 3023002)
-+ g_clear_object (&info);
-+ #else
- camel_message_info_unref(info);
-+ #endif
- #else
- camel_folder_free_message_info(folder, info);
- #endif
More information about the arch-commits
mailing list