Fixing buddy list status #239144 , documentation path, bug #241298

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 66 insertions, 16 deletions

diff --git a/net-libs/meanwhile/ChangeLog b/net-libs/meanwhile/ChangeLog
index 15e881d1067d..a612ec52f576 100644
--- a/net-libs/meanwhile/ChangeLog
+++ b/net-libs/meanwhile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/meanwhile
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/ChangeLog,v 1.49 2008/04/21 17:54:30 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/ChangeLog,v 1.50 2009/08/18 20:55:51 vostorga Exp $
+
+  18 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> meanwhile-1.0.2.ebuild,
+  +files/meanwhile-1.0.2-presence.patch:
+  Fixing buddy list status, patch thanks to Andreas Tarp
+  <andreas.tarp@ericsson.com> and <koquinn@gmail.com>, #239144
+  Fixing documentation path, bug #241298
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index 495a8ae1d374..23d984343384 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX meanwhile-1.0.2-presence.patch 1163 RMD160 aa91821aec8d4016624e0786d1485faff95026c0 SHA1 1f20957ed41cb5fdb39dae8aa824ad94a3967f42 SHA256 7c1e2bd33f7531b84e8d401266d81b8315986f3ff916e451c40da0e25d0b1467
 AUX mw_debug_glib.diff 388 RMD160 cd533977308fa9b99adcc8ef848a393d714f0b8a SHA1 0dde4aa695b749b37e4fd4efe957448cf001d92e SHA256 fa730e3d222a313fe79a4979e861c9612dbd71253b8ed959a8650daa44ed5ade
 DIST meanwhile-0.3.tar.gz 347260 RMD160 6f5bd3361325884bb0c06264057338ebf97efe05 SHA1 901d2cf96ebce7c0998a9fc3dc7b3d1019670c9a SHA256 67513ba7cb7bf05f640284e20ae2659eabe32775cef9c95fe81658fc9fe354cc
 DIST meanwhile-0.4.2.tar.gz 399079 RMD160 33428309b84df683feab3d872343ada1408e80bf SHA1 44a4f2c61908ebfac2e397773e883023a88247e7 SHA256 50b6fa2ee61cef45c8babcb09908abad388590d74529d39bc109d40b4031db9b
@@ -11,13 +9,6 @@ EBUILD meanwhile-0.3-r3.ebuild 750 RMD160 55bd2bfdfc2efe66c0cffa4fe8d9ce38c7f1a5
 EBUILD meanwhile-0.4.2.ebuild 646 RMD160 0ab5cf0a635f3b662956c293dcf938cbd392bb71 SHA1 34afb3dcd9e9ae3c06297d8b4e5186e29c24c734 SHA256 a9317c1eb552700b643b1a95f331084b160bc3de1c3277a6401a82eb75a1aab2
 EBUILD meanwhile-0.5.0.ebuild 916 RMD160 dddb41f7a9eb1666dda046cb9afcaa2376463229 SHA1 2484521b1d95819786d6c1f6c67e24f65f6261b6 SHA256 b0a0d0354522d71c2394e55fff32ced3c4cda56ab187d7066a24d79b723c16ba
 EBUILD meanwhile-1.0.1.ebuild 881 RMD160 f935e5bfdb9256a20c040c3fdbd999638b92e6d5 SHA1 a2a1c5bb75fc14f5ab026e943f1c81ef16e4c724 SHA256 215b1b85983cf6437c342d592df8df85df0c8ae6eeaaec70c93ea80f45ff6d8d
-EBUILD meanwhile-1.0.2.ebuild 885 RMD160 f1e3bdcf68ccf25eb1de502dcc783ee9c1dd6608 SHA1 492f92b4c19bfcbcbc84a2fa528538514d4e7cc0 SHA256 b33a69ae17ef1dac24e52f90aae086b5b4cdd8c863b5de6508e6b12ad07b85c8
-MISC ChangeLog 5998 RMD160 1652027fef26de3b0d449b93b1d736fe86594faf SHA1 581ecd2d934ccb3077631b7f11b04b72973d4adc SHA256 4ffa1d01d17314c47b8d701bbdbaefca8d7f424345a86e6b135c3527ff1e3074
+EBUILD meanwhile-1.0.2.ebuild 1057 RMD160 18eaf777aeba1365a6bdeff39fef8ac5fc61c990 SHA1 1628a91eb5bfb291bc2f64df7d097aa89749d831 SHA256 72f3c52671883fd75439015495539a05450a99dd4eb6645d0f3ea28f6cad2eba
+MISC ChangeLog 6280 RMD160 59b9f1d099e3a3c6a2cf252059b4bb4c5bb21a79 SHA1 e87751151b49f8733c3eb735b38531a846f0a6d6 SHA256 9c1eab5b4d17f12ffd81eeed9a5910c6702c899fc7ee5069920a7d7151cbd22d
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIDNTbyuNVb5qfaOYRAnnIAJ0dDNtP9gZhWL2Fh+aaOkvRZLEO8ACffR70
-QY/4AvWEKVvkuWRrmXBRMjo=
-=4+GZ
------END PGP SIGNATURE-----
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);
+   }
+ }
+ 
diff --git a/net-libs/meanwhile/meanwhile-1.0.2.ebuild b/net-libs/meanwhile/meanwhile-1.0.2.ebuild
index eae492c073e2..087c1bee3893 100644
--- a/net-libs/meanwhile/meanwhile-1.0.2.ebuild
+++ b/net-libs/meanwhile/meanwhile-1.0.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/meanwhile-1.0.2.ebuild,v 1.15 2007/07/13 07:18:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/meanwhile-1.0.2.ebuild,v 1.16 2009/08/18 20:55:51 vostorga Exp $
+
+inherit eutils
 
 DESCRIPTION="Meanwhile (Sametime protocol) library"
 HOMEPAGE="http://meanwhile.sourceforge.net/"
@@ -18,6 +20,15 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
 
+src_unpack(){
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-presence.patch" #239144
+
+	#241298
+	sed -i -e "/sampledir/ s:-doc::" samples/Makefile.in
+}
+
 src_compile() {
 	local myconf
 	use doc || myconf="${myconf} --enable-doxygen=no"