[arch-commits] Commit in htop/repos (4 files)

[Eric Bélanger]

    Date: Monday, September 21, 2009 @ 20:12:10
  Author: eric
Revision: 52632

Merged revisions 52631 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/htop/trunk

........
  r52631 | eric | 2009-09-21 20:11:53 -0400 (Mon, 21 Sep 2009) | 2 lines
  
  upgpkg: htop 0.8.3-1
      Upstream update, Built with vserver and openvz support (close FS#12755)
........

Modified:
  htop/repos/extra-x86_64/	(properties)
  htop/repos/extra-x86_64/ChangeLog
  htop/repos/extra-x86_64/PKGBUILD
Deleted:
  htop/repos/extra-x86_64/htop-treeview.patch

---------------------+
 ChangeLog           |   18 ++++++++++++------
 PKGBUILD            |   23 +++++++++--------------
 htop-treeview.patch |   12 ------------
 3 files changed, 21 insertions(+), 32 deletions(-)


Property changes on: htop/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /htop/trunk:1-21081
   + /htop/trunk:1-52631

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-09-22 00:11:53 UTC (rev 52631)
+++ extra-x86_64/ChangeLog	2009-09-22 00:12:10 UTC (rev 52632)
@@ -1,8 +1,14 @@
+2009-09-21  Eric Belanger  <eric at archlinux.org>
+
+	* htop 0.8.3-1
+	* Upstream update
+	* Built with vserver and openvz support (close FS#12755)
+
 2008-12-09  Alexander Fehr  <pizzapunk gmail com>
 
-  * htop-0.8.1-1:
-  New upstream release.
-  New maintainer.
-  Added patch to fix FS#12235.
-  Enabled Unicode support.
-  Added ChangeLog.
+	* htop-0.8.1-1:
+	* New upstream release
+	* New maintainer
+	* Added patch to fix FS#12235
+	* Enabled Unicode support
+	* Added ChangeLog

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-22 00:11:53 UTC (rev 52631)
+++ extra-x86_64/PKGBUILD	2009-09-22 00:12:10 UTC (rev 52632)
@@ -1,8 +1,8 @@
 # $Id$
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# Maintainer: Eric Belanger <eric at archlinux.org>
 
 pkgname=htop
-pkgver=0.8.1
+pkgver=0.8.3
 pkgrel=1
 pkgdesc="Interactive process viewer"
 arch=('i686' 'x86_64')
@@ -10,19 +10,14 @@
 license=('GPL')
 depends=('ncurses')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/htop/htop-$pkgver.tar.gz
-        htop-treeview.patch)
-md5sums=('f0b259ca29175656de48bf0fa0a2e619'
-         '54613e5237592691da8903fae05780d9')
+source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5c9f093f9eaddf6e77aa6d54c2116d0c')
+sha1sums=('2a0bf90f160b3d019e26712c94db612d6ff9a429')
 
 build() {
-  cd "$srcdir/htop-$pkgver"
-
-  # Fix tree view
-  # http://sourceforge.net/tracker2/?func=detail&aid=2343835&group_id=108839&atid=651635
-  patch -Np1 -i "$srcdir/htop-treeview.patch" || return 1
-
-  ./configure --prefix=/usr --enable-unicode || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c || return 1
+  ./configure --prefix=/usr --enable-unicode --enable-openvz --enable-vserver || return 1
   make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }

Deleted: extra-x86_64/htop-treeview.patch
===================================================================
--- extra-x86_64/htop-treeview.patch	2009-09-22 00:11:53 UTC (rev 52631)
+++ extra-x86_64/htop-treeview.patch	2009-09-22 00:12:10 UTC (rev 52632)
@@ -1,12 +0,0 @@
-diff -ur htop-0.8.1.orig/ProcessList.c htop-0.8.1/ProcessList.c
---- htop-0.8.1.orig/ProcessList.c	2008-09-23 08:23:14.000000000 +0200
-+++ htop-0.8.1/ProcessList.c	2008-12-09 15:14:56.000000000 +0100
-@@ -331,7 +331,7 @@
- 
-    for (int i = Vector_size(this->processes) - 1; i >= 0; i--) {
-       Process* process = (Process*) (Vector_get(this->processes, i));
--      if (process->tgid == pid || (process->tgid == process->pid && process->ppid == pid)) {
-+      if (process->tgid == pid || process->ppid == pid) {
-          Process* process = (Process*) (Vector_take(this->processes, i));
-          Vector_add(children, process);
-       }