__user declaration (#76943)

Package-Manager: portage-2.0.51.19

6 files changed, 56 insertions, 14 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 5acd2a34682a..6c95d5df6a93 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.49 2005/04/03 05:48:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.50 2005/04/04 21:05:26 mrness Exp $
+
+  04 Apr 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.1-wireless-user.patch,
+  +files/wvstreams-4.0.2-wireless-user.patch, wvstreams-4.0.1-r2.ebuild,
+  wvstreams-4.0.2.ebuild:
+  Fix compile error regarding __user declaration (#76943).
 
   03 Apr 2005; Luca Barbato <lu_zero@gentoo.org> wvstreams-4.0.2.ebuild:
   Updated SRC_URI and moved to vorbis useflag
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 0c85c9cc0fa3..be16e6ec2f6d 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,17 +1,29 @@
-MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 af7362345fa1ec5902d6676bc12ba5dc wvstreams-4.0.1-r2.ebuild 2208
+MD5 c8e880b3a25402778b3dd6aa63dd400c wvstreams-4.0.2.ebuild 2202
 MD5 88beb02e20267e4fc08543358e899909 wvstreams-4.0-r1.ebuild 1872
-MD5 cfe93e4d7a16d678b6ea85b453d1c833 wvstreams-4.0.1-r2.ebuild 2162
-MD5 802fd621f4e0d476d793af92bf4f04a6 wvstreams-4.0.2.ebuild 2158
-MD5 eca1150136a1e6413b6d590ceed3515c ChangeLog 7810
+MD5 32ee2acc83f1a45054234f41b36a6b5d ChangeLog 8061
+MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235
 MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479
+MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563
+MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
+MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r2 68
 MD5 26127f51d3c7e77edb001d4cb33882d0 files/wvstreams-4.0.2-linux-serial.patch 6412
-MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
+MD5 f606f86f5ef7d07937128fc8dc043c83 files/wvstreams-4.0-tcl_8_4.patch 822
+MD5 7c5ceff9d19db13318a9c8c6de08e7ef files/digest-wvstreams-4.0-r1 66
 MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418
-MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r2 68
-MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563
-MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
-MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2 68
+MD5 0cb9b1e5a568cd8f0e5f186a131a74a5 files/wvstreams-4.0.1-wireless-user.patch 466
+MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
 MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951
-MD5 7c5ceff9d19db13318a9c8c6de08e7ef files/digest-wvstreams-4.0-r1 66
-MD5 f606f86f5ef7d07937128fc8dc043c83 files/wvstreams-4.0-tcl_8_4.patch 822
+MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
+MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCUawijiC39V7gKu0RAjulAJ4uzQv7uPL9PBv6//sJJPMAhGUfuQCfViYC
+DeZ5MS/s73jGxyDuPPvb7lQ=
+=00x+
+-----END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.1-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.0.1-wireless-user.patch
new file mode 100644
index 000000000000..79acbedf4543
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.0.1-wireless-user.patch
@@ -0,0 +1,11 @@
+diff -Nru wvstreams-4.0.1.orig/linuxstreams/wvinterface.cc wvstreams-4.0.1/linuxstreams/wvinterface.cc
+--- wvstreams-4.0.1.orig/linuxstreams/wvinterface.cc	2004-11-18 16:15:05.000000000 +0200
++++ wvstreams-4.0.1/linuxstreams/wvinterface.cc	2005-04-04 23:04:09.079108128 +0300
+@@ -21,6 +21,7 @@
+ #include <errno.h>
+ #include <linux/sockios.h>
+ 
++#include <linux/compiler.h>
+ #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
+ #include <linux/wireless.h>
+ 
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-wireless-user.patch
new file mode 100644
index 000000000000..6ba608656fee
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.0.2-wireless-user.patch
@@ -0,0 +1,11 @@
+diff -Nru wvstreams-4.0.2.orig/linuxstreams/wvinterface.cc wvstreams-4.0.2/linuxstreams/wvinterface.cc
+--- wvstreams-4.0.2.orig/linuxstreams/wvinterface.cc	2005-03-24 04:01:23.000000000 +0200
++++ wvstreams-4.0.2/linuxstreams/wvinterface.cc	2005-04-04 23:06:23.927608040 +0300
+@@ -21,6 +21,7 @@
+ #include <errno.h>
+ #include <linux/sockios.h>
+ 
++#include <linux/compiler.h>
+ #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
+ #include <linux/wireless.h>
+ 
diff --git a/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild b/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
index e06cfd7ec113..8df4b210c331 100644
--- a/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.1-r2.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/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild,v 1.6 2005/03/24 01:50:27 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild,v 1.7 2005/04/04 21:05:26 mrness Exp $
 
 inherit eutils
 
@@ -39,6 +39,7 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	epatch ${FILESDIR}/${P}-linux-serial.patch
+	epatch ${FILESDIR}/${P}-wireless-user.patch
 	epatch ${FILESDIR}/${P}-without-pam.patch
 
 	if useq tcltk; then
diff --git a/net-libs/wvstreams/wvstreams-4.0.2.ebuild b/net-libs/wvstreams/wvstreams-4.0.2.ebuild
index cddf95f3b8c8..277283e9f74d 100644
--- a/net-libs/wvstreams/wvstreams-4.0.2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.2.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/net-libs/wvstreams/wvstreams-4.0.2.ebuild,v 1.3 2005/04/03 05:48:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2.ebuild,v 1.4 2005/04/04 21:05:26 mrness Exp $
 
 inherit eutils
 
@@ -39,6 +39,7 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	epatch ${FILESDIR}/${P}-linux-serial.patch
+	epatch ${FILESDIR}/${P}-wireless-user.patch
 	epatch ${FILESDIR}/${P}-speex-const.patch
 
 	if useq tcltk; then