Fix bug 94719: add patch from upstream branch cvs allowing kwifimanager to compile with wireless extensions 28_pre8.

(Portage version: 2.0.51.22-r1)

4 files changed, 25 insertions, 6 deletions

diff --git a/kde-base/kwifimanager/ChangeLog b/kde-base/kwifimanager/ChangeLog
index 4794e4b28915..8c98cdf0b1dc 100644
--- a/kde-base/kwifimanager/ChangeLog
+++ b/kde-base/kwifimanager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kwifimanager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/ChangeLog,v 1.8 2005/06/02 10:00:48 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/ChangeLog,v 1.9 2005/06/29 20:29:23 danarmak Exp $
+
+  29 Jun 2005; Dan Armak <danarmak@gentoo.org>
+  +files/wireless-extensions-api.diff, kwifimanager-3.4.1.ebuild:
+  Fix bug 94719: add patch from upstream branch cvs allowing kwifimanager to
+  compile with wireless extensions 28_pre8.
 
   02 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> kwifimanager-3.4.1.ebuild:
   Correct dependency on wireless-tools for bug #94719.
diff --git a/kde-base/kwifimanager/Manifest b/kde-base/kwifimanager/Manifest
index af7891f3e90a..f9b9327e7d46 100644
--- a/kde-base/kwifimanager/Manifest
+++ b/kde-base/kwifimanager/Manifest
@@ -1,6 +1,7 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 d57fc38c88cc13446c3a1fba907b6b4a ChangeLog 1560
 MD5 a7f56cb97a797d24f9c3837653cbb730 kwifimanager-3.4.0.ebuild 488
-MD5 2432124cf3496c962e4e3971e1da3fc5 kwifimanager-3.4.1.ebuild 493
+MD5 d57fc38c88cc13446c3a1fba907b6b4a ChangeLog 1560
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 584c0f440c0cf59b0392157fea151fcc kwifimanager-3.4.1.ebuild 560
 MD5 622d3497792334fa87e483e249da693d files/digest-kwifimanager-3.4.0 70
 MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kwifimanager-3.4.1 218
+MD5 426360bf289efe11a499f1fa89bb2f4b files/wireless-extensions-api.diff 528
diff --git a/kde-base/kwifimanager/files/wireless-extensions-api.diff b/kde-base/kwifimanager/files/wireless-extensions-api.diff
new file mode 100644
index 000000000000..e6ca15c3112c
--- /dev/null
+++ b/kde-base/kwifimanager/files/wireless-extensions-api.diff
@@ -0,0 +1,11 @@
+--- wifi/interface_wireless_wirelessextensions.cpp	2005/05/04 06:07:06	409205
++++ wifi/interface_wireless_wirelessextensions.cpp	2005/06/23 11:03:38	428163
+@@ -418,7 +418,7 @@
+   essid = (WIFI_CONFIG(info,essid_on) ? WIFI_CONFIG(info,essid) : "any");
+   char
+     ap_addr[256];
+-  iw_pr_ether (ap_addr, (const unsigned char *) info.ap_addr.sa_data);
++  iw_ether_ntop ( (const ether_addr *) info.ap_addr.sa_data, ap_addr);
+   if (access_point_address != ap_addr)
+     emitStatusChanged = true;
+   access_point_address = ap_addr;
diff --git a/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild b/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild
index 0377d6cfd152..bb8129fe1abe 100644
--- a/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild
+++ b/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild,v 1.3 2005/06/02 10:00:48 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild,v 1.4 2005/06/29 20:29:23 danarmak Exp $
 
 KMNAME=kdenetwork
 KMMODULE=wifi
@@ -11,5 +11,7 @@ inherit kde-meta eutils
 DESCRIPTION="KDE wifi (wireless network) gui"
 KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc"
 IUSE=""
-DEPEND="<=net-wireless/wireless-tools-28_pre6"
+DEPEND="net-wireless/wireless-tools"
 KMEXTRA="doc/kwifimanager"
+
+PATCHES="$FILESDIR/wireless-extensions-api.diff" # In cvs, remove for 3.4.2