r22492 - in /desktop/unstable/libgtop2/debian: changelog patches/05_kfreebsd_8.0.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Dec 3 13:05:10 UTC 2009


Author: joss
Date: Thu Dec  3 13:04:56 2009
New Revision: 22492

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22492
Log:
05_kfreebsd_8.0.patch: modified patch from Petr Salinger to make 
libgtop2 work correctly with kFreeBSD 8.0. Closes: #559291.

Added:
    desktop/unstable/libgtop2/debian/patches/05_kfreebsd_8.0.patch
Modified:
    desktop/unstable/libgtop2/debian/changelog
    desktop/unstable/libgtop2/debian/patches/series

Modified: desktop/unstable/libgtop2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/changelog?rev=22492&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgtop2/debian/changelog [utf-8] Thu Dec  3 13:04:56 2009
@@ -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 at debian.org>  Thu, 03 Dec 2009 14:03:50 +0100
+
 libgtop2 (2.28.0-3) unstable; urgency=low
 
   * Switch to quilt for patch management.

Added: desktop/unstable/libgtop2/debian/patches/05_kfreebsd_8.0.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/patches/05_kfreebsd_8.0.patch?rev=22492&op=file
==============================================================================
--- desktop/unstable/libgtop2/debian/patches/05_kfreebsd_8.0.patch (added)
+++ desktop/unstable/libgtop2/debian/patches/05_kfreebsd_8.0.patch [utf-8] Thu Dec  3 13:04:56 2009
@@ -1,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

Modified: desktop/unstable/libgtop2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/patches/series?rev=22492&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libgtop2/debian/patches/series [utf-8] Thu Dec  3 13:04:56 2009
@@ -2,5 +2,6 @@
 02_hurd_stub_backend.patch
 03_kfreebsd_installdirs.patch
 04_kfreebsd_version_check.patch
+05_kfreebsd_8.0.patch
 90_autotools.patch
 99_ltmain_as-needed.patch




More information about the pkg-gnome-commits mailing list