cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to a newer git snapshot.

Browse Source
This commit is contained in:
ajacoutot 2011-10-07 08:22:04 +00:00
parent 9d75e41261
commit c2314619a8
8 changed files with 12 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mail/evolution-rss/Makefile
View File

@ -1,14 +1,11 @@
# $OpenBSD: Makefile,v 1.9 2011/09/28 09:51:36 jasper Exp $
# $OpenBSD: Makefile,v 1.10 2011/10/07 08:22:04 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= RSS reader plugin for evolution
GNOME_PROJECT= evolution-rss
GNOME_VERSION= 0.2.90-20110621
PKGNAME= evolution-rss-${GNOME_VERSION:S/-/./}
REVISION= 7
GNOME_VERSION= 0.2.90.20111007
CATEGORIES= mail
@ -37,7 +34,7 @@ WANTLIB += gtk-3 gtkhtml-4.0 gtkhtml-editor-4.0 ical icalss icalvcal
WANTLIB += krb5 kvm m nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs
WANTLIB += smime3 soup-2.4 soup-gnome-2.4 sqlite3 ssl3 stdc++
WANTLIB += xcb xcb-render xcb-shm xml2 z
WANTLIB += xcb xcb-render xcb-shm xml2 z dbus-glib-1 softokn3
WANTLIB += lib/evolution/${EVO_VERSION}/eshell
WANTLIB += lib/evolution/${EVO_VERSION}/eutil
@ -61,7 +58,6 @@ CONFIGURE_ARGS= --disable-gecko \
### XXX remove this chunk when updating to a 'real' release ############
MASTER_SITES= http://distfiles.bsdfrog.org/
WRKDIST= ${WRKDIR}/evolution-rss-0.2.90
BUILD_DEPENDS += x11/gnome/common \
devel/autoconf/${AUTOCONF_VERSION} \
@ -83,8 +79,8 @@ do-configure:
--disable-silent-rules --enable-shared
### end XXX ############################################################
pre-configure:
perl -pi -e 's,sed -i -e,perl -pi -e,g' ${WRKSRC}/src/Makefile.in
#pre-configure:
# perl -pi -e 's,sed -i -e,perl -pi -e,g' ${WRKSRC}/src/Makefile.in
# XXX the desktop file is there for "News" category integration by other
# applications -- unfortunately, setting NoDisplay= or ShowOnlyIn= will

10
mail/evolution-rss/distinfo
View File

@ -1,5 +1,5 @@
MD5 (evolution-rss-0.2.90-20110621.tar.gz) = pfiS8TxC2zKbF9IkJVX0bg==
RMD160 (evolution-rss-0.2.90-20110621.tar.gz) = bsGSOybkMILcB1SRlWLGf3V6Skw=
SHA1 (evolution-rss-0.2.90-20110621.tar.gz) = FtNiDAK9JzQ3aZpxzvnz4UKhavc=
SHA256 (evolution-rss-0.2.90-20110621.tar.gz) = hEG966Gvg/vY87g3sD3cR41x9lxUEjMNg8EUwuHMOgw=
SIZE (evolution-rss-0.2.90-20110621.tar.gz) = 315860
MD5 (evolution-rss-0.2.90.20111007.tar.gz) = BiQaOFxVaPLJhSkh8+sCtw==
RMD160 (evolution-rss-0.2.90.20111007.tar.gz) = KYaZDyvPTIWiK0ZnaRtw8MVBYd0=
SHA1 (evolution-rss-0.2.90.20111007.tar.gz) = mezYQgZ54G4Vyi0NP+sMDYFyTyU=
SHA256 (evolution-rss-0.2.90.20111007.tar.gz) = NN92PN8AJLn9NYkyyFpRXujbpT1K1Viz5I4fYvM3jYk=
SIZE (evolution-rss-0.2.90.20111007.tar.gz) = 321562

17
mail/evolution-rss/patches/patch-configure_ac
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2011/09/22 10:55:13 jasper Exp $
From 5f8a0864469b0e778216b5ceb13a10caaa418990 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Sat, 16 Jul 2011 12:57:01 +0000
Subject: Remove G_DISABLE_DEPRECATED.
--- configure.ac.orig Thu Sep 22 12:42:58 2011
+++ configure.ac Thu Sep 22 12:43:05 2011
@@ -14,7 +14,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
-DPANGO_DISABLE_DEPRECATED
-DGDK_PIXBUF_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED
- -DGTK_DISABLE_DEPRECATED
-DG_DISABLE_SINGLE_INCLUDES
-DGTK_DISABLE_SINGLE_INCLUDES
-DGSEAL_ENABLE

