[csw-devel] SF.net SVN: gar:[20861] csw/mgar/pkg/meanwhile/trunk
lblume at users.sourceforge.net
lblume at users.sourceforge.net
Wed Apr 24 14:14:31 CEST 2013
Revision: 20861
http://gar.svn.sourceforge.net/gar/?rev=20861&view=rev
Author: lblume
Date: 2013-04-24 12:14:28 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
meanwhile/trunk: convert to gar v2, build with gcc, split into a lib and -dev package, rename existing patches to sort them, add patch to build with recent glib.h
Modified Paths:
--------------
csw/mgar/pkg/meanwhile/trunk/Makefile
csw/mgar/pkg/meanwhile/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/meanwhile/trunk/files/0001-broken-status.patch
csw/mgar/pkg/meanwhile/trunk/files/0002-fix_glib_includes.patch
csw/mgar/pkg/meanwhile/trunk/files/0003-doc_dir.patch
csw/mgar/pkg/meanwhile/trunk/files/0004-ft_fix.patch
csw/mgar/pkg/meanwhile/trunk/files/0005-status_timestamp_workaround.patch
Removed Paths:
-------------
csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend
csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec
csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype
csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch
csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch
csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch
csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch
Modified: csw/mgar/pkg/meanwhile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/Makefile 2013-04-24 07:37:54 UTC (rev 20860)
+++ csw/mgar/pkg/meanwhile/trunk/Makefile 2013-04-24 12:14:28 UTC (rev 20861)
@@ -1,33 +1,61 @@
-NAME = meanwhile
+NAME = meanwhile
VERSION = 1.0.2
-GARTYPE = v1
+GARTYPE = v2
#Need to use either gcc or studio 12 with -features=extensions
-GARCOMPILER = GNU
+#GARCOMPILER = GNU
-DESCRIPTION = Open implementation of the lotus sametime community client
+DESCRIPTION = Open implementation of the Lotus sametime community client
define BLURB
The Meanwhile project is an open implementation of the Lotus Sametime client protocol. The project provides a library written in C, a python module, and a Gaim plugin utilizing the library.
endef
MASTER_SITES = $(SF_MIRROR)
DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += $(call admfiles,CSWmeanwhile,depend prototype)
-PATCHFILES += ft_fix.patch
-PATCHFILES += presence_fix_v2.patch
-PATCHFILES += status_timestamp_workaround.patch
-PATCHFILES += doc_dir.patch
+# Patches for status and glib:
+# https://aur.archlinux.org/packages.php?ID=44209&comments=all
+PATCHFILES = 0001-broken-status.patch
+PATCHFILES += 0002-fix_glib_includes.patch
+
+# OpenCSW patches
+PATCHFILES += 0003-doc_dir.patch
+PATCHFILES += 0004-ft_fix.patch
+PATCHFILES += 0005-status_timestamp_workaround.patch
+
+PACKAGES += CSWlibmeanwhile1
+CATALOGNAME_CSWlibmeanwhile1 = libmeanwhile1
+PKGFILES_CSWlibmeanwhile1 += $(call baseisadirs,$(libdir),libmeanwhile\.so\.1\.0\.2)
+PKGFILES_CSWlibmeanwhile1 += $(call baseisadirs,$(libdir),libmeanwhile\.so\.1(\.\d+)*)
+SPKG_DESC_CSWlibmeanwhile1 += $(DESCRIPTION), libmeanwhile.so.1
+RUNTIME_DEP_PKGS_CSWmeanwhile += CSWlibmeanwhile1
+
+PACKAGES += CSWmeanwhile-dev
+CATALOGNAME_CSWmeanwhile-dev = meanwhile_dev
+SPKG_DESC_CSWmeanwhile-dev += $(DESCRIPTION), development files
+PKGFILES_CSWmeanwhile-dev += /opt/csw/lib/libmeanwhile.so
+PKGFILES_CSWmeanwhile-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWmeanwhile-dev += .*/doc/meanwhile.*
+
+
+RUNTIME_DEP_PKGS_CSWmeanwhile += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWmeanwhile += CSWlibintl3
+RUNTIME_DEP_PKGS_CSWmeanwhile += CSCSWlibpcre1
+RUNTIME_DEP_PKGS_CSWmeanwhile += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWmeanwhile += CSWsunmath
+
+BUILD_DEP_PKGS += CSWdoxygen
+
#No tests
-TEST_SCRIPTS =
+TEST_TARGET =
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
-# If the url used to check for software update is different of MASTER_SITES, then
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES =
-
CONFIGURE_ARGS = $(DIRPATHS)
+EXTRA_CFLAGS += -features=extensions
+
+
include gar/category.mk
+
+post-configure:
+ @doxygen -u $(WORKSRC)/doc/Doxyfile
Modified: csw/mgar/pkg/meanwhile/trunk/checksums
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/checksums 2013-04-24 07:37:54 UTC (rev 20860)
+++ csw/mgar/pkg/meanwhile/trunk/checksums 2013-04-24 12:14:28 UTC (rev 20861)
@@ -1,8 +1 @@
-bf4ced109a367b4c5d71fe63c043270e download/meanwhile-1.0.2.tar.gz
-5a1ed24a8d6778dcf79373a6b5d512db download/CSWmeanwhile.depend
-16c8ea92ec1e7d763ab92aab8f7f6559 download/CSWmeanwhile.gspec
-5d4bb9c3a21bec7f9eefa14db1bc1c03 download/CSWmeanwhile.prototype
-85017081328f7ddd4968f6f6f18a55ec download/ft_fix.patch
-7637b2f7dfe8ec2516dd6aa5f66d90c6 download/presence_fix_v2.patch
-692c92e2a4e099b27a83667009e430f5 download/status_timestamp_workaround.patch
-c1fdb077407e627ae8ed9b726f5b07ef download/doc_dir.patch
+bf4ced109a367b4c5d71fe63c043270e meanwhile-1.0.2.tar.gz
Added: csw/mgar/pkg/meanwhile/trunk/files/0001-broken-status.patch
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/0001-broken-status.patch (rev 0)
+++ csw/mgar/pkg/meanwhile/trunk/files/0001-broken-status.patch 2013-04-24 12:14:28 UTC (rev 20861)
@@ -0,0 +1,169 @@
+Common subdirectories: ../meanwhile-1.0.2.original//doc and ./doc
+Common subdirectories: ../meanwhile-1.0.2.original//samples and ./samples
+Common subdirectories: ../meanwhile-1.0.2.original//src and ./src
+diff -ur ../meanwhile-1.0.2.original//src/cipher.c ./src/cipher.c
+--- ../meanwhile-1.0.2.original//src/cipher.c Sat Dec 24 20:32:50 2005
++++ ./src/cipher.c Sun Apr 21 21:23:48 2013
+@@ -1,4 +1,3 @@
+-
+ /*
+ Meanwhile - Unofficial Lotus Sametime Community Client Library
+ Copyright (C) 2004 Christopher (siege) O'Brien
+@@ -718,7 +717,7 @@
+ static void accepted_RC2_128(struct mwCipherInstance *ci,
+ struct mwEncryptItem *item) {
+
+- return offered_RC2_128(ci, item);
++ offered_RC2_128(ci, item);
+ }
+
+
+@@ -965,4 +964,3 @@
+
+ g_free(ci);
+ }
+-
+diff -ur ../meanwhile-1.0.2.original//src/common.c ./src/common.c
+--- ../meanwhile-1.0.2.original//src/common.c Thu Dec 8 20:48:36 2005
++++ ./src/common.c Sun Apr 21 21:23:48 2013
+@@ -1,4 +1,3 @@
+-
+ /*
+ Meanwhile - Unofficial Lotus Sametime Community Client Library
+ Copyright (C) 2004 Christopher (siege) O'Brien
+@@ -878,24 +877,25 @@
+ /* 8.4.2.4 Snapshot */
+
+ void mwAwareSnapshot_get(struct mwGetBuffer *b, struct mwAwareSnapshot *idb) {
+- guint32 junk;
+- char *empty = NULL;
++ guint32 end_of_block;
+
+ g_return_if_fail(b != NULL);
+ g_return_if_fail(idb != NULL);
+
+- guint32_get(b, &junk);
++ guint32_get(b, &end_of_block);
+ mwAwareIdBlock_get(b, &idb->id);
+ mwString_get(b, &idb->group);
+ gboolean_get(b, &idb->online);
+
+- g_free(empty);
+-
+ if(idb->online) {
+ mwString_get(b, &idb->alt_id);
+ mwUserStatus_get(b, &idb->status);
+ mwString_get(b, &idb->name);
+ }
++
++ if(b->ptr < b->buf + end_of_block) {
++ mwGetBuffer_advance(b, b->buf + end_of_block - b->ptr);
++ }
+ }
+
+
+@@ -924,4 +924,3 @@
+ g_free(idb->group);
+ memset(idb, 0x00, sizeof(struct mwAwareSnapshot));
+ }
+-
+Common subdirectories: ../meanwhile-1.0.2.original//src/mpi and ./src/mpi
+diff -ur ../meanwhile-1.0.2.original//src/mw_cipher.h ./src/mw_cipher.h
+--- ../meanwhile-1.0.2.original//src/mw_cipher.h Thu Dec 15 01:30:28 2005
++++ ./src/mw_cipher.h Sun Apr 21 21:23:48 2013
+@@ -1,4 +1,3 @@
+-
+ /*
+ Meanwhile - Unofficial Lotus Sametime Community Client Library
+ Copyright (C) 2004 Christopher (siege) O'Brien
+@@ -74,8 +73,8 @@
+ struct mwSession *session;
+
+ guint16 type; /**< @see mwCipher_getType */
+- const char *(*get_name)(); /**< @see mwCipher_getName */
+- const char *(*get_desc)(); /**< @see mwCipher_getDesc */
++ const char *(*get_name)(void); /**< @see mwCipher_getName */
++ const char *(*get_desc)(void); /**< @see mwCipher_getDesc */
+
+ /** Generate a new Cipher Instance for use on a channel
+ @see mwCipher_newInstance */
+@@ -252,7 +251,7 @@
+
+
+ /** prepare a new mpi value */
+-struct mwMpi *mwMpi_new();
++struct mwMpi *mwMpi_new(void);
+
+
+ /** destroy an mpi value */
+diff -ur ../meanwhile-1.0.2.original//src/mw_common.h ./src/mw_common.h
+--- ../meanwhile-1.0.2.original//src/mw_common.h Thu Dec 15 01:30:28 2005
++++ ./src/mw_common.h Sun Apr 21 21:23:48 2013
+@@ -1,4 +1,3 @@
+-
+ /*
+ Meanwhile - Unofficial Lotus Sametime Community Client Library
+ Copyright (C) 2004 Christopher (siege) O'Brien
+@@ -153,10 +152,14 @@
+ /* 8.3.5 User Status Types */
+
+ enum mwStatusType {
++ mwStatus_OFFLINE = 0x0000,
++
+ mwStatus_ACTIVE = 0x0020,
+ mwStatus_IDLE = 0x0040,
+ mwStatus_AWAY = 0x0060,
+ mwStatus_BUSY = 0x0080,
++
++ mwStatus_MASK_MOBILE = 0x0200,
+ };
+
+
+@@ -224,7 +227,7 @@
+
+
+ /** allocate a new empty buffer */
+-struct mwPutBuffer *mwPutBuffer_new();
++struct mwPutBuffer *mwPutBuffer_new(void);
+
+
+ /** write raw data to the put buffer */
+diff -ur ../meanwhile-1.0.2.original//src/mw_st_list.h ./src/mw_st_list.h
+--- ../meanwhile-1.0.2.original//src/mw_st_list.h Thu Dec 15 01:30:28 2005
++++ ./src/mw_st_list.h Sun Apr 21 21:23:48 2013
+@@ -1,4 +1,3 @@
+-
+ /*
+ Meanwhile - Unofficial Lotus Sametime Community Client Library
+ Copyright (C) 2004 Christopher (siege) O'Brien
+@@ -77,7 +76,7 @@
+
+
+ /** Create a new list */
+-struct mwSametimeList *mwSametimeList_new();
++struct mwSametimeList *mwSametimeList_new(void);
+
+
+ /** Free the list, all of its groups, and all of the groups' members */
+diff -ur ../meanwhile-1.0.2.original//src/srvc_conf.c ./src/srvc_conf.c
+--- ../meanwhile-1.0.2.original//src/srvc_conf.c Wed Dec 28 03:46:54 2005
++++ ./src/srvc_conf.c Sun Apr 21 21:23:48 2013
+@@ -1,4 +1,3 @@
+-
+ /*
+ Meanwhile - Unofficial Lotus Sametime Community Client Library
+ Copyright (C) 2004 Christopher (siege) O'Brien
+@@ -156,7 +155,7 @@
+ if(conf->members)
+ g_hash_table_destroy(conf->members);
+
+- g_list_remove_all(srvc->confs, conf);
++ srvc->confs = g_list_remove_all(srvc->confs, conf);
+
+ mw_datum_clear(&conf->client_data);
+
+@@ -864,4 +863,3 @@
+ g_return_val_if_fail(srvc != NULL, NULL);
+ return g_list_copy(srvc->confs);
+ }
+-
Added: csw/mgar/pkg/meanwhile/trunk/files/0002-fix_glib_includes.patch
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/0002-fix_glib_includes.patch (rev 0)
+++ csw/mgar/pkg/meanwhile/trunk/files/0002-fix_glib_includes.patch 2013-04-24 12:14:28 UTC (rev 20861)
@@ -0,0 +1,222 @@
+Common subdirectories: ../meanwhile-1.0.2.original//doc and ./doc
+Common subdirectories: ../meanwhile-1.0.2.original//samples and ./samples
+Common subdirectories: ../meanwhile-1.0.2.original//src and ./src
+diff -ur ../meanwhile-1.0.2.original//src/channel.c ./src/channel.c
+--- ../meanwhile-1.0.2.original//src/channel.c Thu Dec 8 23:04:46 2005
++++ ./src/channel.c Sun Apr 21 21:27:03 2013
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+Common subdirectories: ../meanwhile-1.0.2.original//src/mpi and ./src/mpi
+diff -ur ../meanwhile-1.0.2.original//src/mw_debug.c ./src/mw_debug.c
+--- ../meanwhile-1.0.2.original//src/mw_debug.c Sat Dec 3 04:46:10 2005
++++ ./src/mw_debug.c Sun Apr 21 21:27:03 2013
+@@ -19,7 +19,7 @@
+ */
+
+
+-#include <glib/gstring.h>
++#include <glib.h>
+
+ #include "mw_debug.h"
+
+diff -ur ../meanwhile-1.0.2.original//src/mw_message.h ./src/mw_message.h
+--- ../meanwhile-1.0.2.original//src/mw_message.h Thu Dec 15 01:30:28 2005
++++ ./src/mw_message.h Sun Apr 21 21:27:03 2013
+@@ -22,7 +22,7 @@
+ #define _MW_MESSAGE_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -ur ../meanwhile-1.0.2.original//src/mw_srvc_conf.h ./src/mw_srvc_conf.h
+--- ../meanwhile-1.0.2.original//src/mw_srvc_conf.h Thu Dec 15 01:30:28 2005
++++ ./src/mw_srvc_conf.h Sun Apr 21 21:27:03 2013
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_CONF_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -ur ../meanwhile-1.0.2.original//src/mw_srvc_dir.h ./src/mw_srvc_dir.h
+--- ../meanwhile-1.0.2.original//src/mw_srvc_dir.h Thu Dec 15 01:30:28 2005
++++ ./src/mw_srvc_dir.h Sun Apr 21 21:27:03 2013
+@@ -22,7 +22,7 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
++#include <glib.h>
+
+
+ #ifdef __cplusplus
+diff -ur ../meanwhile-1.0.2.original//src/mw_srvc_place.h ./src/mw_srvc_place.h
+--- ../meanwhile-1.0.2.original//src/mw_srvc_place.h Thu Dec 15 01:30:28 2005
++++ ./src/mw_srvc_place.h Sun Apr 21 21:27:03 2013
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_PLACE_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -ur ../meanwhile-1.0.2.original//src/mw_srvc_resolve.h ./src/mw_srvc_resolve.h
+--- ../meanwhile-1.0.2.original//src/mw_srvc_resolve.h Thu Dec 15 01:30:28 2005
++++ ./src/mw_srvc_resolve.h Sun Apr 21 21:27:03 2013
+@@ -23,7 +23,7 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
++#include <glib.h>
+
+
+ #ifdef __cplusplus
+diff -ur ../meanwhile-1.0.2.original//src/mw_st_list.h ./src/mw_st_list.h
+--- ../meanwhile-1.0.2.original//src/mw_st_list.h Thu Dec 15 01:30:28 2005
++++ ./src/mw_st_list.h Sun Apr 21 21:27:03 2013
+@@ -30,7 +30,7 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -ur ../meanwhile-1.0.2.original//src/mw_util.h ./src/mw_util.h
+--- ../meanwhile-1.0.2.original//src/mw_util.h Tue Dec 28 21:41:26 2004
++++ ./src/mw_util.h Sun Apr 21 21:27:03 2013
+@@ -23,10 +23,7 @@
+
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+-
+ #define map_guint_new() \
+ g_hash_table_new(g_direct_hash, g_direct_equal)
+
+diff -ur ../meanwhile-1.0.2.original//src/srvc_aware.c ./src/srvc_aware.c
+--- ../meanwhile-1.0.2.original//src/srvc_aware.c Thu Dec 8 23:02:11 2005
++++ ./src/srvc_aware.c Sun Apr 21 21:27:03 2013
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -ur ../meanwhile-1.0.2.original//src/srvc_conf.c ./src/srvc_conf.c
+--- ../meanwhile-1.0.2.original//src/srvc_conf.c Wed Dec 28 03:46:54 2005
++++ ./src/srvc_conf.c Sun Apr 21 21:27:03 2013
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -ur ../meanwhile-1.0.2.original//src/srvc_dir.c ./src/srvc_dir.c
+--- ../meanwhile-1.0.2.original//src/srvc_dir.c Thu Sep 15 22:30:20 2005
++++ ./src/srvc_dir.c Sun Apr 21 21:27:03 2013
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/ghash.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -ur ../meanwhile-1.0.2.original//src/srvc_ft.c ./src/srvc_ft.c
+--- ../meanwhile-1.0.2.original//src/srvc_ft.c Thu Sep 15 22:30:37 2005
++++ ./src/srvc_ft.c Sun Apr 21 21:27:03 2013
+@@ -19,7 +19,7 @@
+ */
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -ur ../meanwhile-1.0.2.original//src/srvc_im.c ./src/srvc_im.c
+--- ../meanwhile-1.0.2.original//src/srvc_im.c Wed Dec 28 03:46:54 2005
++++ ./src/srvc_im.c Sun Apr 21 21:27:03 2013
+@@ -19,7 +19,7 @@
+ */
+
+ #include <glib.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -ur ../meanwhile-1.0.2.original//src/srvc_place.c ./src/srvc_place.c
+--- ../meanwhile-1.0.2.original//src/srvc_place.c Sat Dec 3 03:00:29 2005
++++ ./src/srvc_place.c Sun Apr 21 21:27:03 2013
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -ur ../meanwhile-1.0.2.original//src/srvc_resolve.c ./src/srvc_resolve.c
+--- ../meanwhile-1.0.2.original//src/srvc_resolve.c Thu Oct 27 02:10:06 2005
++++ ./src/srvc_resolve.c Sun Apr 21 21:27:03 2013
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/ghash.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -ur ../meanwhile-1.0.2.original//src/srvc_store.c ./src/srvc_store.c
+--- ../meanwhile-1.0.2.original//src/srvc_store.c Sat Nov 19 02:52:42 2005
++++ ./src/srvc_store.c Sun Apr 21 21:27:03 2013
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/glist.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_debug.h"
+diff -ur ../meanwhile-1.0.2.original//src/st_list.c ./src/st_list.c
+--- ../meanwhile-1.0.2.original//src/st_list.c Thu Dec 8 23:01:27 2005
++++ ./src/st_list.c Sun Apr 21 21:27:03 2013
+@@ -20,7 +20,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+
+ #include "mw_debug.h"
+ #include "mw_util.h"
Copied: csw/mgar/pkg/meanwhile/trunk/files/0003-doc_dir.patch (from rev 20820, csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch)
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/0003-doc_dir.patch (rev 0)
+++ csw/mgar/pkg/meanwhile/trunk/files/0003-doc_dir.patch 2013-04-24 12:14:28 UTC (rev 20861)
@@ -0,0 +1,68 @@
+diff -rud meanwhile-1.0.2.o/doc/Makefile.am meanwhile-1.0.2/doc/Makefile.am
+--- meanwhile-1.0.2.o/doc/Makefile.am 2005-10-28 21:22:38.000000000 -0500
++++ meanwhile-1.0.2/doc/Makefile.am 2008-12-29 13:37:18.400083313 -0600
+@@ -5,10 +5,10 @@
+ if ENABLE_DOXYGEN
+
+ htmldoc_DATA = html/*
+-htmldocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/html
++htmldocdir = $(datadir)/doc/@PACKAGE@/html
+
+ latexdoc_DATA = latex/*
+-latexdocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/latex
++latexdocdir = $(datadir)/doc/@PACKAGE@@/latex
+
+ docdata = $(htmldoc_DATA) $(latexdoc_DATA)
+
+diff -rud meanwhile-1.0.2.o/doc/Makefile.in meanwhile-1.0.2/doc/Makefile.in
+--- meanwhile-1.0.2.o/doc/Makefile.in 2005-12-29 19:55:16.000000000 -0600
++++ meanwhile-1.0.2/doc/Makefile.in 2008-12-29 13:37:18.398638856 -0600
+@@ -172,9 +172,9 @@
+ target_alias = @target_alias@
+ noinst_DATA = Doxyfile
+ @ENABLE_DOXYGEN_TRUE at htmldoc_DATA = html/*
+- at ENABLE_DOXYGEN_TRUE@htmldocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/html
++ at ENABLE_DOXYGEN_TRUE@htmldocdir = $(datadir)/doc/@PACKAGE@/html
+ @ENABLE_DOXYGEN_TRUE at latexdoc_DATA = latex/*
+- at ENABLE_DOXYGEN_TRUE@latexdocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/latex
++ at ENABLE_DOXYGEN_TRUE@latexdocdir = $(datadir)/doc/@PACKAGE@/latex
+ @ENABLE_DOXYGEN_TRUE at docdata = $(htmldoc_DATA) $(latexdoc_DATA)
+ all: all-am
+
+diff -rud meanwhile-1.0.2.o/meanwhile.spec.in meanwhile-1.0.2/meanwhile.spec.in
+--- meanwhile-1.0.2.o/meanwhile.spec.in 2005-12-29 20:05:55.000000000 -0600
++++ meanwhile-1.0.2/meanwhile.spec.in 2008-12-29 13:33:36.734731451 -0600
+@@ -89,7 +89,7 @@
+
+ %files doc
+ %defattr(-,root,root,-)
+-%{_datadir}/doc/%{name}-doc-%{version}/
++%{_datadir}/doc/%{name}/
+ %endif
+
+
+diff -rud meanwhile-1.0.2.o/samples/Makefile.am meanwhile-1.0.2/samples/Makefile.am
+--- meanwhile-1.0.2.o/samples/Makefile.am 2008-12-29 13:59:26.003161765 -0600
++++ meanwhile-1.0.2/samples/Makefile.am 2008-12-29 14:00:22.451646848 -0600
+@@ -19,7 +19,7 @@
+ $(SAMPLES_SRC)
+
+
+-sampledir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/samples
++sampledir = $(datadir)/doc/@PACKAGE@/samples
+
+
+ EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS)
+
+diff -rud meanwhile-1.0.2.o/samples/Makefile.in meanwhile-1.0.2/samples/Makefile.in
+--- meanwhile-1.0.2.o/samples/Makefile.in 2008-12-29 14:03:42.998631273 -0600
++++ meanwhile-1.0.2/samples/Makefile.in 2008-12-29 14:04:01.256144581 -0600
+@@ -188,7 +188,7 @@
+ README \
+ $(SAMPLES_SRC)
+
+-sampledir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/samples
++sampledir = $(datadir)/doc/@PACKAGE@/samples
+ EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS)
+ all: all-am
+
Copied: csw/mgar/pkg/meanwhile/trunk/files/0004-ft_fix.patch (from rev 20820, csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch)
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/0004-ft_fix.patch (rev 0)
+++ csw/mgar/pkg/meanwhile/trunk/files/0004-ft_fix.patch 2013-04-24 12:14:28 UTC (rev 20861)
@@ -0,0 +1,21 @@
+# User Mikael Berthe <mikael.berthe at lilotux.net>
+# Date 1194544713 -3600
+Fix file transfers with recent Sametime servers
+
+It seems that the last guint32_get() fails when Meanwhile receives
+the FT offer.
+I think we can skip it -- works for me but I can't check it with an
+older server.
+
+diff -r 4aabc56c0e5f src/srvc_ft.c
+--- a/src/srvc_ft.c Tue Nov 06 11:46:26 2007 +0100
++++ b/src/srvc_ft.c Thu Nov 08 18:58:33 2007 +0100
+@@ -142,7 +142,7 @@ static void recv_channelCreate(struct mw
+ mwString_get(b, &fnm); /* offered filename */
+ mwString_get(b, &txt); /* offering message */
+ guint32_get(b, &size); /* size of offered file */
+- guint32_get(b, &junk); /* unknown */
++ /* guint32_get(b, &junk); */ /* unknown */
+ /* and we just skip an unknown guint16 at the end */
+
+ b_err = mwGetBuffer_error(b);
Copied: csw/mgar/pkg/meanwhile/trunk/files/0005-status_timestamp_workaround.patch (from rev 20820, csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch)
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/0005-status_timestamp_workaround.patch (rev 0)
+++ csw/mgar/pkg/meanwhile/trunk/files/0005-status_timestamp_workaround.patch 2013-04-24 12:14:28 UTC (rev 20861)
@@ -0,0 +1,19 @@
+# User Mikael Berthe <mikael.berthe at lilotux.net>
+# Date 1195749751 -3600
+Fix Awareness status timestamps with recent Sametime clients
+
+For some reason the status timestamps I receive from people with a recent
+Sametime client make no sense. This patch simply sets the timestamp to 0,
+as I have no idea how to interpret these time values.
+
+diff -r 17977a4e7da1 -r e7601af90b31 src/common.c
+--- a/src/common.c Thu Nov 08 18:58:33 2007 +0100
++++ b/src/common.c Thu Nov 22 17:42:31 2007 +0100
+@@ -688,6 +688,9 @@ void mwUserStatus_get(struct mwGetBuffer
+ guint16_get(b, &stat->status);
+ guint32_get(b, &stat->time);
+ mwString_get(b, &stat->desc);
++
++ // Quick'n ugly hack for recent Sametime clients
++ stat->time = 0;
+ }
Deleted: csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend 2013-04-24 07:37:54 UTC (rev 20860)
+++ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend 2013-04-24 12:14:28 UTC (rev 20861)
@@ -1,5 +0,0 @@
-P CSWggettext ggettext - GNU gettext
-P CSWiconv libiconv - GNU iconv library
-P CSWsunmath libsunmath - Sun maths library
-P CSWglib2 glib2 - The low-level core lib for GNOME and GTK+
-P CSWgcc3corert gcc3corert - GNU C Compiler Run Time
Deleted: csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec 2013-04-24 07:37:54 UTC (rev 20860)
+++ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec 2013-04-24 12:14:28 UTC (rev 20861)
@@ -1,4 +0,0 @@
-%var bitname meanwhile
-%var pkgname CSWmeanwhile
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENSE
Deleted: csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype 2013-04-24 07:37:54 UTC (rev 20860)
+++ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype 2013-04-24 12:14:28 UTC (rev 20861)
@@ -1,278 +0,0 @@
-d none /opt/csw/include 0755 root bin
-d none /opt/csw/include/meanwhile 0755 root bin
-f none /opt/csw/include/meanwhile/mw_message.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_srvc_dir.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_common.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_error.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_channel.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_st_list.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_session.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_srvc_resolve.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_srvc_place.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_srvc_im.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_srvc_aware.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_service.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_srvc_ft.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_cipher.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_srvc_store.h 0644 root bin
-f none /opt/csw/include/meanwhile/mw_srvc_conf.h 0644 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/doc 0755 root bin
-d none /opt/csw/share/doc/meanwhile 0755 root bin
-d none /opt/csw/share/doc/meanwhile/html 0755 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__store_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__channel_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x70.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x6c.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/todo.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x68.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwDirectoryMember.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__aware_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwDirectoryHandler.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwAwareList.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelSend.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x74.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__util_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwUserStatus.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__st__list_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwCipherInstance.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__error_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwServiceAware.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmw__datum.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwChannel.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgAnnounce.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwServiceFileTransfer.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwConference.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_type.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwFileTransferHandler.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwConversation.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x64.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwServiceIm.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwUserItem.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgHandshakeAck.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwSametimeUser.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/pages.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__store_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_func.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgHandshake.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwService.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwServicePlace.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__resolve_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__cipher_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__channel_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__debug_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x61.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgLoginContinue.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__dir_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwGetBuffer.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__session_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwAddressBook.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__session_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwStorage.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x65.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwEncryptAccept.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwAwareSnapshot.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__resolve_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwServiceDirectory.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/doxygen.png 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgSetPrivacyList.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/tab_r.gif 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__error_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwPutBuffer.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgLoginAck.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__service_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgAdmin.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwAwareHandler.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwEncryptItem.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/doxygen.css 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x6b.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__conf_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x69.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwFileTransfer.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwChannelSet.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwCipher.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x75.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/files.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwImHandler.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__util_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwIdBlock.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__im_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwConferenceHandler.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgSenseService.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/classes.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x63.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__ft_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwSession.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__cipher_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_defs.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x67.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelCreate.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMessage.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_eval.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__conf_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwServiceConference.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x73.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__im_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelDestroy.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwEncryptOffer.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/functions_rela.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__common_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__service_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x77.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwDirectory.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwAwareAttribute.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/annotated.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__message_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwResolveMatch.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelAccept.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgLoginRedirect.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x6d.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/functions.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwAwareListHandler.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwPlaceHandler.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/functions_vars.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgSetUserStatus.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/tab_l.gif 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwSametimeList.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x72.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_func_0x6d.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__place_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwPlace.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/index.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/tab_b.gif 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwLoginInfo.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwOpaque.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x76.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMsgLogin.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwMpi.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_enum.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__dir_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x6e.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwAwareIdBlock.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/tabs.css 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x62.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwPrivacyInfo.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__common_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwServiceStorage.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__place_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwServiceResolve.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__aware_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__srvc__ft_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwSametimeGroup.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__st__list_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/globals_0x66.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__debug_8h-source.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwResolveResult.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/mw__message_8h.html 0644 root bin
-f none /opt/csw/share/doc/meanwhile/html/structmwSessionHandler.html 0644 root bin
-d none /opt/csw/share/doc/meanwhile/latex 0755 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwConference.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwResolveResult.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwSametimeUser.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwIdBlock.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__channel_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__store_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgAnnounce.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwSession.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/files.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLoginContinue.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwPlace.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__common_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelCreate.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwConferenceHandler.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__cipher_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwCipherInstance.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgAdmin.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwDirectory.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/annotated.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__resolve_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMpi.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/Makefile 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgHandshake.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__conf_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwServiceStorage.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwAwareSnapshot.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLoginAck.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__error_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwService.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwDirectoryHandler.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwUserStatus.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwServiceConference.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwUserItem.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwSametimeList.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwDirectoryMember.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwPlaceHandler.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwServiceAware.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__place_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwFileTransfer.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwChannelSet.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/todo.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__session_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwAwareListHandler.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwFileTransferHandler.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwPutBuffer.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/FreeSans.ttf 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgSetUserStatus.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwEncryptOffer.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgSenseService.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__util_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__ft_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__dir_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/pages.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwLoginInfo.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwCipher.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwSametimeGroup.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__message_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwConversation.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwSessionHandler.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelSend.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgSetPrivacyList.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwPrivacyInfo.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__debug_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/refman.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwOpaque.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelDestroy.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__st__list_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwAwareList.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwServiceDirectory.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLoginRedirect.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwImHandler.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__aware_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwServiceFileTransfer.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwChannel.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwResolveMatch.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwAwareHandler.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__service_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMessage.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__im_8h.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwAwareAttribute.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgHandshakeAck.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwAwareIdBlock.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwEncryptAccept.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwEncryptItem.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/doxygen.sty 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwGetBuffer.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwStorage.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwAddressBook.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwServiceIm.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwServicePlace.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmw__datum.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwServiceResolve.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelAccept.tex 0644 root bin
-f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLogin.tex 0644 root bin
-d none /opt/csw/share/doc/meanwhile/samples 0755 root bin
-f none /opt/csw/share/doc/meanwhile/samples/nocipher_proxy.c 0644 root bin
-f none /opt/csw/share/doc/meanwhile/samples/login_server.c 0644 root bin
-f none /opt/csw/share/doc/meanwhile/samples/sendmessage.c 0644 root bin
-f none /opt/csw/share/doc/meanwhile/samples/redirect_server.c 0644 root bin
-f none /opt/csw/share/doc/meanwhile/samples/socket.c 0644 root bin
-f none /opt/csw/share/doc/meanwhile/samples/build 0755 root bin
-f none /opt/csw/share/doc/meanwhile/samples/README 0644 root bin
-f none /opt/csw/share/doc/meanwhile/samples/logging_proxy.c 0644 root bin
-d none /opt/csw/lib 0755 root bin
-s none /opt/csw/lib/libmeanwhile.so=libmeanwhile.so.1.0.2
-f none /opt/csw/lib/libmeanwhile.so.1.0.2 0755 root bin
-s none /opt/csw/lib/libmeanwhile.so.1=libmeanwhile.so.1.0.2
-d none /opt/csw/lib/pkgconfig 0755 root bin
-f none /opt/csw/lib/pkgconfig/meanwhile.pc 0644 root bin
Deleted: csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch 2013-04-24 07:37:54 UTC (rev 20860)
+++ csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch 2013-04-24 12:14:28 UTC (rev 20861)
@@ -1,68 +0,0 @@
-diff -rud meanwhile-1.0.2.o/doc/Makefile.am meanwhile-1.0.2/doc/Makefile.am
---- meanwhile-1.0.2.o/doc/Makefile.am 2005-10-28 21:22:38.000000000 -0500
-+++ meanwhile-1.0.2/doc/Makefile.am 2008-12-29 13:37:18.400083313 -0600
-@@ -5,10 +5,10 @@
- if ENABLE_DOXYGEN
-
- htmldoc_DATA = html/*
--htmldocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/html
-+htmldocdir = $(datadir)/doc/@PACKAGE@/html
-
- latexdoc_DATA = latex/*
--latexdocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/latex
-+latexdocdir = $(datadir)/doc/@PACKAGE@@/latex
-
- docdata = $(htmldoc_DATA) $(latexdoc_DATA)
-
-diff -rud meanwhile-1.0.2.o/doc/Makefile.in meanwhile-1.0.2/doc/Makefile.in
---- meanwhile-1.0.2.o/doc/Makefile.in 2005-12-29 19:55:16.000000000 -0600
-+++ meanwhile-1.0.2/doc/Makefile.in 2008-12-29 13:37:18.398638856 -0600
-@@ -172,9 +172,9 @@
- target_alias = @target_alias@
- noinst_DATA = Doxyfile
- @ENABLE_DOXYGEN_TRUE at htmldoc_DATA = html/*
-- at ENABLE_DOXYGEN_TRUE@htmldocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/html
-+ at ENABLE_DOXYGEN_TRUE@htmldocdir = $(datadir)/doc/@PACKAGE@/html
- @ENABLE_DOXYGEN_TRUE at latexdoc_DATA = latex/*
-- at ENABLE_DOXYGEN_TRUE@latexdocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/latex
-+ at ENABLE_DOXYGEN_TRUE@latexdocdir = $(datadir)/doc/@PACKAGE@/latex
- @ENABLE_DOXYGEN_TRUE at docdata = $(htmldoc_DATA) $(latexdoc_DATA)
- all: all-am
-
-diff -rud meanwhile-1.0.2.o/meanwhile.spec.in meanwhile-1.0.2/meanwhile.spec.in
---- meanwhile-1.0.2.o/meanwhile.spec.in 2005-12-29 20:05:55.000000000 -0600
-+++ meanwhile-1.0.2/meanwhile.spec.in 2008-12-29 13:33:36.734731451 -0600
-@@ -89,7 +89,7 @@
-
- %files doc
- %defattr(-,root,root,-)
--%{_datadir}/doc/%{name}-doc-%{version}/
-+%{_datadir}/doc/%{name}/
- %endif
-
-
-diff -rud meanwhile-1.0.2.o/samples/Makefile.am meanwhile-1.0.2/samples/Makefile.am
---- meanwhile-1.0.2.o/samples/Makefile.am 2008-12-29 13:59:26.003161765 -0600
-+++ meanwhile-1.0.2/samples/Makefile.am 2008-12-29 14:00:22.451646848 -0600
-@@ -19,7 +19,7 @@
- $(SAMPLES_SRC)
-
-
--sampledir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/samples
-+sampledir = $(datadir)/doc/@PACKAGE@/samples
-
-
- EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS)
-
-diff -rud meanwhile-1.0.2.o/samples/Makefile.in meanwhile-1.0.2/samples/Makefile.in
---- meanwhile-1.0.2.o/samples/Makefile.in 2008-12-29 14:03:42.998631273 -0600
-+++ meanwhile-1.0.2/samples/Makefile.in 2008-12-29 14:04:01.256144581 -0600
-@@ -188,7 +188,7 @@
- README \
- $(SAMPLES_SRC)
-
--sampledir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/samples
-+sampledir = $(datadir)/doc/@PACKAGE@/samples
- EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS)
- all: all-am
-
Deleted: csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch 2013-04-24 07:37:54 UTC (rev 20860)
+++ csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch 2013-04-24 12:14:28 UTC (rev 20861)
@@ -1,21 +0,0 @@
-# User Mikael Berthe <mikael.berthe at lilotux.net>
-# Date 1194544713 -3600
-Fix file transfers with recent Sametime servers
-
-It seems that the last guint32_get() fails when Meanwhile receives
-the FT offer.
-I think we can skip it -- works for me but I can't check it with an
-older server.
-
-diff -r 4aabc56c0e5f src/srvc_ft.c
---- a/src/srvc_ft.c Tue Nov 06 11:46:26 2007 +0100
-+++ b/src/srvc_ft.c Thu Nov 08 18:58:33 2007 +0100
-@@ -142,7 +142,7 @@ static void recv_channelCreate(struct mw
- mwString_get(b, &fnm); /* offered filename */
- mwString_get(b, &txt); /* offering message */
- guint32_get(b, &size); /* size of offered file */
-- guint32_get(b, &junk); /* unknown */
-+ /* guint32_get(b, &junk); */ /* unknown */
- /* and we just skip an unknown guint16 at the end */
-
- b_err = mwGetBuffer_error(b);
Deleted: csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch 2013-04-24 07:37:54 UTC (rev 20860)
+++ csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch 2013-04-24 12:14:28 UTC (rev 20861)
@@ -1,41 +0,0 @@
-# User Mikael Berthe <mikael.berthe at lilotux.net>
-# Date 1194208892 -3600
-Fix Awareness Snapshots with recent Sametime servers
-
-With recent Sametime servers there seem to be 2 bytes
-after the Snapshot Message Blocks.
-This patch tries to use the end of block offset provided
-by the server.
-
-diff -r be8d8f1d3ebc src/common.c
---- a/src/common.c Sun Nov 04 18:48:00 2007 +0100
-+++ b/src/common.c Tue Nov 06 11:46:26 2007 +0100
-@@ -878,23 +878,24 @@ gboolean mwAwareIdBlock_equal(const stru
- /* 8.4.2.4 Snapshot */
-
- void mwAwareSnapshot_get(struct mwGetBuffer *b, struct mwAwareSnapshot *idb) {
-- guint32 junk;
-- char *empty = NULL;
-+ guint32 end_of_block;
-
- g_return_if_fail(b != NULL);
- g_return_if_fail(idb != NULL);
-
-- guint32_get(b, &junk);
-+ guint32_get(b, &end_of_block);
- mwAwareIdBlock_get(b, &idb->id);
- mwString_get(b, &idb->group);
- gboolean_get(b, &idb->online);
--
-- g_free(empty);
-
- if(idb->online) {
- mwString_get(b, &idb->alt_id);
- mwUserStatus_get(b, &idb->status);
- mwString_get(b, &idb->name);
-+ }
-+
-+ if( b->ptr < b->buf + end_of_block ) {
-+ mwGetBuffer_advance(b, b->buf + end_of_block - b->ptr);
- }
- }
Deleted: csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch
===================================================================
--- csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch 2013-04-24 07:37:54 UTC (rev 20860)
+++ csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch 2013-04-24 12:14:28 UTC (rev 20861)
@@ -1,19 +0,0 @@
-# User Mikael Berthe <mikael.berthe at lilotux.net>
-# Date 1195749751 -3600
-Fix Awareness status timestamps with recent Sametime clients
-
-For some reason the status timestamps I receive from people with a recent
-Sametime client make no sense. This patch simply sets the timestamp to 0,
-as I have no idea how to interpret these time values.
-
-diff -r 17977a4e7da1 -r e7601af90b31 src/common.c
---- a/src/common.c Thu Nov 08 18:58:33 2007 +0100
-+++ b/src/common.c Thu Nov 22 17:42:31 2007 +0100
-@@ -688,6 +688,9 @@ void mwUserStatus_get(struct mwGetBuffer
- guint16_get(b, &stat->status);
- guint32_get(b, &stat->time);
- mwString_get(b, &stat->desc);
-+
-+ // Quick'n ugly hack for recent Sametime clients
-+ stat->time = 0;
- }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list