Chillcraft/libgtop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove those kfreebsd patches which have been merged upstream.

Browse Source
This commit is contained in:
Michael Biebl
2013-09-05 00:46:49 +00:00
parent 5a9e90d6d1
commit 66d0f23d03
5 changed files with 1 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@@ -1,6 +1,7 @@
libgtop2 (2.28.5-1) UNRELEASED; urgency=low
* New upstream release.
* Remove those kfreebsd patches which have been merged upstream.
-- Michael Biebl <biebl@debian.org> Thu, 05 Sep 2013 02:37:50 +0200

23
debian/patches/01_kfreebsd_kvm_libs.patch vendored
View File

@@ -1,23 +0,0 @@
Description: FTBFS on GNU/kFreeBSD
Bug-Debian: http://bugs.debian.org/555316
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=601319
Author: Petr Salinger <Petr.Salinger@seznam.cz>
diff -Nur -x '*.orig' -x '*~' libgtop2-2.28.0/libgtop-sysdeps.m4 libgtop2-2.28.0.new/libgtop-sysdeps.m4
--- libgtop2-2.28.0/libgtop-sysdeps.m4 2009-07-10 14:14:18.000000000 +0200
+++ libgtop2-2.28.0.new/libgtop-sysdeps.m4 2009-11-09 22:20:31.000000000 +0100
@@ -148,13 +148,7 @@
case "$host_os" in
*bsd*)
- case "$host_os" in
- *kfreebsd*)
- AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS="-lkvm -lfreebsd -lbsd", KVM_LIBS=, -lfreebsd -lbsd);;
- *)
- AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=);;
- esac
-
+ AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
AC_SUBST(KVM_LIBS)
case "$host_os" in

28
debian/patches/04_kfreebsd_version_check.patch vendored
View File

@@ -1,28 +0,0 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602666
Author: Josselin Mouette <joss@debian.org>
The server binary refuses to start when it is not run on the same hardware as
the one where it was built on. This check is utterly and absolutely useless,
and makes it impossible to produce working binary packages.
Index: libgtop-2.28.0/src/daemon/server.c
===================================================================
--- libgtop-2.28.0.orig/src/daemon/server.c 2009-11-22 21:14:47.613184919 +0100
+++ libgtop-2.28.0/src/daemon/server.c 2009-11-22 21:15:02.673188074 +0100
@@ -86,16 +86,6 @@ main(int argc, char *argv[])
LIBGTOP_COMPILE_RELEASE);
_exit (1);
}
-#else
- if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
- strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
- strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
- fprintf (stderr, "Can only run on %s %s %s\n",
- LIBGTOP_COMPILE_SYSTEM,
- LIBGTOP_COMPILE_RELEASE,
- LIBGTOP_COMPILE_MACHINE);
- _exit (1);
- }
#endif
glibtop_init_p (glibtop_global_server, 0, 0);

28
debian/patches/05_kfreebsd_8.0.patch vendored
View File

@@ -1,28 +0,0 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608518
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559291
Author: Petr Salinger <Petr.Salinger@seznam.cz>
Fix a couple of checks for the kFreeBSD kernel.
Index: libgtop2/sysdeps/freebsd/procmap.c
===================================================================
--- libgtop2.orig/sysdeps/freebsd/procmap.c 2011-07-24 21:13:56.000000000 +0200
+++ libgtop2/sysdeps/freebsd/procmap.c 2011-09-06 14:03:04.705871157 +0200
@@ -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 @@
return;
}
-#if __FreeBSD_version >= 800039
+#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039)
if (kvm_read (server->machine.kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv,
sizeof (priv))
#else

3
debian/patches/series vendored
View File

@@ -1,7 +1,4 @@
#01_kfreebsd_kvm_libs.patch
02_hurd_stub_backend.patch
03_kfreebsd_installdirs.patch
04_kfreebsd_version_check.patch
05_kfreebsd_8.0.patch
06_kfreebsd_sys_pipe.patch
99_ltmain_as-needed.patch