r45276 - in /desktop/experimental/libgtop2/debian: changelog patches/04_kfreebsd_version.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Jun 15 19:15:59 2015
New Revision: 45276

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45276
Log:
Fix build failure on kFreeBSD due to undeclared '__FreeBSD_version',
thanks Steven Chamberlain for the patch. Closes: #788709

Added:
    desktop/experimental/libgtop2/debian/patches/04_kfreebsd_version.patch
Modified:
    desktop/experimental/libgtop2/debian/changelog
    desktop/experimental/libgtop2/debian/patches/series

Modified: desktop/experimental/libgtop2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgtop2/debian/changelog?rev=45276&op=diff
==============================================================================
--- desktop/experimental/libgtop2/debian/changelog	[utf-8] (original)
+++ desktop/experimental/libgtop2/debian/changelog	[utf-8] Mon Jun 15 19:15:59 2015
@@ -1,3 +1,10 @@
+libgtop2 (2.30.0-2) UNRELEASED; urgency=medium
+
+  * Fix build failure on kFreeBSD due to undeclared '__FreeBSD_version',
+    thanks Steven Chamberlain for the patch. Closes: #788709
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 15 Jun 2015 21:14:43 +0200
+
 libgtop2 (2.30.0-1) experimental; urgency=medium
 
   [ Jackson Doak ]

Added: desktop/experimental/libgtop2/debian/patches/04_kfreebsd_version.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgtop2/debian/patches/04_kfreebsd_version.patch?rev=45276&op=file
==============================================================================
--- desktop/experimental/libgtop2/debian/patches/04_kfreebsd_version.patch	(added)
+++ desktop/experimental/libgtop2/debian/patches/04_kfreebsd_version.patch	[utf-8] Mon Jun 15 19:15:59 2015
@@ -0,0 +1,21 @@
+From: Steven Chamberlain <steven at pyro.eu.org>
+Date: Mon, 15 Jun 2015 17:09:49 +0100
+
+Support GNU/kFreeBSD by using __FreeBSD_kernel_version here,
+rather than simply __FreeBSD_version (which is only defined in
+FreeBSD itself).
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788709
+--- a/sysdeps/freebsd/open.c
++++ b/sysdeps/freebsd/open.c
+@@ -43,6 +43,10 @@
+ 	server->real_ncpu = ncpus - 1;
+ 	server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
+ 
++#if defined(__FreeBSD__)
+ 	server->os_version_code = __FreeBSD_version;
++#else
++	server->os_version_code = __FreeBSD_kernel_version;
++#endif
+ 
+ }

Modified: desktop/experimental/libgtop2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgtop2/debian/patches/series?rev=45276&op=diff
==============================================================================
--- desktop/experimental/libgtop2/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/libgtop2/debian/patches/series	[utf-8] Mon Jun 15 19:15:59 2015
@@ -1,2 +1,3 @@
 02_hurd_stub_backend.patch
 03_kfreebsd_installdirs.patch
+04_kfreebsd_version.patch