From e437a5f78900f5cf4cbdcc152891c372ce7bd1da Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 6 May 2012 17:53:44 +0000 Subject: Fix build with latest glib2. Based on patches from David Shao in PR 46392. --- chat/meanwhile/distinfo | 20 +++++++++++++++++++- chat/meanwhile/patches/patch-src_channel_c | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_mw__debug_c | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_mw__message_h | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_mw__srvc__conf_h | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_mw__srvc__dir_h | 14 ++++++++++++++ chat/meanwhile/patches/patch-src_mw__srvc__place_h | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_mw__srvc__resolve_h | 14 ++++++++++++++ chat/meanwhile/patches/patch-src_mw__st__list_h | 14 ++++++++++++++ chat/meanwhile/patches/patch-src_mw__util_h | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_srvc__aware_c | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_srvc__conf_c | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_srvc__dir_c | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_srvc__ft_c | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_srvc__im_c | 14 ++++++++++++++ chat/meanwhile/patches/patch-src_srvc__place_c | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_srvc__resolve_c | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_srvc__store_c | 15 +++++++++++++++ chat/meanwhile/patches/patch-src_st__list_c | 15 +++++++++++++++ 19 files changed, 285 insertions(+), 1 deletion(-) create mode 100644 chat/meanwhile/patches/patch-src_channel_c create mode 100644 chat/meanwhile/patches/patch-src_mw__debug_c create mode 100644 chat/meanwhile/patches/patch-src_mw__message_h create mode 100644 chat/meanwhile/patches/patch-src_mw__srvc__conf_h create mode 100644 chat/meanwhile/patches/patch-src_mw__srvc__dir_h create mode 100644 chat/meanwhile/patches/patch-src_mw__srvc__place_h create mode 100644 chat/meanwhile/patches/patch-src_mw__srvc__resolve_h create mode 100644 chat/meanwhile/patches/patch-src_mw__st__list_h create mode 100644 chat/meanwhile/patches/patch-src_mw__util_h create mode 100644 chat/meanwhile/patches/patch-src_srvc__aware_c create mode 100644 chat/meanwhile/patches/patch-src_srvc__conf_c create mode 100644 chat/meanwhile/patches/patch-src_srvc__dir_c create mode 100644 chat/meanwhile/patches/patch-src_srvc__ft_c create mode 100644 chat/meanwhile/patches/patch-src_srvc__im_c create mode 100644 chat/meanwhile/patches/patch-src_srvc__place_c create mode 100644 chat/meanwhile/patches/patch-src_srvc__resolve_c create mode 100644 chat/meanwhile/patches/patch-src_srvc__store_c create mode 100644 chat/meanwhile/patches/patch-src_st__list_c (limited to 'chat') diff --git a/chat/meanwhile/distinfo b/chat/meanwhile/distinfo index 723a796dff7..21ebe7dd398 100644 --- a/chat/meanwhile/distinfo +++ b/chat/meanwhile/distinfo @@ -1,5 +1,23 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/08/13 05:29:27 dan Exp $ +$NetBSD: distinfo,v 1.2 2012/05/06 17:53:44 dholland Exp $ SHA1 (meanwhile-1.0.2.tar.gz) = e0e9836581da3c4a569135cb238eaa566c324540 RMD160 (meanwhile-1.0.2.tar.gz) = 2ae78a2f5586c1a106c462c19018872308dd6af0 Size (meanwhile-1.0.2.tar.gz) = 479325 bytes +SHA1 (patch-src_channel_c) = 766515d353e300d9ad40ca00ef5dd04ebf7b21a6 +SHA1 (patch-src_mw__debug_c) = b252c02f93baf3799bd236d3f8ac71d2d6f46914 +SHA1 (patch-src_mw__message_h) = 73b49c091d6bd63dbf47f9810ad251bcd988b6e0 +SHA1 (patch-src_mw__srvc__conf_h) = 6e158b22f8c04608709d6acdc65f8369504d1239 +SHA1 (patch-src_mw__srvc__dir_h) = 218abf514be5df08763807bcbd0d1b1dea6cc5b1 +SHA1 (patch-src_mw__srvc__place_h) = bd6202959869c3d15b62b361940c53e22e84a4a7 +SHA1 (patch-src_mw__srvc__resolve_h) = 7262f518e6c3d788e4951535b15b8807fb5eed96 +SHA1 (patch-src_mw__st__list_h) = e2a070ec54193e82b293d8a8bacad8a02665c483 +SHA1 (patch-src_mw__util_h) = 13377d9e31ed12755b204a24d8e6e084b94d5ce6 +SHA1 (patch-src_srvc__aware_c) = 2004f3f5c6c75d8b300dc03397615e6ba51ff73b +SHA1 (patch-src_srvc__conf_c) = fbce4507977ef4d6b8583593b4481bf899c1e500 +SHA1 (patch-src_srvc__dir_c) = bee63617fea6fe1a72c2aad1691cbe2c805fd175 +SHA1 (patch-src_srvc__ft_c) = a62d27961a3c6bb9fc97ac1399013dcde5d01828 +SHA1 (patch-src_srvc__im_c) = 6acf037b5e285717839f7cf0fbedcaee9ec6aa28 +SHA1 (patch-src_srvc__place_c) = ac18e9f9b930bfdfae5eca0a554df247efc00bdc +SHA1 (patch-src_srvc__resolve_c) = ebdee8419d3e3558d18208c66a69f283ca5b4489 +SHA1 (patch-src_srvc__store_c) = 66a9035c1ef53547c0793d2b67e633ca7b779b99 +SHA1 (patch-src_st__list_c) = e8b3aad64b9384674b1e2ffde92f9f5494907a60 diff --git a/chat/meanwhile/patches/patch-src_channel_c b/chat/meanwhile/patches/patch-src_channel_c new file mode 100644 index 00000000000..5a3c94c58f5 --- /dev/null +++ b/chat/meanwhile/patches/patch-src_channel_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_channel_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/channel.c~ 2005-12-08 22:04:46.000000000 +0000 ++++ src/channel.c +@@ -19,8 +19,6 @@ + */ + + #include +-#include +-#include + #include + + #include "mw_channel.h" diff --git a/chat/meanwhile/patches/patch-src_mw__debug_c b/chat/meanwhile/patches/patch-src_mw__debug_c new file mode 100644 index 00000000000..87e0391e9cf --- /dev/null +++ b/chat/meanwhile/patches/patch-src_mw__debug_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_mw__debug_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/mw_debug.c~ 2005-12-03 03:46:10.000000000 +0000 ++++ src/mw_debug.c +@@ -19,7 +19,7 @@ + */ + + +-#include ++#include + + #include "mw_debug.h" + diff --git a/chat/meanwhile/patches/patch-src_mw__message_h b/chat/meanwhile/patches/patch-src_mw__message_h new file mode 100644 index 00000000000..27d85a10f84 --- /dev/null +++ b/chat/meanwhile/patches/patch-src_mw__message_h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_mw__message_h,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/mw_message.h~ 2005-12-15 00:30:28.000000000 +0000 ++++ src/mw_message.h +@@ -22,7 +22,7 @@ + #define _MW_MESSAGE_H + + +-#include ++#include + #include "mw_common.h" + + diff --git a/chat/meanwhile/patches/patch-src_mw__srvc__conf_h b/chat/meanwhile/patches/patch-src_mw__srvc__conf_h new file mode 100644 index 00000000000..c649a49f01b --- /dev/null +++ b/chat/meanwhile/patches/patch-src_mw__srvc__conf_h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_mw__srvc__conf_h,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/mw_srvc_conf.h~ 2005-12-15 00:30:28.000000000 +0000 ++++ src/mw_srvc_conf.h +@@ -22,7 +22,7 @@ + #define _MW_SRVC_CONF_H + + +-#include ++#include + #include "mw_common.h" + + diff --git a/chat/meanwhile/patches/patch-src_mw__srvc__dir_h b/chat/meanwhile/patches/patch-src_mw__srvc__dir_h new file mode 100644 index 00000000000..ef5f108b3e4 --- /dev/null +++ b/chat/meanwhile/patches/patch-src_mw__srvc__dir_h @@ -0,0 +1,14 @@ +$NetBSD: patch-src_mw__srvc__dir_h,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/mw_srvc_dir.h~ 2005-12-15 00:30:28.000000000 +0000 ++++ src/mw_srvc_dir.h +@@ -22,7 +22,6 @@ + + + #include +-#include + + + #ifdef __cplusplus diff --git a/chat/meanwhile/patches/patch-src_mw__srvc__place_h b/chat/meanwhile/patches/patch-src_mw__srvc__place_h new file mode 100644 index 00000000000..27ffc0723e1 --- /dev/null +++ b/chat/meanwhile/patches/patch-src_mw__srvc__place_h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_mw__srvc__place_h,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/mw_srvc_place.h~ 2005-12-15 00:30:28.000000000 +0000 ++++ src/mw_srvc_place.h +@@ -22,7 +22,7 @@ + #define _MW_SRVC_PLACE_H + + +-#include ++#include + #include "mw_common.h" + + diff --git a/chat/meanwhile/patches/patch-src_mw__srvc__resolve_h b/chat/meanwhile/patches/patch-src_mw__srvc__resolve_h new file mode 100644 index 00000000000..cd433831a20 --- /dev/null +++ b/chat/meanwhile/patches/patch-src_mw__srvc__resolve_h @@ -0,0 +1,14 @@ +$NetBSD: patch-src_mw__srvc__resolve_h,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/mw_srvc_resolve.h~ 2005-12-15 00:30:28.000000000 +0000 ++++ src/mw_srvc_resolve.h +@@ -23,7 +23,6 @@ + + + #include +-#include + + + #ifdef __cplusplus diff --git a/chat/meanwhile/patches/patch-src_mw__st__list_h b/chat/meanwhile/patches/patch-src_mw__st__list_h new file mode 100644 index 00000000000..f6d1fb6b698 --- /dev/null +++ b/chat/meanwhile/patches/patch-src_mw__st__list_h @@ -0,0 +1,14 @@ +$NetBSD: patch-src_mw__st__list_h,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/mw_st_list.h~ 2005-12-15 00:30:28.000000000 +0000 ++++ src/mw_st_list.h +@@ -30,7 +30,6 @@ + + + #include +-#include + #include "mw_common.h" + + diff --git a/chat/meanwhile/patches/patch-src_mw__util_h b/chat/meanwhile/patches/patch-src_mw__util_h new file mode 100644 index 00000000000..0d2362a505c --- /dev/null +++ b/chat/meanwhile/patches/patch-src_mw__util_h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_mw__util_h,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/mw_util.h~ 2004-12-28 20:41:26.000000000 +0000 ++++ src/mw_util.h +@@ -23,8 +23,6 @@ + + + #include +-#include +-#include + + + #define map_guint_new() \ diff --git a/chat/meanwhile/patches/patch-src_srvc__aware_c b/chat/meanwhile/patches/patch-src_srvc__aware_c new file mode 100644 index 00000000000..e11863e6709 --- /dev/null +++ b/chat/meanwhile/patches/patch-src_srvc__aware_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_srvc__aware_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/srvc_aware.c~ 2005-12-08 22:02:11.000000000 +0000 ++++ src/srvc_aware.c +@@ -19,8 +19,6 @@ + */ + + #include +-#include +-#include + #include + + #include "mw_channel.h" diff --git a/chat/meanwhile/patches/patch-src_srvc__conf_c b/chat/meanwhile/patches/patch-src_srvc__conf_c new file mode 100644 index 00000000000..0dd72a4eac5 --- /dev/null +++ b/chat/meanwhile/patches/patch-src_srvc__conf_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_srvc__conf_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/srvc_conf.c~ 2005-12-28 02:46:54.000000000 +0000 ++++ src/srvc_conf.c +@@ -19,8 +19,6 @@ + */ + + #include +-#include +-#include + + #include + #include diff --git a/chat/meanwhile/patches/patch-src_srvc__dir_c b/chat/meanwhile/patches/patch-src_srvc__dir_c new file mode 100644 index 00000000000..14eec49b04f --- /dev/null +++ b/chat/meanwhile/patches/patch-src_srvc__dir_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_srvc__dir_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/srvc_dir.c~ 2005-09-15 20:30:20.000000000 +0000 ++++ src/srvc_dir.c +@@ -18,7 +18,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include ++#include + + #include "mw_channel.h" + #include "mw_common.h" diff --git a/chat/meanwhile/patches/patch-src_srvc__ft_c b/chat/meanwhile/patches/patch-src_srvc__ft_c new file mode 100644 index 00000000000..4de3a70724a --- /dev/null +++ b/chat/meanwhile/patches/patch-src_srvc__ft_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_srvc__ft_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/srvc_ft.c~ 2005-09-15 20:30:37.000000000 +0000 ++++ src/srvc_ft.c +@@ -19,7 +19,7 @@ + */ + + +-#include ++#include + + #include "mw_channel.h" + #include "mw_common.h" diff --git a/chat/meanwhile/patches/patch-src_srvc__im_c b/chat/meanwhile/patches/patch-src_srvc__im_c new file mode 100644 index 00000000000..387d4961f0b --- /dev/null +++ b/chat/meanwhile/patches/patch-src_srvc__im_c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_srvc__im_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/srvc_im.c~ 2005-12-28 02:46:54.000000000 +0000 ++++ src/srvc_im.c +@@ -19,7 +19,6 @@ + */ + + #include +-#include + #include + + #include "mw_channel.h" diff --git a/chat/meanwhile/patches/patch-src_srvc__place_c b/chat/meanwhile/patches/patch-src_srvc__place_c new file mode 100644 index 00000000000..ffeff90344c --- /dev/null +++ b/chat/meanwhile/patches/patch-src_srvc__place_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_srvc__place_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/srvc_place.c~ 2005-12-03 02:00:29.000000000 +0000 ++++ src/srvc_place.c +@@ -19,8 +19,6 @@ + */ + + #include +-#include +-#include + + #include + #include diff --git a/chat/meanwhile/patches/patch-src_srvc__resolve_c b/chat/meanwhile/patches/patch-src_srvc__resolve_c new file mode 100644 index 00000000000..531dec4cc79 --- /dev/null +++ b/chat/meanwhile/patches/patch-src_srvc__resolve_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_srvc__resolve_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/srvc_resolve.c~ 2005-10-27 00:10:06.000000000 +0000 ++++ src/srvc_resolve.c +@@ -18,7 +18,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include ++#include + + #include "mw_channel.h" + #include "mw_common.h" diff --git a/chat/meanwhile/patches/patch-src_srvc__store_c b/chat/meanwhile/patches/patch-src_srvc__store_c new file mode 100644 index 00000000000..9d5b2f29cf1 --- /dev/null +++ b/chat/meanwhile/patches/patch-src_srvc__store_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_srvc__store_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/srvc_store.c~ 2005-11-19 01:52:42.000000000 +0000 ++++ src/srvc_store.c +@@ -18,7 +18,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include ++#include + + #include "mw_channel.h" + #include "mw_debug.h" diff --git a/chat/meanwhile/patches/patch-src_st__list_c b/chat/meanwhile/patches/patch-src_st__list_c new file mode 100644 index 00000000000..57a27904e5b --- /dev/null +++ b/chat/meanwhile/patches/patch-src_st__list_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_st__list_c,v 1.1 2012/05/06 17:53:44 dholland Exp $ + +Fix build with latest glib2. + +--- src/st_list.c~ 2005-12-08 22:01:27.000000000 +0000 ++++ src/st_list.c +@@ -20,7 +20,7 @@ + + #include + #include +-#include ++#include + + #include "mw_debug.h" + #include "mw_util.h" -- cgit v1.2.3