- update evolution-plugin-rss to 0.1.4

* lots of bugfixes and new features

ok ajacoutot@
This commit is contained in:
jasper 2009-09-14 15:39:05 +00:00
parent 38c93a0998
commit 74ee15e206
8 changed files with 53 additions and 99 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.12 2009/06/08 17:20:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.13 2009/09/14 15:39:05 jasper Exp $
SHARED_ONLY= Yes
COMMENT= RSS-reader plugin for GNOME
GNOME_PROJECT= evolution-rss
GNOME_VERSION= 0.1.2
PKGNAME= evolution-plugin-rss-${GNOME_VERSION}p5
GNOME_VERSION= 0.1.4
PKGNAME= evolution-plugin-rss-${GNOME_VERSION}
CATEGORIES= mail
@ -24,7 +24,18 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c dbus-1 glib-2.0 gobject-2.0 pcre pthread
WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender art_lgpl_2 atk-1.0 avahi-client avahi-common
WANTLIB += avahi-glib bonobo-2 bonobo-activation bonoboui-2 c
WANTLIB += cairo crypto dbus-1 dbus-glib-1 enchant expat fontconfig
WANTLIB += freetype gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2
WANTLIB += gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 gnutls
WANTLIB += gobject-2.0 gpg-error gthread-2.0 gtk-x11-2.0 gtkhtml-3.14
WANTLIB += gtkhtml-editor m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png popt proxy pthread pthread-stubs
WANTLIB += soup-2.4 sqlite3 ssl stdc++ tasn1 util xcb xml2 z
MASTER_SITES= http://gnome.eu.org/
EXTRACT_SUFX= .tar.gz
@ -35,7 +46,8 @@ MODULES= devel/gettext \
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= :evolution->=2.24.1.1:mail/evolution
LIB_DEPENDS= dbus-glib-1::x11/dbus-glib
LIB_DEPENDS= gconf-2::devel/gconf2 \
soup-gnome-2.4.>=1::devel/libsoup,-gnome
USE_X11= Yes

View File

@ -1,5 +1,5 @@
MD5 (evolution-rss-0.1.2.tar.gz) = p8BLbzMMSXhdNPWaGVN3mA==
RMD160 (evolution-rss-0.1.2.tar.gz) = NxNQNkrT5X+L28BnFtdEoXmD5wA=
SHA1 (evolution-rss-0.1.2.tar.gz) = JeCeHMZ2TdI3ZozFN72UliILEks=
SHA256 (evolution-rss-0.1.2.tar.gz) = zrwSqvbuKCge6DncVGLBd0HTmfRFsXFxMt6Ss0hLYFM=
SIZE (evolution-rss-0.1.2.tar.gz) = 506503
MD5 (evolution-rss-0.1.4.tar.gz) = 5t9q6R/kGILMtUIxso1+/Q==
RMD160 (evolution-rss-0.1.4.tar.gz) = r+70K+nktZPpjZwgVdqFfeuZ0K4=
SHA1 (evolution-rss-0.1.4.tar.gz) = C+pW8gBEI8ZQbW/1USAu2iOthAw=
SHA256 (evolution-rss-0.1.4.tar.gz) = 3WQOBXTKeO/q/MU7fpEklt0Bj0fGypPfjwUbAIBImhQ=
SIZE (evolution-rss-0.1.4.tar.gz) = 618558

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.3 2008/11/23 12:04:27 ajacoutot Exp $
--- configure.orig Sun Nov 23 12:06:58 2008
+++ configure Sun Nov 23 12:08:46 2008
@@ -22108,11 +22108,8 @@ if test -n "$EVOLUTION_VERSION"; then
$OpenBSD: patch-configure,v 1.4 2009/09/14 15:39:05 jasper Exp $
--- configure.orig Sun Sep 13 23:04:56 2009
+++ configure Sun Sep 13 23:08:59 2009
@@ -17593,11 +17593,8 @@ if test -n "$EVOLUTION_VERSION"; then
EVOLUTION_BASE_VERSION=$EVOLUTION_VERSION
EVOLUTION_BASE_VERSION_S=""
EVOLUTION_EXEC_VERSION=`pkg-config --variable=execversion evolution-shell 2>/dev/null`
EVOLUTION_EXEC_VERSION=`$PKG_CONFIG --variable=execversion evolution-shell 2>/dev/null`
- if test -n "$EVOLUTION_EXEC_VERSION"; then
- break;
- else

