[Pkg-xfce-commits] r9341 - in /goodies/trunk/xfce4-netload-plugin/debian: changelog patches/02_kfreebsd.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Mon Feb 22 10:32:39 2016
New Revision: 9341

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9341
Log:
* debian/patches:
  - 02_kfreebsd added, fix detection of FreeBSD kernel (and FTSB on
    kFreeBSD) by Steven Chamberlain                           closes: #815449

Added:
    goodies/trunk/xfce4-netload-plugin/debian/patches/02_kfreebsd.patch
Modified:
    goodies/trunk/xfce4-netload-plugin/debian/changelog
    goodies/trunk/xfce4-netload-plugin/debian/patches/series

Modified: goodies/trunk/xfce4-netload-plugin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-netload-plugin/debian/changelog?rev=9341&op=diff
==============================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/changelog	(original)
+++ goodies/trunk/xfce4-netload-plugin/debian/changelog	Mon Feb 22 10:32:39 2016
@@ -1,3 +1,11 @@
+xfce4-netload-plugin (1.2.4-2) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 02_kfreebsd added, fix detection of FreeBSD kernel (and FTSB on
+      kFreeBSD) by Steven Chamberlain                           closes: #815449
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 22 Feb 2016 11:31:41 +0100
+
 xfce4-netload-plugin (1.2.4-1) unstable; urgency=low
 
   [ Evgeni Golov ]

Added: goodies/trunk/xfce4-netload-plugin/debian/patches/02_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-netload-plugin/debian/patches/02_kfreebsd.patch?rev=9341&op=file
==============================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/patches/02_kfreebsd.patch	(added)
+++ goodies/trunk/xfce4-netload-plugin/debian/patches/02_kfreebsd.patch	Mon Feb 22 10:32:39 2016
@@ -0,0 +1,39 @@
+--- a/panel-plugin/net.h
++++ b/panel-plugin/net.h
+@@ -69,7 +69,7 @@
+ #ifdef __HPUX__
+     int             wait_pcks_counter;
+     nmapi_logstat*  if_ptr;
+-#elif __FreeBSD__ || __DragonFly__ || __FreeBSD_kernel__
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+     int             watchif;
+     int             dev_opened;
+ #elif __NetBSD__
+@@ -79,7 +79,7 @@
+     char*           buf2;
+     int             alloc1;
+     int             alloc2;
+-#elif __OpenBSD__ || __MicroBSD__ || __APPLE__
++#elif defined(__OpenBSD__) || defined(__MicroBSD__) || defined(__APPLE__)
+     int             mib_name1[6];
+     int             mib_name2[6];
+     char*           buf1;
+--- a/panel-plugin/net.c
++++ b/panel-plugin/net.c
+@@ -50,13 +50,13 @@
+ #elif __APPLE__
+ # include "src/macos.h"
+ # include "src/macos.c"
+-#elif __FreeBSD__ || __DragonFly__ || __FreeBSD_kernel__
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+ # include "wormulon/freebsd.h"
+ # include "wormulon/freebsd.c"
+ #elif __linux__
+ # include "wormulon/linux.h"
+ # include "wormulon/linux.c"
+-#elif __OpenBSD__ || __MicroBSD__
++#elif defined(__OpenBSD__) || defined(__MicroBSD__)
+ # include "wormulon/openbsd.h"
+ # include "wormulon/openbsd.c"
+ #elif __NetBSD__
+

Modified: goodies/trunk/xfce4-netload-plugin/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-netload-plugin/debian/patches/series?rev=9341&op=diff
==============================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/patches/series	(original)
+++ goodies/trunk/xfce4-netload-plugin/debian/patches/series	Mon Feb 22 10:32:39 2016
@@ -1 +1,2 @@
 01_drop-include-sysctl.h.patch
+02_kfreebsd.patch