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

[Ronald van Haren]

    Date: Tuesday, September 30, 2008 @ 06:00:26
  Author: ronald
Revision: 13940

Merged revisions 8616,13938 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/ktorrent/trunk

........
  r8616 | eric | 2008-08-14 02:02:11 +0200 (Thu, 14 Aug 2008) | 2 lines
  
  upgpkg: ktorrent 3.1.2-1
      added missing makedepends
........
  r13938 | ronald | 2008-09-30 11:45:43 +0200 (Tue, 30 Sep 2008) | 1 line
  
  upgpkg: ktorrent 3.1.3-1
........

Added:
  ktorrent/repos/extra-i686/httpserver.patch
    (from rev 13938, ktorrent/trunk/httpserver.patch)
Modified:
  ktorrent/repos/extra-i686/	(properties)
  ktorrent/repos/extra-i686/PKGBUILD

------------------+
 PKGBUILD         |   32 ++++++++++++++++++--------------
 httpserver.patch |   10 ++++++++++
 2 files changed, 28 insertions(+), 14 deletions(-)


Property changes on: ktorrent/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /ktorrent/trunk:1-8609
   + /ktorrent/trunk:1-13939

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-30 09:46:38 UTC (rev 13939)
+++ extra-i686/PKGBUILD	2008-09-30 10:00:26 UTC (rev 13940)
@@ -1,27 +1,31 @@
 # $Id$
-# Maintainer: Travis Willard <travisw at wmpub.ca>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca>
 # Contributor: Georg Grabler <ggrabler at gmail.com>
 
 pkgname=ktorrent
-pkgver=3.1.2
+pkgver=3.1.3
 pkgrel=1
 pkgdesc="A BitTorrent program for KDE"
 arch=('i686' 'x86_64')
 url="http://ktorrent.org"
-license=('GPL')
+license=('GPL2')
 depends=('kdelibs>4' 'gmp' 'qca')
-makedepends=('autoconf' 'perl')
-source=(http://ktorrent.org/downloads/$pkgver/${pkgname}-${pkgver}.tar.bz2)
+makedepends=('autoconf' 'perl' 'automoc4' 'cmake')
+source=(http://ktorrent.org/downloads/$pkgver/${pkgname}-${pkgver}.tar.bz2 \
+	httpserver.patch)
 options=('libtool')
-md5sums=('082c5fb35face3b7290044bc053411a6')
+md5sums=('ce199c12ce0d5947fdf9f05118d9b2b0'
+         '1f25b94615b0bbfa0457c99fb20de3e6')
 
 build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-	make DESTDIR=${pkgdir} install
+	cd ${srcdir}/$pkgname-$pkgver
+
+	# build time patch
+	patch -Np0 -i $srcdir/httpserver.patch || return 1
+
+	cmake .	-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr || return 1
+	make || return 1
+	make DESTDIR=${pkgdir} install || return 1
 }

Copied: ktorrent/repos/extra-i686/httpserver.patch (from rev 13938, ktorrent/trunk/httpserver.patch)
===================================================================
--- extra-i686/httpserver.patch	                        (rev 0)
+++ extra-i686/httpserver.patch	2008-09-30 10:00:26 UTC (rev 13940)
@@ -0,0 +1,10 @@
+--- plugins/webinterface/httpserver.cpp.old
++++ plugins/webinterface/httpserver.cpp
+@@ -29,6 +29,7 @@
+ #include <ktemporaryfile.h>
+ #include <k3streamsocket.h>
+ #include <k3resolver.h>
++#include <time.h>
+ 
+ #include <qfileinfo.h>
+ #include <qstringlist.h>