Wed Jul 24 20:11:40 2013 UTC ()

fix to claws-mail to build on systems without flock (namely SunOS)


(richard)

diff -r1.23 -r1.24 pkgsrc/mail/claws-mail/distinfo
diff -r0 -r1.1 pkgsrc/mail/claws-mail/patches/patch-src_main.c

--- pkgsrc/mail/claws-mail/distinfo 2013/07/24 15:26:11 1.23
+++ pkgsrc/mail/claws-mail/distinfo 2013/07/24 20:11:40 1.24

 @@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.23 2013/07/24 15:26:11 drochner Exp $
+$NetBSD: distinfo,v 1.24 2013/07/24 20:11:40 richard Exp $
 SHA1 (claws-mail-3.9.2.tar.bz2) = 73c91b3c742d1ababc734bfac39961831e55eb38
 RMD160 (claws-mail-3.9.2.tar.bz2) = 7a8d201913a078708761ae492e7e362848a36df1
 Size (claws-mail-3.9.2.tar.bz2) = 9413758 bytes
 SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
 SHA1 (patch-ae) = f1991ef4e31bd6a7cbddf6655f489f72fb40308b
 SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
 SHA1 (patch-ag) = c5c3d16343437aedb9c899bec151338aea9fbbfb
 SHA1 (patch-ah) = cdfd816669c0c1ae6dba0d97a6d1fe5a8c2e4626
 SHA1 (patch-ai) = 22b9ad0763ee3053f8b3082a639991b6574e6f65
 SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
 SHA1 (patch-src_main.c) = 6cb30f2813d3ccb8319654c7ef462efec2ece9de

$NetBSD: patch-src_main.c,v 1.1 2013/07/24 20:11:40 richard Exp $

unhide variable declaration behind flock conditional.

--- src/main.c.orig	2013-03-20 11:13:35.000000000 +0000
+++ src/main.c
@@ -2367,10 +2367,10 @@ static gint prohibit_duplicate_launch(vo
 		x_display = g_strdup(g_getenv("DISPLAY"));
 
 	if (uxsock < 0) {
+		gint ret;
 #if HAVE_FLOCK
 		gchar *socket_lock;
 		gint lock_fd;
-		gint ret;
 		/* If connect failed, no other process is running.
 		 * Unlink the potentially existing socket, then
 		 * open it. This has to be done locking a temporary