From a40efc58bb0fc89fb0b5acde0b015218343e2180 Mon Sep 17 00:00:00 2001 From: landry Date: Mon, 13 Jun 2011 20:52:26 +0000 Subject: [PATCH] Fix a crash at startup when notification plugin is enabled, fix from upstream bug http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2414 From Guillaume Pinot on ports@, thanks! ok sthen@ --- mail/claws-mail/Makefile | 3 ++- mail/claws-mail/patches/patch-src_main_c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 mail/claws-mail/patches/patch-src_main_c diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index ddb24fdcccd..443efd9aeba 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2011/04/21 13:10:42 landry Exp $ +# $OpenBSD: Makefile,v 1.45 2011/06/13 20:52:26 landry Exp $ SHARED_ONLY= Yes @@ -9,6 +9,7 @@ COMMENT-spamassassin= spamassassin plugin 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} diff --git a/mail/claws-mail/patches/patch-src_main_c b/mail/claws-mail/patches/patch-src_main_c new file mode 100644 index 00000000000..ab0f0fbc591 --- /dev/null +++ b/mail/claws-mail/patches/patch-src_main_c @@ -0,0 +1,16 @@ +$OpenBSD: patch-src_main_c,v 1.1 2011/06/13 20:52:26 landry Exp $ + +Fix a segfault at startup, from upstream bug #2414: +http://lists.claws-mail.org/pipermail/commits/2011-April/001364.html +http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2414 +--- 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);