From 3995a9f1826eddb1c386e32c5cdfd375f08970e6 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sat, 21 Oct 2006 08:45:04 +0000 Subject: [PATCH] 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 --- ChangeLog | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/authors.h | 1 + src/plugins/pgpcore/pgp_viewer.c | 3 +++ src/plugins/pgpcore/sgpgme.c | 3 +++ 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8a555bb4f..09b102fb0 100644 --- 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 + + 2006-10-20 [colin] 2.5.6cvs3 * configure.ac diff --git a/PATCHSETS b/PATCHSETS index 279d7d9e9..19c9a7b9d 100644 --- 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 c8ed5ec0f..17ee5d9cf 100644 --- 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 1a9273744..579283c78 100644 --- 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 fffc82a71..d5e2a38f6 100644 --- a/src/plugins/pgpcore/pgp_viewer.c +++ b/src/plugins/pgpcore/pgp_viewer.c @@ -27,6 +27,9 @@ #include #include #include +#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__)) +# include +#endif #include "version.h" #include "common/sylpheed.h" diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c index a4c744475..b09805086 100644 --- a/src/plugins/pgpcore/sgpgme.c +++ b/src/plugins/pgpcore/sgpgme.c @@ -32,6 +32,9 @@ #include #include #include +#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__)) +# include +#endif #ifndef G_OS_WIN32 #include #endif -- 2.25.1