2006-10-21 [paul] 2.5.6cvs4

	* src/gtk/authors.h
	* src/plugins/pgpcore/pgp_viewer.c
	* src/plugins/pgpcore/sgpgme.c
		fix building on BSDs
		Thanks to Michael Hughes
		<Sylpheed-Claws_user@thehugheslogcabin.net>

diff --git a/ChangeLog b/ChangeLog
index 8a555bb4fe708d2eaad07cf034daaeda51bc1666..09b102fb06d2c20af53164010a68172b6996c307 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-21 [paul]      2.5.6cvs4
+
+       * src/gtk/authors.h
+       * src/plugins/pgpcore/pgp_viewer.c
+       * src/plugins/pgpcore/sgpgme.c
+               fix building on BSDs
+               Thanks to Michael Hughes
+               <Sylpheed-Claws_user@thehugheslogcabin.net>
+
 2006-10-20 [colin]     2.5.6cvs3
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 279d7d9e9d0e2280ddc85880af23157df16a4845..19c9a7b9d9ee7b983a6fd3a363cc382874441d2e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2006,3 +2006,4 @@
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 manual/handling.xml;  ) > 2.5.5cvs18.patchset
 ( cvs diff -u -r 1.274.2.152 -r 1.274.2.153 src/mainwindow.c;  cvs diff -u -r 1.39.2.24 -r 1.39.2.25 src/mainwindow.h;  cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/gtk/quicksearch.c;  cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/plugins/trayicon/Makefile.am;  diff -u /dev/null src/plugins/trayicon/newmail.offline.xpm;  diff -u /dev/null src/plugins/trayicon/newmarkedmail.offline.xpm;  diff -u /dev/null src/plugins/trayicon/nomail.offline.xpm;  cvs diff -u -r 1.14.2.39 -r 1.14.2.40 src/plugins/trayicon/trayicon.c;  diff -u /dev/null src/plugins/trayicon/unreadmail.offline.xpm;  diff -u /dev/null src/plugins/trayicon/unreadmarkedmail.offline.xpm;  ) > 2.5.6cvs2.patchset
 ( cvs diff -u -r 1.654.2.2059 -r 1.654.2.2060 configure.ac;  cvs diff -u -r 1.179.2.133 -r 1.179.2.134 src/imap.c;  cvs diff -u -r 1.36.2.85 -r 1.36.2.86 src/common/utils.c;  cvs diff -u -r 1.20.2.39 -r 1.20.2.40 src/common/utils.h;  cvs diff -u -r 1.1.4.52 -r 1.1.4.53 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/etpan/imap-thread.h;  ) > 2.5.6cvs3.patchset
+( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/gtk/authors.h;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/pgp_viewer.c;  cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/plugins/pgpcore/sgpgme.c;  ) > 2.5.6cvs4.patchset

diff --git a/configure.ac b/configure.ac
index c8ed5ec0f060b2d00d2ad036c268ce46bc32a3dc..17ee5d9cfe0b23e8d70fa45c946615dcf15f711a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 1a92737441bad51da105393302c2c4adcb284875..579283c784008ad4ffe9fe427d4fee6c9bd01eeb 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -122,6 +122,7 @@ static char *CONTRIBS_LIST[] = {
 "Marc Hoper",
 "Michihide Hotta",
 "Shawn Houston",
+"Michael Hughes",
 "Chideok Hwang",
 "John E.P. Hynes",
 "Hironori IWANE",

diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index fffc82a71d56a120e779d7dd7c9fcf3b6aa2a9d6..d5e2a38f618fceca3e222a83e4a4a85f87ddeebd 100644 (file)
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -27,6 +27,9 @@
 #include <glib/gi18n.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
+#  include <sys/signal.h>
+#endif
 
 #include "version.h"
 #include "common/sylpheed.h"

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index a4c744475fd820277e8a643ee95005e59a1ee7d1..b09805086e8a37b4a0304c80a9ecae9dc531b5ee 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -32,6 +32,9 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
+#  include <sys/signal.h>
+#endif
 #ifndef G_OS_WIN32
 #include <sys/mman.h>
 #endif