[arch-commits] Commit in libmsn/repos (3 files)

[Pierre Schmitz]

    Date: Friday, April 24, 2009 @ 10:25:54
  Author: pierre
Revision: 36552

Merged revisions 36547,36549 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/libmsn/trunk

........
  r36547 | andrea | 2009-04-24 15:39:40 +0200 (Fr, 24 Apr 2009) | 1 line
  
  upgpkg: libmsn 4.0beta4-2
........
  r36549 | andrea | 2009-04-24 15:40:20 +0200 (Fr, 24 Apr 2009) | 1 line
  
  added emesene patch
........

Added:
  libmsn/repos/extra-x86_64/fix-bug-with-emesene.patch
    (from rev 36549, libmsn/trunk/fix-bug-with-emesene.patch)
Modified:
  libmsn/repos/extra-x86_64/	(properties)
  libmsn/repos/extra-x86_64/PKGBUILD

----------------------------+
 PKGBUILD                   |   11 ++++++++---
 fix-bug-with-emesene.patch |   18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)


Property changes on: libmsn/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libmsn/trunk:1-25282
   + /libmsn/trunk:1-36551

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-24 14:11:19 UTC (rev 36551)
+++ extra-x86_64/PKGBUILD	2009-04-24 14:25:54 UTC (rev 36552)
@@ -5,18 +5,23 @@
 pkgname=libmsn
 pkgver=4.0beta4
 _pkgver=4.0-beta4
-pkgrel=1
+pkgrel=2
 pkgdesc="A reusable, open-source, fully documented library for connecting to Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/"
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('openssl')
 makedepends=('cmake')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2")
-md5sums=('b0155f01443644d7c4a60269e44d8dac')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2"
+	'fix-bug-with-emesene.patch')
+md5sums=('b0155f01443644d7c4a60269e44d8dac'
+         '0af8ffc14ab0b4abae84e83892d0c1ba')
 
 build() {
   cd ${srcdir}/$pkgname-$_pkgver
+
+  patch -p1 -i ${srcdir}/fix-bug-with-emesene.patch || return 1
+
   mkdir build
   cd build
   cmake -D CMAKE_INSTALL_PREFIX=/usr .. || return 1

Copied: libmsn/repos/extra-x86_64/fix-bug-with-emesene.patch (from rev 36549, libmsn/trunk/fix-bug-with-emesene.patch)
===================================================================
--- extra-x86_64/fix-bug-with-emesene.patch	                        (rev 0)
+++ extra-x86_64/fix-bug-with-emesene.patch	2009-04-24 14:25:54 UTC (rev 36552)
@@ -0,0 +1,18 @@
+--- trunk/msn/message.cpp	2009/03/18 21:57:57	95
++++ trunk/msn/message.cpp	2009/04/03 18:04:25	96
+@@ -59,10 +59,13 @@
+         if (formatHeader.empty())
+             return formatInfo;
+         
+-        std::vector<std::string> parameters = splitString(formatHeader, "; ");
+-        std::vector<std::string>::const_iterator i = parameters.begin();
++        std::vector<std::string> parameters = splitString(formatHeader, ";");
++        std::vector<std::string>::iterator i = parameters.begin();
+         for (; i != parameters.end(); i++)
+         {
++	    if (i->at(0) == ' ')
++	        i->erase(0, 1);
++
+             std::vector<std::string> pair = splitString(*i, "=");
+             if (pair.size() == 2)
+                 formatInfo[decodeURL(pair[0])] = decodeURL(pair[1]);