[Pkg-xfce-commits] r3807 - in goodies/trunk/xfce4-netload-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-01-11 22:36:42 +0000 (Mon, 11 Jan 2010)
New Revision: 3807

Modified:
   goodies/trunk/xfce4-netload-plugin/debian/changelog
   goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
Log:
* debian/patches:
  - 01_fix-ftbfs-kfreebsd refreshed, fix FTBFS on kFreeBSD.   closes: #564651

Modified: goodies/trunk/xfce4-netload-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/changelog	2010-01-10 11:46:45 UTC (rev 3806)
+++ goodies/trunk/xfce4-netload-plugin/debian/changelog	2010-01-11 22:36:42 UTC (rev 3807)
@@ -1,3 +1,10 @@
+xfce4-netload-plugin (0.4.0-4) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_fix-ftbfs-kfreebsd refreshed, fix FTBFS on kFreeBSD.   closes: #564651
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 11 Jan 2010 23:26:04 +0100
+
 xfce4-netload-plugin (0.4.0-3) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch	2010-01-10 11:46:45 UTC (rev 3806)
+++ goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch	2010-01-11 22:36:42 UTC (rev 3807)
@@ -1,5 +1,7 @@
---- xfce4-netload-plugin-0.4/panel-plugin/net.c	2007-03-21 06:50:46.313144000 +0100
-+++ xfce4-netload-plugin-0.4/panel-plugin/net.c	2007-03-21 06:50:55.000000000 +0100
+diff --git a/panel-plugin/net.c b/panel-plugin/net.c
+index e49390d..2e835c8 100644
+--- a/panel-plugin/net.c
++++ b/panel-plugin/net.c
 @@ -46,7 +46,7 @@
  #elif __APPLE__
  # include "src/macos.h"
@@ -9,9 +11,11 @@
  # include "wormulon/freebsd.h"
  # include "wormulon/freebsd.c"
  #elif __linux__
---- xfce4-netload-plugin-0.4/panel-plugin/net.h	2007-03-21 06:50:25.809095000 +0100
-+++ xfce4-netload-plugin-0.4/panel-plugin/net.h	2007-03-21 06:50:40.000000000 +0100
-@@ -62,7 +62,7 @@
+diff --git a/panel-plugin/net.h b/panel-plugin/net.h
+index ad0c262..4bd20cb 100644
+--- a/panel-plugin/net.h
++++ b/panel-plugin/net.h
+@@ -62,7 +62,7 @@ typedef struct
  #ifdef __HPUX__
      int             wait_pcks_counter;
      nmapi_logstat*  if_ptr;
@@ -20,8 +24,10 @@
      int             watchif;
      int             dev_opened;
  #elif __NetBSD__
---- xfce4-netload-plugin-0.4/panel-plugin/os.h	2007-03-21 06:49:38.438606000 +0100
-+++ xfce4-netload-plugin-0.4/panel-plugin/os.h	2007-03-21 06:50:09.000000000 +0100
+diff --git a/panel-plugin/os.h b/panel-plugin/os.h
+index 524fefb..e49a356 100644
+--- a/panel-plugin/os.h
++++ b/panel-plugin/os.h
 @@ -72,7 +72,7 @@
  #include <net/if_media.h>
  #include <net/if_mib.h>
@@ -31,3 +37,14 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <stdarg.h>
+@@ -94,8 +94,10 @@
+ #include <net/if_media.h>
+ #include <net/if_mib.h>
+ #include <arpa/inet.h>
++#if (__FreeBSD_kernel__ < 8) && (__FreeBSD__ < 8)
+ #include <net/ppp_defs.h>
+ #include <net/if_ppp.h>
++#endif
+ #elif __NetBSD__            /* N E T B S D */
+ #include <stdio.h>
+ #include <sys/param.h>