Adapt to changes in evolution 3.21.90 (upstream).
This commit is contained in:
ajacoutot
parent
462141161a
commit
afd8bbfb4f
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.58 2016/07/10 12:16:17 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.59 2016/10/31 12:34:30 ajacoutot Exp $
|
||||
|
||||
COMMENT= RSS reader plugin for evolution
|
||||
|
||||
GNOME_PROJECT= evolution-rss
|
||||
GNOME_VERSION= 0.3.95
|
||||
REVISION= 5
|
||||
REVISION= 6
|
||||
|
||||
CATEGORIES= mail
|
||||
|
||||
@ -17,26 +17,28 @@ MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB += EGL GL ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
|
||||
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm atk-1.0
|
||||
WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject camel-1.2
|
||||
WANTLIB += canberra canberra-gtk3 cryptui db dbus-1 dbus-glib-1
|
||||
WANTLIB += drm ebackend-1.2 ebook-1.2 ebook-contacts-1.2 ecal-1.2
|
||||
WANTLIB += edata-book-1.2 edataserver-1.2 edataserverui-1.2 enchant
|
||||
WANTLIB += epoxy expat ffi fontconfig freetype gailutil-3 gbm
|
||||
WANTLIB += gck-1 gcr-base-3 gcr-ui-3 gcrypt gdk-3 gdk_pixbuf-2.0
|
||||
WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gnome-desktop-3
|
||||
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm archive
|
||||
WANTLIB += atk-1.0 atk-bridge-2.0 atspi bz2 c cairo cairo-gobject
|
||||
WANTLIB += camel-1.2 canberra canberra-gtk3 crypto cryptui db
|
||||
WANTLIB += dbus-1 dbus-glib-1 drm ebackend-1.2 ebook-1.2 ebook-contacts-1.2
|
||||
WANTLIB += ecal-1.2 edata-book-1.2 edataserver-1.2 edataserverui-1.2
|
||||
WANTLIB += enchant epoxy estdc++ expat ffi fontconfig freetype
|
||||
WANTLIB += gailutil-3 gbm gck-1 gcr-base-3 gcr-ui-3 gcrypt gdk-3
|
||||
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glapi glib-2.0 gmodule-2.0 gmp
|
||||
WANTLIB += gnome-autoar-0 gnome-autoar-gtk-0 gnome-desktop-3 gnutls
|
||||
WANTLIB += gobject-2.0 gpg-error graphite2 gstapp-1.0 gstaudio-1.0
|
||||
WANTLIB += gstbase-1.0 gstfft-1.0 gstpbutils-1.0 gstreamer-1.0
|
||||
WANTLIB += gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3 gtkhtml-4.0
|
||||
WANTLIB += gtkhtml-editor-4.0 gtkspell3-3 harfbuzz harfbuzz-icu
|
||||
WANTLIB += ical icalss icalvcal iconv icudata icui18n icuuc intl
|
||||
WANTLIB += javascriptcoregtk-3.0 jpeg json-glib-1.0 ltdl lzma
|
||||
WANTLIB += m nspr4 nss3 nssutil3 ogg orc-0.4 p11-kit pango-1.0
|
||||
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 plc4 plds4
|
||||
WANTLIB += png pthread pthread-stubs secret-1 smime3 softokn3
|
||||
WANTLIB += soup-2.4 soup-gnome-2.4 sqlite3 ssl3 stdc++ vorbis
|
||||
WANTLIB += vorbisfile webkitgtk-3.0 webp xcb xcb-dri2 xcb-glx
|
||||
WANTLIB += xcb-render xcb-shape xcb-shm xcb-xfixes xml2 xslt z
|
||||
WANTLIB += hogweed hyphen ical icalss icalvcal iconv icudata icui18n
|
||||
WANTLIB += icuuc idn intl javascriptcoregtk-4.0 jpeg json-glib-1.0
|
||||
WANTLIB += ltdl lz4 lzma lzo2 m nettle notify nspr4 nss3 nssutil3
|
||||
WANTLIB += ogg orc-0.4 p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs
|
||||
WANTLIB += secret-1 smime3 softokn3 soup-2.4 soup-gnome-2.4 sqlite3
|
||||
WANTLIB += ssl3 stdc++ tasn1 vorbis vorbisfile webkit2gtk-4.0
|
||||
WANTLIB += webp xcb xcb-dri2 xcb-glx xcb-render xcb-shm xcb-xfixes
|
||||
WANTLIB += xml2 xslt z
|
||||
WANTLIB += lib/evolution/eabutil
|
||||
WANTLIB += lib/evolution/econtacteditor
|
||||
WANTLIB += lib/evolution/econtactlisteditor
|
||||
@ -60,8 +62,9 @@ LIB_DEPENDS= mail/evolution \
|
||||
|
||||
MODGNOME_TOOLS= desktop-file-utils
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --with-primary-render=webkit
|
||||
AUTOCONF_VERSION= 2.69
|
||||
|
||||
CONFIGURE_STYLE= autoconf
|
||||
|
||||
post-install:
|
||||
rm ${PREFIX}/lib/evolution/{plugins,modules}/*.{a,la}
|
||||
|
||||
19
mail/evolution-rss/patches/patch-configure_ac
Normal file
19
mail/evolution-rss/patches/patch-configure_ac
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.3 2016/10/31 12:34:30 ajacoutot Exp $
|
||||
|
||||
From a5b4473b6cc55e016560ce4dcf26c715737da2d5 Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@redhat.com>
|
||||
Date: Wed, 17 Aug 2016 19:12:27 +0200
|
||||
Subject: Auto-disable WebKit support when compiled against evolution 3.21.90+
|
||||
|
||||
--- configure.ac.orig Thu Oct 2 11:21:35 2014
|
||||
+++ configure.ac Mon Oct 31 13:20:17 2016
|
||||
@@ -258,6 +258,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
|
||||
@ -0,0 +1,63 @@
|
||||
$OpenBSD: patch-src_e-mail-formatter-evolution-rss_c,v 1.3 2016/10/31 12:34:30 ajacoutot Exp $
|
||||
|
||||
From 7741ef0cf3327cb5c719912358443b6aef3bdb59 Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@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.orig Wed Apr 1 13:23:18 2015
|
||||
+++ src/e-mail-formatter-evolution-rss.c Mon Oct 31 13:19:55 2016
|
||||
@@ -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 *ex
|
||||
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");
|
||||
@@ -375,6 +382,7 @@ e_mail_formatter_evolution_rss_type_register (GTypeMod
|
||||
e_mail_formatter_evolution_rss_register_type (type_module);
|
||||
}
|
||||
|
||||
+#if EVOLUTION_VERSION < 32190
|
||||
static GtkWidget *
|
||||
emfe_evolution_rss_get_widget (EMailFormatterExtension *extension,
|
||||
EMailPartList *context,
|
||||
@@ -399,13 +407,16 @@ emfe_evolution_rss_get_widget (EMailFormatterExtension
|
||||
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");
|
||||
}
|
||||
52
mail/evolution-rss/patches/patch-src_rss_c
Normal file
52
mail/evolution-rss/patches/patch-src_rss_c
Normal file
@ -0,0 +1,52 @@
|
||||
$OpenBSD: patch-src_rss_c,v 1.8 2016/10/31 12:34:30 ajacoutot Exp $
|
||||
|
||||
From 7741ef0cf3327cb5c719912358443b6aef3bdb59 Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@redhat.com>
|
||||
Date: Wed, 17 Aug 2016 18:43:48 +0200
|
||||
Subject: Adapt to changes in evolution 3.21.90
|
||||
|
||||
--- src/rss.c.orig Thu Mar 26 09:41:11 2015
|
||||
+++ src/rss.c Mon Oct 31 13:19:55 2016
|
||||
@@ -1302,15 +1302,24 @@ org_gnome_evolution_presend (EPlugin *ep, EMEventTarge
|
||||
|
||||
#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
|
||||
@@ -1328,8 +1337,17 @@ org_gnome_evolution_presend (EPlugin *ep, EMEventTarge
|
||||
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
|
||||
Loading…
x
Reference in New Issue
Block a user