05_kfreebsd_8.0.patch: modified patch from Petr Salinger to make

libgtop2 work correctly with kFreeBSD 8.0. Closes: #559291.
This commit is contained in:
Josselin Mouette
2009-12-03 13:04:56 +00:00
parent 9cd39e5117
commit 858746c513
3 changed files with 30 additions and 0 deletions

7
debian/changelog vendored
View File

@@ -1,3 +1,10 @@
libgtop2 (2.28.0-4) UNRELEASED; urgency=low
* 05_kfreebsd_8.0.patch: modified patch from Petr Salinger to make
libgtop2 work correctly with kFreeBSD 8.0. Closes: #559291.
-- Josselin Mouette <joss@debian.org> Thu, 03 Dec 2009 14:03:50 +0100
libgtop2 (2.28.0-3) unstable; urgency=low libgtop2 (2.28.0-3) unstable; urgency=low
* Switch to quilt for patch management. * Switch to quilt for patch management.

22
debian/patches/05_kfreebsd_8.0.patch vendored Normal file
View File

@@ -0,0 +1,22 @@
Index: libgtop-2.28.0/sysdeps/freebsd/procmap.c
===================================================================
--- libgtop-2.28.0.orig/sysdeps/freebsd/procmap.c 2009-12-03 13:59:57.866694125 +0100
+++ libgtop-2.28.0/sysdeps/freebsd/procmap.c 2009-12-03 14:03:16.298688337 +0100
@@ -42,7 +42,7 @@
#include <sys/pipe.h>
#include <sys/conf.h>
#undef _KERNEL
-#if __FreeBSD_version >= 800038
+#if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
#define _WANT_FILE
#include <sys/file.h>
#undef _WANT_FILE
@@ -113,7 +113,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si,
sizeof (si)) != sizeof (si) ||
-#if __FreeBSD_version >= 800039
+#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039)
kvm_read (server->machine.kd, (gulong) cdev2priv(&si), (char *) &priv,
sizeof (priv))
#else

View File

@@ -2,5 +2,6 @@
02_hurd_stub_backend.patch 02_hurd_stub_backend.patch
03_kfreebsd_installdirs.patch 03_kfreebsd_installdirs.patch
04_kfreebsd_version_check.patch 04_kfreebsd_version_check.patch
05_kfreebsd_8.0.patch
90_autotools.patch 90_autotools.patch
99_ltmain_as-needed.patch 99_ltmain_as-needed.patch