summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-libs/meanwhile/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-libs/meanwhile/files')
-rw-r--r--net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch213
-rw-r--r--net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch42
2 files changed, 255 insertions, 0 deletions
diff --git a/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch b/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch
new file mode 100644
index 000000000000..4ffcc3672fc7
--- /dev/null
+++ b/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch
@@ -0,0 +1,213 @@
+diff -uNr meanwhile-1.0.2/src/channel.c meanwhile-1.0.2-r1/src/channel.c
+--- meanwhile-1.0.2/src/channel.c 2005-12-08 23:04:46.000000000 +0100
++++ meanwhile-1.0.2-r1/src/channel.c 2012-03-20 21:15:03.000000000 +0100
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -uNr meanwhile-1.0.2/src/mw_debug.c meanwhile-1.0.2-r1/src/mw_debug.c
+--- meanwhile-1.0.2/src/mw_debug.c 2005-12-03 04:46:10.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_debug.c 2012-03-20 21:12:09.000000000 +0100
+@@ -19,7 +19,7 @@
+ */
+
+
+-#include <glib/gstring.h>
++#include <glib.h>
+
+ #include "mw_debug.h"
+
+diff -uNr meanwhile-1.0.2/src/mw_message.h meanwhile-1.0.2-r1/src/mw_message.h
+--- meanwhile-1.0.2/src/mw_message.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_message.h 2012-03-20 21:06:28.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define _MW_MESSAGE_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -uNr meanwhile-1.0.2/src/mw_srvc_conf.h meanwhile-1.0.2-r1/src/mw_srvc_conf.h
+--- meanwhile-1.0.2/src/mw_srvc_conf.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_conf.h 2012-03-20 21:08:01.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_CONF_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -uNr meanwhile-1.0.2/src/mw_srvc_dir.h meanwhile-1.0.2-r1/src/mw_srvc_dir.h
+--- meanwhile-1.0.2/src/mw_srvc_dir.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_dir.h 2012-03-20 21:08:23.000000000 +0100
+@@ -22,7 +22,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+
+ #ifdef __cplusplus
+diff -uNr meanwhile-1.0.2/src/mw_srvc_place.h meanwhile-1.0.2-r1/src/mw_srvc_place.h
+--- meanwhile-1.0.2/src/mw_srvc_place.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_place.h 2012-03-20 21:09:51.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_PLACE_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -uNr meanwhile-1.0.2/src/mw_srvc_resolve.h meanwhile-1.0.2-r1/src/mw_srvc_resolve.h
+--- meanwhile-1.0.2/src/mw_srvc_resolve.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_resolve.h 2012-03-20 21:10:54.000000000 +0100
+@@ -23,7 +23,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+
+ #ifdef __cplusplus
+diff -uNr meanwhile-1.0.2/src/mw_st_list.h meanwhile-1.0.2-r1/src/mw_st_list.h
+--- meanwhile-1.0.2/src/mw_st_list.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_st_list.h 2012-03-20 21:11:27.000000000 +0100
+@@ -30,7 +30,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include "mw_common.h"
+
+
+diff -uNr meanwhile-1.0.2/src/mw_util.h meanwhile-1.0.2-r1/src/mw_util.h
+--- meanwhile-1.0.2/src/mw_util.h 2004-12-28 21:41:26.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_util.h 2012-03-20 21:06:54.000000000 +0100
+@@ -23,8 +23,6 @@
+
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+
+ #define map_guint_new() \
+diff -uNr meanwhile-1.0.2/src/srvc_aware.c meanwhile-1.0.2-r1/src/srvc_aware.c
+--- meanwhile-1.0.2/src/srvc_aware.c 2005-12-08 23:02:11.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_aware.c 2012-03-20 21:07:22.000000000 +0100
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -uNr meanwhile-1.0.2/src/srvc_conf.c meanwhile-1.0.2-r1/src/srvc_conf.c
+--- meanwhile-1.0.2/src/srvc_conf.c 2005-12-28 03:46:54.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_conf.c 2012-03-20 21:07:42.000000000 +0100
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uNr meanwhile-1.0.2/src/srvc_dir.c meanwhile-1.0.2-r1/src/srvc_dir.c
+--- meanwhile-1.0.2/src/srvc_dir.c 2005-09-15 22:30:20.000000000 +0200
++++ meanwhile-1.0.2-r1/src/srvc_dir.c 2012-03-20 21:08:44.000000000 +0100
+@@ -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 -uNr meanwhile-1.0.2/src/srvc_ft.c meanwhile-1.0.2-r1/src/srvc_ft.c
+--- meanwhile-1.0.2/src/srvc_ft.c 2005-09-15 22:30:37.000000000 +0200
++++ meanwhile-1.0.2-r1/src/srvc_ft.c 2012-03-20 21:09:05.000000000 +0100
+@@ -19,7 +19,7 @@
+ */
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -uNr meanwhile-1.0.2/src/srvc_im.c meanwhile-1.0.2-r1/src/srvc_im.c
+--- meanwhile-1.0.2/src/srvc_im.c 2005-12-28 03:46:54.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_im.c 2012-03-20 21:09:31.000000000 +0100
+@@ -19,7 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -uNr meanwhile-1.0.2/src/srvc_place.c meanwhile-1.0.2-r1/src/srvc_place.c
+--- meanwhile-1.0.2/src/srvc_place.c 2005-12-03 03:00:29.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_place.c 2012-03-20 21:10:05.000000000 +0100
+@@ -19,8 +19,7 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
++
+
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uNr meanwhile-1.0.2/src/srvc_resolve.c meanwhile-1.0.2-r1/src/srvc_resolve.c
+--- meanwhile-1.0.2/src/srvc_resolve.c 2005-10-27 02:10:06.000000000 +0200
++++ meanwhile-1.0.2-r1/src/srvc_resolve.c 2012-03-20 21:10:21.000000000 +0100
+@@ -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 -uNr meanwhile-1.0.2/src/srvc_store.c meanwhile-1.0.2-r1/src/srvc_store.c
+--- meanwhile-1.0.2/src/srvc_store.c 2005-11-19 02:52:42.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_store.c 2012-03-20 21:11:13.000000000 +0100
+@@ -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 -uNr meanwhile-1.0.2/src/st_list.c meanwhile-1.0.2-r1/src/st_list.c
+--- meanwhile-1.0.2/src/st_list.c 2005-12-08 23:01:27.000000000 +0100
++++ meanwhile-1.0.2-r1/src/st_list.c 2012-03-20 21:11:44.000000000 +0100
+@@ -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"
diff --git a/net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch b/net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch
new file mode 100644
index 000000000000..e01089eda91c
--- /dev/null
+++ b/net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch
@@ -0,0 +1,42 @@
+# User Mikael Berthe <mikael.berthe@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);
+ }
+ }
+