Hi,
this is the diff to update sylpheed to latest release with my patch in addition
to avoid few segfaults (more information:
http://sylpheed.sraoss.jp/redmine/issues/215).
ok?
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/sylpheed/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- Makefile 9 Apr 2014 19:23:55 -0000 1.103
+++ Makefile 20 Jul 2014 14:39:22 -0000
@@ -2,7 +2,7 @@
COMMENT = lightweight and user-friendly e-mail client
-DISTNAME = sylpheed-3.4.1
+DISTNAME = sylpheed-3.4.2
SHARED_LIBS += sylph-0 3.0 # 3.0
SHARED_LIBS += sylpheed-plugin-0 3.0 # 3.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/sylpheed/distinfo,v
retrieving revision 1.51
diff -u -p -r1.51 distinfo
--- distinfo 9 Apr 2014 19:23:55 -0000 1.51
+++ distinfo 20 Jul 2014 14:39:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (sylpheed-3.4.1.tar.gz) = IZaApOcg5spDD7Vhb5zRbN9PYEL/4HeU98yXbpjRgsw=
-SIZE (sylpheed-3.4.1.tar.gz) = 5139049
+SHA256 (sylpheed-3.4.2.tar.gz) = pMR7VwpbVl0U/5kzzy4D/LiVA0wfBy+c0sSphnovImM=
+SIZE (sylpheed-3.4.2.tar.gz) = 5135661
Index: patches/patch-libsylph_procmime_c
===================================================================
RCS file: /cvs/ports/mail/sylpheed/patches/patch-libsylph_procmime_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-libsylph_procmime_c
--- patches/patch-libsylph_procmime_c 5 Mar 2011 18:11:04 -0000 1.6
+++ patches/patch-libsylph_procmime_c 20 Jul 2014 14:39:22 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libsylph_procmime_c,v 1.6 2011/03/05 18:11:04 rpointel Exp $
---- libsylph/procmime.c.orig Mon Jan 24 10:21:54 2011
-+++ libsylph/procmime.c Sat Mar 5 19:00:17 2011
-@@ -1542,7 +1542,7 @@ static GHashTable *procmime_get_mime_type_table(void)
+--- libsylph/procmime.c.orig Thu Nov 28 07:34:13 2013
++++ libsylph/procmime.c Fri Jul 18 09:21:17 2014
+@@ -1585,7 +1585,7 @@ static GHashTable *procmime_get_mime_type_table(void)
procmime_get_mime_type_list(SYSCONFDIR "/mime.types");
if (!mime_type_list)
mime_type_list =
Index: patches/patch-src_gtkutils_c
===================================================================
RCS file: patches/patch-src_gtkutils_c
diff -N patches/patch-src_gtkutils_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gtkutils_c 20 Jul 2014 14:39:22 -0000
@@ -0,0 +1,39 @@
+$OpenBSD$
+
+issue 215: http://sylpheed.sraoss.jp/redmine/issues/215
+
+--- src/gtkutils.c.orig Thu Feb 10 07:53:45 2011
++++ src/gtkutils.c Fri Jul 18 09:29:46 2014
+@@ -912,18 +912,22 @@ void gtkut_text_buffer_insert_with_tag_by_name(GtkText
+ if (len < 0)
+ len = strlen(text);
+
+- gtk_text_buffer_insert_with_tags_by_name
+- (buffer, iter, text, len, tag, NULL);
++ if(len > 0)
++ {
+
+- if (text[len - 1] != '\n') {
+- /* somehow returns invalid value first (bug?),
+- so call it twice */
+- gtk_text_iter_get_chars_in_line(iter);
+- if (gtk_text_iter_get_chars_in_line(iter) > MAX_TEXT_LINE_LEN) {
+- gtk_text_buffer_insert_with_tags_by_name
+- (buffer, iter, "\n", 1, tag, NULL);
++ gtk_text_buffer_insert_with_tags_by_name
++ (buffer, iter, text, len, tag, NULL);
++
++ if (text[len - 1] != '\n') {
++ /* somehow returns invalid value first (bug?),
++ so call it twice */
++ gtk_text_iter_get_chars_in_line(iter);
++ if (gtk_text_iter_get_chars_in_line(iter) >
MAX_TEXT_LINE_LEN) {
++ gtk_text_buffer_insert_with_tags_by_name
++ (buffer, iter, "\n", 1, tag, NULL);
++ }
+ }
+- }
++ }
+ }
+
+ gchar *gtkut_text_view_get_selection(GtkTextView *textview)