15
mail/evolution-rss/patches/patch-src_evolution-import-rss_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_evolution-import-rss_c,v 1.1 2011/09/12 07:26:19 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=654591
--- src/evolution-import-rss.c.orig Thu Jul 14 08:00:11 2011
+++ src/evolution-import-rss.c Thu Jul 14 08:00:17 2011
@@ -33,7 +33,7 @@
#include <gio/gio.h>
#define d(x)
-#define EVOLUTION "/opt/gnome-dev/bin/evolution&"
+#define EVOLUTION "evolution&"
#define RSS_DBUS_PATH "/org/gnome/feed/Reader"
#define RSS_DBUS_SERVICE "org.gnome.feed.Reader"

18
mail/evolution-rss/patches/patch-src_parser_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_parser_c,v 1.3 2011/09/22 10:55:13 jasper Exp $
From 62d6e9a7a68dc90abd244431afb47de9826cb423 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Thu, 07 Jul 2011 20:34:45 +0000
Subject: Avoid camel_stream_printf().
--- src/parser.c.orig Sun Jun 19 17:27:29 2011
+++ src/parser.c Thu Sep 22 12:43:43 2011
@@ -185,7 +185,7 @@ xml_parse_sux (const char *buf, int len)
* application/ is often misdetected as text/html
*/
mime_type = g_content_type_guess(NULL, (guchar *)buf, 100, &uncertain);
- dp("mime:%s, uncertain:%d\n", mime_type, uncertain);
+ d("mime:%s, uncertain:%d\n", mime_type, uncertain);
//feeding parsed anything other than xml results in blocking delays
//it's possible we can relax parser by using xmlErrorFunc
//UPDATE: add text/* - but exclude text/html I've seen huge delays because of this

