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

[Giovanni Scafora]

    Date: Tuesday, June 9, 2009 @ 06:40:49
  Author: giovanni
Revision: 42033

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

........
  r41995 | andrea | 2009-06-08 16:26:36 -0700 (lun, 08 giu 2009) | 1 line
  
  upgpkg: libmsn 4.0beta5-1
........

Modified:
  libmsn/repos/extra-x86_64/	(properties)
  libmsn/repos/extra-x86_64/PKGBUILD
Deleted:
  libmsn/repos/extra-x86_64/fix-bug-with-emesene.patch

----------------------------+
 PKGBUILD                   |   14 +++++---------
 fix-bug-with-emesene.patch |   18 ------------------
 2 files changed, 5 insertions(+), 27 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-09 10:34:35 UTC (rev 42032)
+++ extra-x86_64/PKGBUILD	2009-06-09 10:40:49 UTC (rev 42033)
@@ -3,25 +3,21 @@
 # Contributor: Charly Ghislain <charlyghislain at gmail.com>
 
 pkgname=libmsn
-pkgver=4.0beta4
-_pkgver=4.0-beta4
-pkgrel=2
+pkgver=4.0beta5
+_pkgver=4.0-beta5
+pkgrel=1
 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"
-	'fix-bug-with-emesene.patch')
-md5sums=('b0155f01443644d7c4a60269e44d8dac'
-         '0af8ffc14ab0b4abae84e83892d0c1ba')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2)
+md5sums=('6bf224d5571d6cb2a3380d505e22f1fb')
 
 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

Deleted: extra-x86_64/fix-bug-with-emesene.patch
===================================================================
--- extra-x86_64/fix-bug-with-emesene.patch	2009-06-09 10:34:35 UTC (rev 42032)
+++ extra-x86_64/fix-bug-with-emesene.patch	2009-06-09 10:40:49 UTC (rev 42033)
@@ -1,18 +0,0 @@
---- 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]);