[arch-commits] Commit in kdepimlibs/trunk (PKGBUILD glibc-2.13.patch)

[Andrea Scarpino]

    Date: Monday, February 28, 2011 @ 18:52:43
  Author: andrea
Revision: 111768

KDE 4.6.1

Modified:
  kdepimlibs/trunk/PKGBUILD
Deleted:
  kdepimlibs/trunk/glibc-2.13.patch

------------------+
 PKGBUILD         |   12 +++---------
 glibc-2.13.patch |   13 -------------
 2 files changed, 3 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-28 23:52:39 UTC (rev 111767)
+++ PKGBUILD	2011-02-28 23:52:43 UTC (rev 111768)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.6.0
+pkgver=4.6.1
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64')
@@ -13,16 +13,10 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap'
         'docbook-xsl')
 install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'glibc-2.13.patch')
-sha1sums=('14624960410d270077df530d70d34e270260b3c4'
-        '0a3888f121b313daaf10c1f48e6fc7d058a89a57')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('bba2ed4593c8d658efba4d4a4346d514529a3127')
 
 build() {
-    # Already fixed upstream
-    cd ${srcdir}/${pkgname}-${pkgver}
-    patch -Np0 -i ${srcdir}/glibc-2.13.patch
-
 	cd ${srcdir}
 	mkdir build
 	cd build

Deleted: glibc-2.13.patch
===================================================================
--- glibc-2.13.patch	2011-02-28 23:52:39 UTC (rev 111767)
+++ glibc-2.13.patch	2011-02-28 23:52:43 UTC (rev 111768)
@@ -1,13 +0,0 @@
-Index: kioslave/imap4/imap4.cpp
-===================================================================
---- kioslave/imap4/imap4.cpp	(revision 1216162)
-+++ kioslave/imap4/imap4.cpp	(revision 1216163)
-@@ -2576,7 +2576,7 @@
-     ssize_t copyLen = (len < readBufferLen) ? len : readBufferLen;
-     memcpy(data, readBuffer, copyLen);
-     readBufferLen -= copyLen;
--    if (readBufferLen) memcpy(readBuffer, &readBuffer[copyLen], readBufferLen);
-+    if (readBufferLen) memmove(readBuffer, &readBuffer[copyLen], readBufferLen);
-     return copyLen;
-   }
-   if (!isConnected()) return 0;