Stuart Henderson <[email protected]> writes:
> On 2011-06-11, Guillaume Pinot <[email protected]> wrote:
> > This bug impacts me:
> > http://lists.claws-mail.org/pipermail/commits/2011-April/001364.html
> > and according to #openbsd, at least an other person. So, here is the
> > port's patch. Thanks in advance.
>
> Saying "#openbsd" without specifying the network doesn't say much :)
Oups, sorry, on freenode.
> Please bump REVISION-main only and add a comment to the patch
> with the URL of the list post, then it's ok sthen@
New version:
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/claws-mail/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 21 Apr 2011 13:10:42 -0000 1.44
+++ Makefile 12 Jun 2011 13:29:42 -0000
@@ -9,6 +9,7 @@ COMMENT-spamassassin= spamassassin plugi
V= 3.7.9
DISTNAME= claws-mail-${V}
+REVISION-main= 0
PKGNAME-main= ${DISTNAME}
PKGNAME-bogofilter= claws-mail-bogofilter-${V}
PKGNAME-spamassassin= claws-mail-spamassassin-${V}
Index: patches/patch-src_main_c
===================================================================
RCS file: patches/patch-src_main_c
diff -N patches/patch-src_main_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_main_c 12 Jun 2011 13:29:42 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix a segfault at startup. Already committed upstream:
+ http://lists.claws-mail.org/pipermail/commits/2011-April/001364.html
+
+--- src/main.c.orig Sat Jun 11 18:19:00 2011
++++ src/main.c Sat Jun 11 18:19:32 2011
+@@ -331,7 +331,7 @@ static void startup_notification_complete(gboolean wit
+ gtk_widget_show(hack);
+ }
+
+- xdisplay = gdk_display_get_default();
++ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ sn_display = sn_display_new(xdisplay,
+ sn_error_trap_push,
+ sn_error_trap_pop);
