- make this actually work, i.e. do not use gecko_shutdown() when gecko

support is disabled
This commit is contained in:
ajacoutot 2008-11-23 17:44:22 +00:00
parent 76b19db651
commit 9a120d0e0b
3 changed files with 39 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2008/11/23 12:04:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.7 2008/11/23 17:44:22 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= RSS-reader plugin for GNOME
GNOME_PROJECT= evolution-rss
GNOME_VERSION= 0.1.2
PKGNAME= evolution-plugin-rss-${GNOME_VERSION}
PKGNAME= evolution-plugin-rss-${GNOME_VERSION}p0
CATEGORIES= mail
EVO_VERSION= 2.24

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2008/11/23 17:44:22 ajacoutot Exp $
--- src/Makefile.in.orig Wed Oct 29 19:45:50 2008
+++ src/Makefile.in Sun Nov 23 18:33:32 2008
@@ -767,7 +767,7 @@ info: info-am
info-am:
-install-data-am: install-data-local install-errorDATA \
+install-data-am: install-errorDATA \
install-gladeDATA install-pluginDATA install-pluginLTLIBRARIES \
install-schemaDATA install-serverDATA

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_rss_c,v 1.3 2008/11/23 17:44:22 ajacoutot Exp $
--- src/rss.c.orig Sun Nov 23 18:38:24 2008
+++ src/rss.c Sun Nov 23 18:38:46 2008
@@ -3282,17 +3282,17 @@ rss_finalize(void)
gconf_client_get_int(rss_gconf,
GCONF_KEY_HTML_RENDER,
NULL));
-/*#ifdef HAVE_GECKO
+#ifdef HAVE_GECKO
//really find a better way to deal with this//
//I do not know how to shutdown gecko (gtk_moz_embed_pop_startup)
//crash in nsCOMPtr_base::assign_with_AddRef
#ifdef HAVE_BUGGY_GECKO
if (2 == render)
system("killall -SIGTERM evolution");
-#else*/
+#else
gecko_shutdown();
-/*#endif
-#endif*/
+#endif
+#endif
}
guint