36
mail/evolution-rss/patches/patch-src_rss-config-factory_c
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-src_rss-config-factory_c,v 1.4 2011/09/22 10:55:13 jasper Exp $
From a7d886e3e383484ded07d9808eb8ada16ab1ca9c Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Thu, 11 Aug 2011 19:34:50 +0000
Subject: adapt to latest evolution changes
--- src/rss-config-factory.c.orig Sun Jun 19 17:27:29 2011
+++ src/rss-config-factory.c Thu Sep 22 12:46:44 2011
@@ -465,6 +465,9 @@ folder_cb (GtkWidget *widget, gpointer data)
GError *error = NULL;
EMFolderSelector *selector;
EMFolderTree *folder_tree;
+#if EVOLUTION_VERSION >= 30101
+ EMFolderTreeModel *model;
+#endif
#else
GtkWidget *folder_tree;
#endif
@@ -482,10 +485,16 @@ folder_cb (GtkWidget *widget, gpointer data)
window = e_mail_reader_get_window (reader);
+#if EVOLUTION_VERSION >= 30103
+ model = em_folder_tree_model_get_default ();
+#endif
dialog = em_folder_selector_new (
window,
#if EVOLUTION_VERSION >= 30101
backend,
+#if EVOLUTION_VERSION >= 30103
+ model,
+#endif
#else
EM_FOLDER_TREE (folder_tree),
#endif

279
mail/evolution-rss/patches/patch-src_rss_c
View File

@ -1,279 +0,0 @@
$OpenBSD: patch-src_rss_c,v 1.4 2011/09/22 10:55:13 jasper Exp $
From 62d6e9a7a68dc90abd244431afb47de9826cb423 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Thu, 07 Jul 2011 20:34:45 +0000
Subject: Avoid camel_stream_printf().
--- src/rss.c.orig Sun Jun 19 17:27:29 2011
+++ src/rss.c Thu Sep 22 12:43:43 2011
@@ -2174,6 +2174,7 @@ void org_gnome_cooly_format_rss(void *ep, EMFormatHook
GdkPixbuf *pix;
gchar *feed_dir, *feed_file, *iconfile;
gchar *tmp_path, *tmp_file;
+ gchar *str;
#if EVOLUTION_VERSION >= 22900 //kb//
GdkColor color;
#endif
@@ -2261,10 +2262,11 @@ void org_gnome_cooly_format_rss(void *ep, EMFormatHook
pobj->website = g_strstrip(g_strdup((gchar *)website));
pobj->stream = t->stream;
pobj->object.free = free_rss_controls;
- camel_stream_printf (
- t->stream,
+ str = g_strdup_printf (
"<object classid=%s></object>\n",
classid);
+ camel_stream_write_string (t->stream, str, NULL, NULL);
+ g_free(str);
g_free (classid);
@@ -2288,14 +2290,18 @@ void org_gnome_cooly_format_rss(void *ep, EMFormatHook
pobj->format = (EMFormatHTML *)t->format;
pobj->object.free = free_rss_browser;
pobj->part = t->part;
- camel_stream_printf(t->stream,
+ str = g_strdup_printf (
"<table style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\" cellpadding=1 cellspacing=0><tr><td align=center>",
frame_colour & 0xffffff,
frame_colour & 0xffffff,
text_colour & 0xffffff);
- camel_stream_printf (t->stream,
+ camel_stream_write_string (t->stream, str, NULL, NULL);
+ g_free (str);
+ str = g_strdup_printf (
"<object classid=%s></object></td></tr></table>",//</div>\n",
classid);
+ camel_stream_write_string (t->stream, str, NULL, NULL);
+ g_free (str);
g_free (classid);
goto out;
}
@@ -2306,16 +2312,17 @@ void org_gnome_cooly_format_rss(void *ep, EMFormatHook
//we do not need to setup a pop error menu since we're in
//formatting process. But instead display mail body an error
//such proxy error or transport error
- camel_stream_printf (t->stream,
+ str = g_strdup_printf (
"<div style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\">\n",
frame_colour & 0xffffff,
content_colour & 0xffffff,
text_colour & 0xffffff);
- camel_stream_printf(t->stream,
- "<div style=\"border: solid 0px; padding: 4px;\">\n");
- camel_stream_printf (t->stream, "<h3>Error!</h3>");
- camel_stream_printf (t->stream, "%s", err->message);
- camel_stream_printf (t->stream, "</div>");
+ camel_stream_write_string (t->stream, str, NULL, NULL);
+ g_free (str);
+ camel_stream_write_string (t->stream, "<div style=\"border: solid 0px; padding: 4px;\">\n", NULL, NULL);
+ camel_stream_write_string (t->stream, "<h3>Error!</h3>", NULL, NULL);
+ camel_stream_write_string (t->stream, err->message, NULL, NULL);
+ camel_stream_write_string (t->stream, "</div>", NULL, NULL);
goto out;
}
@@ -2329,30 +2336,39 @@ void org_gnome_cooly_format_rss(void *ep, EMFormatHook
} else
goto out;
- camel_stream_printf (fstream,
+ str = g_strdup_printf (
"<div style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\">\n",
frame_colour & 0xffffff,
content_colour & 0xffffff,
text_colour & 0xffffff);
- camel_stream_printf (fstream,
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
+ str = g_strdup_printf (
"<div style=\"border: solid 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
"<b><font size=+1><a href=%s>%s</a></font></b></div>",
content_colour & 0xEDECEB & 0xffffff,
text_colour & 0xffffff,
website, subject);
- if (category)
- camel_stream_printf(fstream,
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
+ if (category) {
+ str = g_strdup_printf (
"<div style=\"border: solid 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
"<b><font size=-1>%s: %s</font></b></div>",
content_colour & 0xEDECEB & 0xffffff, text_colour & 0xffffff,
_("Posted under"), category);
- camel_stream_printf (fstream,
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
+ }
+ str = g_strdup_printf (
"<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
"%s</div>",
frame_colour & 0xffffff,
content_colour & 0xffffff,
text_colour & 0xffffff,
buff);
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
g_string_free(content, 1);
} else {
@@ -2479,15 +2495,16 @@ pixdone: g_free(real_image);
feed_file = g_strdup(tmp_path);
#endif
- camel_stream_printf (
- fstream,
+ str = g_strdup_printf (
"<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 2px; color: #%06x;\">",
frame_colour & 0xffffff,
content_colour & 0xEDECEB & 0xffffff,
text_colour & 0xffffff);
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
if (g_file_test(tmp_path, G_FILE_TEST_EXISTS)){
if ((pixbuf = gdk_pixbuf_new_from_file(tmp_path, NULL))) {
- camel_stream_printf (fstream,
+ str = g_strdup_printf (
"<div style=\"border: solid 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
"<img height=16 src=%s>"
"<b><font size=+1><a href=%s>%s</a></font></b></div>",
@@ -2496,6 +2513,8 @@ pixdone: g_free(real_image);
feed_file,
website,
subject);
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
g_object_unref(pixbuf);
g_free(feed_file);
goto render_body;
@@ -2511,38 +2530,47 @@ pixdone: g_free(real_image);
iconfile = g_strdup(tmp_file);
#endif
g_free(tmp_file);
- camel_stream_printf (fstream,
+ str = g_strdup_printf (
"<div style=\"border: solid 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
"<img height=16 src=%s>"
"<b><font size=+1><a href=%s>%s</a></font></b></div>",
content_colour & 0xEDECEB & 0xffffff, text_colour & 0xffffff,
iconfile, website, subject);
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
g_free(iconfile);
g_free(feed_file);
-render_body: if (category)
- camel_stream_printf(fstream,
+render_body: if (category) {
+ str = g_strdup_printf (
"<div style=\"border: solid 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
"<b><font size=-1>Posted under: %s</font></b></div>",
content_colour & 0xEDECEB & 0xffffff,
text_colour & 0xffffff,
category);
- camel_stream_printf (fstream,
- "<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 10px; color: #%06x;\">"
- "%s</div>",
- frame_colour & 0xffffff,
- content_colour & 0xffffff,
- text_colour & 0xffffff,
- buff);
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
+ }
+ str = g_strdup_printf (
+ "<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 10px; color: #%06x;\">"
+ "%s</div>",
+ frame_colour & 0xffffff,
+ content_colour & 0xffffff,
+ text_colour & 0xffffff,
+ buff);
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
if (comments && gconf_client_get_bool (rss_gconf,
GCONF_KEY_SHOW_COMMENTS,
NULL)) {
if (commstream) {
- camel_stream_printf (fstream,
+ str = g_strdup_printf (
"<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 2px; color: #%06x;\">",
frame_colour & 0xffffff,
content_colour & 0xEDECEB & 0xffffff,
text_colour & 0xffffff);
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
result = print_comments(comments, commstream, (EMFormatHTML *)t->format);
g_free(commstream);
rfrclsid = g_strdup_printf ("org-gnome-rss-controls-%d",
@@ -2558,15 +2586,19 @@ render_body: if (category)
pobj->website = g_strdup(comments);
//this might not be needed but we want to make sure po->html is destroyed
pobj->object.free = free_rss_controls;
- camel_stream_printf(fstream,
+ str = g_strdup_printf (
"<object height=25 classid=%s></object>", rfrclsid);
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
if (result && strlen(result)) {
- camel_stream_printf(fstream,
+ str = g_strdup_printf (
"<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 10px; color: #%06x;\">%s",
frame_colour & 0xffffff,
content_colour & 0xffffff,
text_colour & 0xffffff,
result);
+ camel_stream_write_string (fstream, str, NULL, NULL);
+ g_free (str);
g_free(result);
}
g_free(rfrclsid);
@@ -2576,9 +2608,9 @@ render_body: if (category)
rf->hr, g_strstrip(feedid)));
fetch_comments(comments, g_strdup(uri), (EMFormatHTML *)t->format);
}
- camel_stream_printf (fstream, "</div>");
+ camel_stream_write_string (fstream, "</div>", NULL, NULL);
}
- camel_stream_printf (fstream, "</div>");
+ camel_stream_write_string (fstream, "</div>", NULL, NULL);
}
//this is required for proper charset rendering when html
@@ -2617,16 +2649,19 @@ out: if (addr)
g_free(addr);
return;
fmerror:
- camel_stream_printf (t->stream,
+ str = g_strdup_printf (
"<div style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\">\n",
frame_colour & 0xffffff, content_colour & 0xffffff, text_colour & 0xffffff);
- camel_stream_printf(t->stream,
- "<div style=\"border: solid 0px; padding: 4px;\">\n");
- camel_stream_printf (t->stream,
+ camel_stream_write_string (t->stream, str, NULL, NULL);
+ g_free (str);
+ camel_stream_write_string (t->stream,
+ "<div style=\"border: solid 0px; padding: 4px;\">\n",
+ NULL, NULL);
+ camel_stream_write_string (t->stream,
"<h3>Formatting error!</h3>"
- "Feed article corrupted! Cannot format article.");
- camel_stream_printf (t->stream,
- "</div></div>");
+ "Feed article corrupted! Cannot format article.",
+ NULL, NULL);
+ camel_stream_write_string (t->stream, "</div></div>", NULL, NULL);
return;
}
@@ -5139,7 +5174,7 @@ create_mail(create_feed *CF)
camel_content_type_unref (type);
stream = camel_stream_mem_new ();
// w/out an format argument this throws and seg fault
- camel_stream_printf (stream, "%s", CF->body);
+ camel_stream_write_string (stream, CF->body, NULL, NULL);
#if (DATASERVER_VERSION >= 2033001)
/*FIXME may block */
camel_data_wrapper_construct_from_stream_sync (rtext, stream, NULL, NULL);

3
mail/evolution-rss/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2011/09/12 07:26:19 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/10/07 08:22:04 ajacoutot Exp $
@pkgpath mail/evolution-plugin-rss
@bin bin/evolution-import-rss
@comment lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.a
@ -30,6 +30,7 @@ share/locale/el/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/eu/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