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

[Yves-Alexis Perez]

Author: corsac
Date: 2009-08-13 21:19:19 +0000 (Thu, 13 Aug 2009)
New Revision: 3424

Added:
   goodies/trunk/xfce4-wavelan-plugin/debian/patches/02_fix-ftbfs-kfreebsd.patch
Modified:
   goodies/trunk/xfce4-wavelan-plugin/debian/changelog
Log:
* debian/patches/
  - 02_fix-ftbfs-kfreebsd added, fix FTBFS on kfreebsd, thanks to
    Aurelien Jarno.

Modified: goodies/trunk/xfce4-wavelan-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-wavelan-plugin/debian/changelog	2009-08-10 06:36:07 UTC (rev 3423)
+++ goodies/trunk/xfce4-wavelan-plugin/debian/changelog	2009-08-13 21:19:19 UTC (rev 3424)
@@ -5,8 +5,11 @@
 
   [ Yves-Alexis Perez ]
   * debian/watch edited to track Xfce archive reorganisation.
+  * debian/patches/
+    - 02_fix-ftbfs-kfreebsd added, fix FTBFS on kfreebsd, thanks to
+      Aurelien Jarno.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 03 Aug 2009 18:33:27 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 13 Aug 2009 23:08:09 +0200
 
 xfce4-wavelan-plugin (0.5.5-2) unstable; urgency=low
 

Added: goodies/trunk/xfce4-wavelan-plugin/debian/patches/02_fix-ftbfs-kfreebsd.patch
===================================================================
--- goodies/trunk/xfce4-wavelan-plugin/debian/patches/02_fix-ftbfs-kfreebsd.patch	                        (rev 0)
+++ goodies/trunk/xfce4-wavelan-plugin/debian/patches/02_fix-ftbfs-kfreebsd.patch	2009-08-13 21:19:19 UTC (rev 3424)
@@ -0,0 +1,113 @@
+--- xfce4-wavelan-plugin-0.5.5.orig/panel-plugin/wi_bsd.c
++++ xfce4-wavelan-plugin-0.5.5/panel-plugin/wi_bsd.c
+@@ -28,7 +28,14 @@
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) 
++#if !defined(__FreeBSD_kernel__) && defined(__FreeBSD__)
++#define __FreeBSD_kernel__ __FreeBSD__
++#endif
++#if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
++#define __FreeBSD_kernel_version __FreeBSD_version
++#endif
++
++#if defined(__NetBSD__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD_kernel_kernel__) || defined(__OpenBSD__) 
+ 
+ #include <sys/types.h>
+ #include <sys/cdefs.h>
+@@ -39,11 +46,11 @@
+ 
+ #include <net/if.h>
+ #include <net/if_media.h>
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#ifdef __FreeBSD_kernel__
+ #include <netinet/in.h>
+ #include <netinet/if_ether.h>
+ #include <sys/endian.h>
+-#if __FreeBSD_version >= 700000
++#if __FreeBSD_kernel_version >= 700000
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #include <net80211/ieee80211_ioctl.h>
+@@ -102,9 +109,9 @@
+ };
+ 
+ static int _wi_carrier(const struct wi_device *);
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD_kernel__)
+ static int _wi_vendor(const struct wi_device *, char *, size_t);
+-#if __FreeBSD_version > 700000
++#if __FreeBSD_kernel_version > 700000
+ static int _wi_getval(const struct wi_device *, struct ieee80211req_scan_result *);
+ #else
+ static int _wi_getval(const struct wi_device *, struct wi_req *);
+@@ -155,7 +162,7 @@
+ 
+   g_strlcpy(stats->ws_qunit, "dBm", 4);
+   /* check vendor (independent of carrier state) */
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD_kernel__)
+   if ((result = _wi_vendor(device, stats->ws_vendor, WI_MAXSTRLEN)) != WI_OK)
+     return(result);
+ #endif
+@@ -290,11 +297,11 @@
+ #endif
+ 
+ /* seems only FreeBSD supports this operation */
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD_kernel__)
+ static int
+ _wi_vendor(const struct wi_device *device, char *buffer, size_t len)
+ {
+-#if defined(__FreeBSD__) && __FreeBSD_version >= 700000
++#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
+    /*
+     * We use sysctl to get a device description
+     */
+@@ -361,9 +368,9 @@
+ #endif /* wi_vendor */
+ 
+ /* NetBSD and FreeBSD 6.x uses old wi_* API */
+-#if defined(__NetBSD__) || defined(__FreeBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD_kernel__)
+ /* FreeBSD 7.x use its own new iee80211 API */
+-#if defined(__FreeBSD__) && __FreeBSD_version >= 700000
++#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
+ static int
+ _wi_getval(const struct wi_device *device, struct ieee80211req_scan_result *scan)
+ {
+@@ -407,7 +414,7 @@
+ static int
+ _wi_netname(const struct wi_device *device, char *buffer, size_t len)
+ {
+-#if defined(__FreeBSD__) && __FreeBSD_version >= 700000
++#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
+    struct ieee80211req ireq;
+ 
+    memset(&ireq, 0, sizeof(ireq));
+@@ -438,7 +445,7 @@
+ static int
+ _wi_quality(const struct wi_device *device, int *quality)
+ {
+-#if defined(__FreeBSD__) && __FreeBSD_version >= 700000
++#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
+    struct ieee80211req_scan_result req;
+    int result;
+    bzero(&req, sizeof(req));
+@@ -470,7 +477,7 @@
+ static int
+ _wi_rate(const struct wi_device *device, int *rate)
+ {
+-#if defined(__FreeBSD__) && __FreeBSD_version >= 700000
++#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
+    struct ieee80211req_scan_result req;
+    int result, i, high;
+    bzero(&req, sizeof(req));
+@@ -500,5 +507,5 @@
+   return(WI_OK);
+ }
+ 
+-#endif  /* defined(__NetBSD__) || defined(__FreeBSD__) */
++#endif  /* defined(__NetBSD__) || defined(__FreeBSD_kernel__) */
+ #endif