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

Angel Velásquez angvp at archlinux.org
Wed Nov 23 08:59:27 EST 2011


    Date: Wednesday, November 23, 2011 @ 08:59:26
  Author: angvp
Revision: 143217

db-move: moved htop from [testing] to [extra] (i686)

Added:
  htop/repos/extra-i686/ChangeLog
    (from rev 143216, htop/repos/testing-i686/ChangeLog)
  htop/repos/extra-i686/PKGBUILD
    (from rev 143216, htop/repos/testing-i686/PKGBUILD)
Deleted:
  htop/repos/extra-i686/ChangeLog
  htop/repos/extra-i686/PKGBUILD
  htop/repos/extra-i686/fix-segfault-small-terminal.patch
  htop/repos/extra-i686/fix-sort-key-bug.patch
  htop/repos/testing-i686/

-----------------------------------+
 ChangeLog                         |   44 +++++++++----------
 PKGBUILD                          |   83 ++++++++++++++++--------------------
 fix-segfault-small-terminal.patch |   24 ----------
 fix-sort-key-bug.patch            |   15 ------
 4 files changed, 60 insertions(+), 106 deletions(-)

Deleted: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2011-11-23 13:53:15 UTC (rev 143216)
+++ extra-i686/ChangeLog	2011-11-23 13:59:26 UTC (rev 143217)
@@ -1,22 +0,0 @@
-2011-10-19  Andrea Scarpino <andrea at archlinux.org>
-    * Enable cgroup support (FS#26155)
-    * Add lsof and strace optional depends (FS#25778)
-    * Fix crash when column is less than 40 (closes FS#25823)
-
-2011-05-17  Angel Velasquez <angvp at archlinux.org>
-	* Added patch to fix --sort-key (closes FS#23224)
-
-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

Copied: htop/repos/extra-i686/ChangeLog (from rev 143216, htop/repos/testing-i686/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2011-11-23 13:59:26 UTC (rev 143217)
@@ -0,0 +1,22 @@
+2011-10-19  Andrea Scarpino <andrea at archlinux.org>
+    * Enable cgroup support (FS#26155)
+    * Add lsof and strace optional depends (FS#25778)
+    * Fix crash when column is less than 40 (closes FS#25823)
+
+2011-05-17  Angel Velasquez <angvp at archlinux.org>
+	* Added patch to fix --sort-key (closes FS#23224)
+
+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

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-11-23 13:53:15 UTC (rev 143216)
+++ extra-i686/PKGBUILD	2011-11-23 13:59:26 UTC (rev 143217)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org> 
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=htop
-pkgver=0.9
-pkgrel=3
-pkgdesc="Interactive process viewer"
-arch=('i686' 'x86_64')
-url="http://htop.sourceforge.net/"
-license=('GPL')
-depends=('ncurses')
-makedepends=('python2')
-optdepends=('lsof' 'strace')
-options=('!emptydirs')
-changelog=ChangeLog
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        'fix-sort-key-bug.patch'
-        'fix-segfault-small-terminal.patch')
-md5sums=('7c5507f35f363f3f40183a2ba3c561f8'
-         '750e8ad8476c5d9738da2a2bc7a7c2b6'
-         'd93e39c9662522367dc3a73cc3057039')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure 
-	sed -i 's|python|python2|' scripts/MakeHeader.py
-
-    patch -Np0 -i "${srcdir}/fix-sort-key-bug.patch"
-    patch -p1 -i "${srcdir}/fix-segfault-small-terminal.patch"
-
-	./configure --prefix=/usr \
-      --enable-unicode \
-      --enable-openvz \
-	  --enable-vserver \
-      --enable-cgroup
-	make 
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install 
-}

Copied: htop/repos/extra-i686/PKGBUILD (from rev 143216, htop/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-11-23 13:59:26 UTC (rev 143217)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org> 
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=htop
+pkgver=1.0
+pkgrel=1
+pkgdesc="Interactive process viewer"
+arch=('i686' 'x86_64')
+url="http://htop.sourceforge.net/"
+license=('GPL')
+depends=('ncurses')
+makedepends=('python2')
+optdepends=('lsof' 'strace')
+options=('!emptydirs')
+changelog=ChangeLog
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('325112ca7947ea1f6d6441f631e00384')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure 
+	sed -i 's|python|python2|' scripts/MakeHeader.py
+
+	./configure --prefix=/usr \
+      --enable-unicode \
+      --enable-openvz \
+	  --enable-vserver \
+      --enable-cgroup
+	make 
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install 
+}

Deleted: extra-i686/fix-segfault-small-terminal.patch
===================================================================
--- extra-i686/fix-segfault-small-terminal.patch	2011-11-23 13:53:15 UTC (rev 143216)
+++ extra-i686/fix-segfault-small-terminal.patch	2011-11-23 13:59:26 UTC (rev 143217)
@@ -1,24 +0,0 @@
---- trunk/Meter.c	2011/08/26 20:52:35	229
-+++ trunk/Meter.c	2011/08/26 20:55:09	230
-@@ -264,13 +264,19 @@
-    
-    w--;
-    x++;
--   char bar[w];
-+
-+   if (w < 1) {
-+      attrset(CRT_colors[RESET_COLOR]);
-+      return;
-+   }
-+   char bar[w + 1];
-    
-    int blockSizes[10];
-    for (int i = 0; i < w; i++)
-       bar[i] = ' ';
- 
--   sprintf(bar + (w-strlen(buffer)), "%s", buffer);
-+   const size_t barOffset = w - MIN(strlen(buffer), w);
-+   snprintf(bar + barOffset, w - barOffset + 1, "%s", buffer);
- 
-    // First draw in the bar[] buffer...
-    double total = 0.0;

Deleted: extra-i686/fix-sort-key-bug.patch
===================================================================
--- extra-i686/fix-sort-key-bug.patch	2011-11-23 13:53:15 UTC (rev 143216)
+++ extra-i686/fix-sort-key-bug.patch	2011-11-23 13:59:26 UTC (rev 143217)
@@ -1,15 +0,0 @@
-From: Roman Kosenko <madkite at gmail.com>
-Date: Thu, 10 Mar 2011 16:23:53 +0200
-Subject: [PATCH] Fix stupid bug with --sort-key
-
---- htop.c.old	2010-11-24 20:45:38.000000000 +0200
-+++ htop.c	2011-03-10 16:32:18.473716667 +0200
-@@ -282,7 +282,7 @@
-             printVersionFlag();
-             break;
-          case 's':
--            if (strcmp(optarg, "help")) {
-+            if (!strcmp(optarg, "help")) {
-                for (int j = 1; j < LAST_PROCESSFIELD; j++)
-                   printf ("%s\n", Process_fieldNames[j]);
-                exit(0);



More information about the arch-commits mailing list