[arch-commits] Commit in xfce4-taskmanager/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Thursday, July 15, 2010 @ 17:51:22
  Author: andyrtr
Revision: 85565

upgpkg: xfce4-taskmanager 1.0.0-2
libwnck is not an optional dep, move it to core deps, #20096

Modified:
  xfce4-taskmanager/trunk/PKGBUILD
Deleted:
  xfce4-taskmanager/trunk/0001-linux-Fix-64-bit-issue-for-the-system-Memory-usage.patch

---------------------------------------------------------------+
 0001-linux-Fix-64-bit-issue-for-the-system-Memory-usage.patch |   25 ----------
 PKGBUILD                                                      |   11 ++--
 2 files changed, 5 insertions(+), 31 deletions(-)

Deleted: 0001-linux-Fix-64-bit-issue-for-the-system-Memory-usage.patch
===================================================================
--- 0001-linux-Fix-64-bit-issue-for-the-system-Memory-usage.patch	2010-07-15 21:40:24 UTC (rev 85564)
+++ 0001-linux-Fix-64-bit-issue-for-the-system-Memory-usage.patch	2010-07-15 21:51:22 UTC (rev 85565)
@@ -1,25 +0,0 @@
- src/task-manager-linux.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/src/task-manager-linux.c b/src/task-manager-linux.c
-index 938cee8..f329629 100644
---- a/src/task-manager-linux.c
-+++ b/src/task-manager-linux.c
-@@ -30,6 +30,13 @@ get_memory_usage (guint64 *memory_total, guint64 *memory_free, guint64 *memory_c
- 	gchar *filename = "/proc/meminfo";
- 	gushort found = 0;
- 
-+	*memory_total = 0;
-+	*memory_free = 0;
-+	*memory_cache = 0;
-+	*memory_buffers = 0;
-+	*swap_total = 0;
-+	*swap_free = 0;
-+
- 	if ((file = fopen (filename, "r")) == NULL)
- 		return FALSE;
- 
--- 
-1.7.0.4
-
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-15 21:40:24 UTC (rev 85564)
+++ PKGBUILD	2010-07-15 21:51:22 UTC (rev 85565)
@@ -3,15 +3,14 @@
 
 pkgname=xfce4-taskmanager
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Easy to use task manager"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
 groups=('xfce4-goodies')
-depends=('gtk2')
-optdepends=('libwnck: display window icons/names')
-makedepends=('libwnck' 'pkgconfig' 'intltool')
+depends=('libwnck')
+makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 source=(http://archive.xfce.org/src/apps/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('cd205366ae771d2cbe72b5ca7b1257b0')
@@ -20,10 +19,10 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
     --localstatedir=/var --disable-static
-  make || return 1
+  make
 }
 
 package() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR=${startdir}/pkg install
 }