[Pkg-xfce-commits] r7910 - in /goodies/trunk/xfce4-taskmanager/debian: changelog control patches/01_configure-kfreebsd.patch

[Jackson Doak]

Author: noskcaj-guest
Date: Wed Sep 18 09:15:33 2013
New Revision: 7910

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=7910
Log:
Update 01_configure-kfreebsd.patch. 

Modified:
    goodies/trunk/xfce4-taskmanager/debian/changelog
    goodies/trunk/xfce4-taskmanager/debian/control
    goodies/trunk/xfce4-taskmanager/debian/patches/01_configure-kfreebsd.patch

Modified: goodies/trunk/xfce4-taskmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-taskmanager/debian/changelog?rev=7910&op=diff
==============================================================================
--- goodies/trunk/xfce4-taskmanager/debian/changelog	(original)
+++ goodies/trunk/xfce4-taskmanager/debian/changelog	Wed Sep 18 09:15:33 2013
@@ -1,3 +1,10 @@
+xfce4-taskmanager (1.0.0-4) UNRELEASED; urgency=low
+
+  * Update 01_configure-kfreebsd.patch. Closes: #722924
+    - Build-depend on libkvm-dev [kfreebsd-any]
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Wed, 18 Sep 2013 19:05:41 +1000
+
 xfce4-taskmanager (1.0.0-3) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/trunk/xfce4-taskmanager/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-taskmanager/debian/control?rev=7910&op=diff
==============================================================================
--- goodies/trunk/xfce4-taskmanager/debian/control	(original)
+++ goodies/trunk/xfce4-taskmanager/debian/control	Wed Sep 18 09:15:33 2013
@@ -6,7 +6,7 @@
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 9), libgtk2.0-dev (>= 2.12.0),
  libcairo2-dev (>= 1.5.0), libwnck-dev (>= 2.0), intltool, dh-autoreconf,
- xfce4-dev-tools
+ xfce4-dev-tools, libkvm-dev [kfreebsd-any]
 Standards-Version: 3.9.4
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/xfce4-taskmanager/

Modified: goodies/trunk/xfce4-taskmanager/debian/patches/01_configure-kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-taskmanager/debian/patches/01_configure-kfreebsd.patch?rev=7910&op=diff
==============================================================================
--- goodies/trunk/xfce4-taskmanager/debian/patches/01_configure-kfreebsd.patch	(original)
+++ goodies/trunk/xfce4-taskmanager/debian/patches/01_configure-kfreebsd.patch	Wed Sep 18 09:15:33 2013
@@ -1,15 +1,54 @@
-Description: Enable building on kfreebsd
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: Enable building on kFreeBSD
+ Make use of the "freebsd" OS implementation, as the kernel is the same.
+ .
+ Also, provide build fixes for task-manager-freebsd.c:
+ - include <sys/vmmeter.h>, needed with FreeBSD >= 9.0 (see also the upstream
+   bug #8081)
+ - NZERO is not provided by kfreebsd-kernel-headers, as already provided by
+   limits.h but only when _XOPEN_SOURCE is requested (and it is not in this
+   case); make use of sysconf to query that value instead
+Last-Update: 2013-9-14
+Forwarded: no
 
-Index: xfce4-taskmanager/configure
-===================================================================
---- xfce4-taskmanager.orig/configure	2013-08-18 17:40:21.190603595 +1000
-+++ xfce4-taskmanager/configure	2013-08-18 17:40:21.186603582 +1000
-@@ -13006,7 +13006,7 @@
- done
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,7 +92,7 @@
+ 	ac_os_implementation="skel"
+ else
+ 	case "$target_os" in
+-		freebsd*)
++		freebsd*|kfreebsd*-gnu)
+ 		ac_os_implementation="freebsd"
+ 		AC_CHECK_LIB([kvm], [kvm_openfiles])
+ 		AC_CHECK_HEADERS([fcntl.h kvm.h paths.h pwd.h sys/param.h sys/proc.h \
+--- a/src/task-manager-freebsd.c
++++ b/src/task-manager-freebsd.c
+@@ -18,6 +18,7 @@
+ #include <fcntl.h>
+ #include <paths.h>
+ #include <unistd.h>
++#include <sys/vmmeter.h>
  
- 		;;
--		linux*)
-+		linux*|kfreebsd*-gnu)
- 		ac_os_implementation="linux"
- 		for ac_header in pwd.h signal.h stdio.h string.h sys/resource.h \
- 				sys/stat.h sys/types.h unistd.h
+ #include <glib.h>
+ 
+@@ -104,6 +105,7 @@
+ 	struct passwd *pw;
+ 	char **argv;
+ 	int i;
++	long nzero = sysconf (_SC_NZERO);
+ 
+ 	task->pid = kp->ki_pid;
+ 	task->ppid = kp->ki_ppid;
+@@ -168,9 +170,9 @@
+ 	i++;
+ 	if (!(kp->ki_sflag & PS_INMEM))
+ 		task->state[i++] = 'W';
+-	if (kp->ki_nice < NZERO)
++	if (kp->ki_nice < nzero)
+ 		task->state[i++] = '<';
+-	else if (kp->ki_nice > NZERO)
++	else if (kp->ki_nice > nzero)
+ 		task->state[i++] = 'N';
+ 	if (kp->ki_flag & P_TRACED)
+ 		task->state[i++] = 'X';