View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-src_Makefile_in,v 1.4 2009/09/14 15:39:05 jasper Exp $
--- src/Makefile.in.orig Tue Aug 25 14:13:43 2009
+++ src/Makefile.in Sun Sep 13 23:04:44 2009
@@ -860,7 +860,7 @@ info: info-am
info-am:

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_evolution-import-rss_c,v 1.3 2008/11/23 12:07:45 ajacoutot Exp $
Increase the time-out to give evolution a fair chance to launch.
--- src/evolution-import-rss.c.orig Wed Oct 22 17:27:37 2008
+++ src/evolution-import-rss.c Sun Nov 23 13:05:02 2008
@@ -176,7 +176,7 @@ main (int argc, char *argv[])
{
system("evolution&");
g_print("fireing evolution...\n");
- sleep(30);
+ sleep(60);
send_dbus_ping ();
g_timeout_add (EVOLUTION_PING_TIMEOUT, err_evo_cb, (gpointer)i++);
g_main_loop_run(loop);

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-src_rss-config-factory_c,v 1.1 2009/02/13 09:47:58 jasper Exp $
First chunk:
Fix seg. fault when adding new feeds (bz #568857).
From upstream svn -r413.
Second/third chunk:
Fix seg. fault with "realloc(): error: modified chunk-pointer" (bz #562249)
From upstream svn -r444.
--- src/rss-config-factory.c.orig Fri Feb 13 08:55:44 2009
+++ src/rss-config-factory.c Fri Feb 13 09:01:14 2009
@@ -279,7 +279,7 @@ create_dialog_add(gchar *text, gchar *feed_text)
char *gladefile;
add_feed *feed = g_new0(add_feed, 1);
GladeXML *gui;
- gchar *flabel;
+ gchar *flabel = NULL;
gboolean fhtml = FALSE;
gboolean enabled = TRUE;
gboolean del_unread = FALSE;
@@ -521,7 +521,7 @@ feeds_dialog_add(GtkDialog *d, gpointer data)
add_feed *feed = create_dialog_add(NULL, NULL);
if (feed->dialog)
gtk_widget_destroy(feed->dialog);
- GtkWidget *msg_feeds = e_error_new(NULL, "org-gnome-evolution-rss:rssmsg", NULL);
+ GtkWidget *msg_feeds = e_error_new(NULL, "org-gnome-evolution-rss:rssmsg", "", NULL);
GtkWidget *progress = gtk_progress_bar_new();
gtk_box_pack_start(GTK_BOX(((GtkDialog *)msg_feeds)->vbox), progress, FALSE, FALSE, 0);
gtk_progress_bar_set_fraction((GtkProgressBar *)progress, 0);
@@ -873,7 +873,7 @@ feeds_dialog_edit(GtkDialog *d, gpointer data)
add_feed *feed = create_dialog_add(name, feed_name);
if (feed->dialog)
gtk_widget_destroy(feed->dialog);
- GtkWidget *msg_feeds = e_error_new(NULL, "org-gnome-evolution-rss:rssmsg", NULL);
+ GtkWidget *msg_feeds = e_error_new(NULL, "org-gnome-evolution-rss:rssmsg", "", NULL);
GtkWidget *progress = gtk_progress_bar_new();
gtk_box_pack_start(GTK_BOX(((GtkDialog *)msg_feeds)->vbox), progress, FALSE, FALSE, 0);
gtk_progress_bar_set_fraction((GtkProgressBar *)progress, 0);

View File

@ -1,25 +0,0 @@
$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

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2009/06/07 05:59:48 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2009/09/14 15:39:05 jasper Exp $
@bin bin/evolution-import-rss
lib/bonobo/servers/GNOME_Evolution_RSS_${EVO_VERSION}.server
lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.a
@ -9,6 +9,7 @@ lib/evolution/${EVO_VERSION}/plugins/org-gnome-evolution-rss.xml
share/evolution/${EVO_VERSION}/errors/org-gnome-evolution-rss.error
share/evolution/${EVO_VERSION}/glade/rss-html-rendering.glade
share/evolution/${EVO_VERSION}/glade/rss-ui.glade
share/evolution/${EVO_VERSION}/images/pix.png
share/evolution/${EVO_VERSION}/images/rss-16.png
share/evolution/${EVO_VERSION}/images/rss-22.png
share/evolution/${EVO_VERSION}/images/rss-24.png
@ -17,9 +18,29 @@ share/evolution/${EVO_VERSION}/images/rss-icon-unread.png
share/evolution/${EVO_VERSION}/images/rss-text-html.png
share/evolution/${EVO_VERSION}/images/rss-text-x-generic.png
share/evolution/${EVO_VERSION}/images/rss.png
share/locale/as/LC_MESSAGES/evolution-rss.mo
share/locale/bn_IN/LC_MESSAGES/evolution-rss.mo
share/locale/cs/LC_MESSAGES/evolution-rss.mo
share/locale/en_AU/LC_MESSAGES/evolution-rss.mo
share/locale/en_GB/LC_MESSAGES/evolution-rss.mo
share/locale/es/LC_MESSAGES/evolution-rss.mo
share/locale/fr/LC_MESSAGES/evolution-rss.mo
share/locale/gl/LC_MESSAGES/evolution-rss.mo
share/locale/gu/LC_MESSAGES/evolution-rss.mo
share/locale/hi/LC_MESSAGES/evolution-rss.mo
share/locale/it/LC_MESSAGES/evolution-rss.mo
share/locale/kn/LC_MESSAGES/evolution-rss.mo
share/locale/ml/LC_MESSAGES/evolution-rss.mo
share/locale/mr/LC_MESSAGES/evolution-rss.mo
share/locale/or/LC_MESSAGES/evolution-rss.mo
share/locale/pt/LC_MESSAGES/evolution-rss.mo
share/locale/ro/LC_MESSAGES/evolution-rss.mo
share/locale/ru/LC_MESSAGES/evolution-rss.mo
share/locale/sv/LC_MESSAGES/evolution-rss.mo
share/locale/ta/LC_MESSAGES/evolution-rss.mo
share/locale/te/LC_MESSAGES/evolution-rss.mo
share/locale/th/LC_MESSAGES/evolution-rss.mo
share/locale/zh_CN/LC_MESSAGES/evolution-rss.mo
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/evolution-rss.schemas