Fixed the 'linux-headers-strict-ansi.patch' to resolve bug #32246.

3 files changed, 63 insertions, 30 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 3a5f20fb46d8..abca80ab43d9 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.35 2003/12/08 23:43:59 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.36 2003/12/11 21:15:24 plasmaroo Exp $
+
+  11 Dec 2003; <plasmaroo@gentoo.org>
+  files/linux-headers-strict-ansi-fix.patch:
+  Updated the 'linux-headers-strict-ansi-fix.patch' patch to fix problematic
+  packages such as kdemultimedia with ANSI compilation errors; this should close
+  bug #32246. Thanks to all those involved in testing this.
 
   09 Dec 2003; <spider@gentoo.org> linux-headers-2.2.20.ebuild,
   linux-headers-2.2.21_pre3.ebuild, linux-headers-2.4.16-r1.ebuild,
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 8bc0c5525fb2..7739c2f29c8f 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,40 +1,40 @@
-MD5 f94e193ce0ee42c9bafd8636b1d701ca ChangeLog 7944
-MD5 e7da64e9c901ae0fb3a8b7d0fc3aa1c4 linux-headers-2.2.21_pre3.ebuild 4092
+MD5 e6b16114a603ba6ec99ecf5655d98074 ChangeLog 8249
 MD5 d6b0bfcaa29c53a2a4c2dc25217b29f6 linux-headers-2.2.20.ebuild 3921
+MD5 c6a2e4e73e3abeb46863357f5ba192ed linux-headers-2.4.17-r5.ebuild 4251
+MD5 d1e1405c1644214541150d85c3471d62 linux-headers-2.4.23.ebuild 3396
+MD5 17a52b29dee50ecf065e8e297bc7dd63 linux-headers-2.4.17-r4.ebuild 4663
+MD5 36c06ea162f33ad13bb6f2b2c4f7222b linux-headers-2.6.0_beta11.ebuild 3735
+MD5 387a7cb8cd6eb1dab952b5b22451b26c linux-headers-2.4.19.ebuild 4622
+MD5 0bb781281de8011730703d16d13e15f3 linux-headers-2.4.16.ebuild 4778
+MD5 5c17aece95a57713fa9ea390d5f48647 linux-headers-2.4.21-r1.ebuild 3888
 MD5 22bc91e645c0b6309611f1a4d12e0412 linux-headers-2.4.16-r1.ebuild 5049
+MD5 732a9212e5a370154579a03d5838dfcb linux-headers-2.4.22.ebuild 3863
+MD5 8c99dcd5f04edf6be779f5be8093f5ff linux-headers-2.4.19-r1.ebuild 4791
+MD5 e92a42061f868f9d2be14edaad669e63 linux-headers-2.4.18.ebuild 3173
+MD5 40b1a0224290f63ee44609d113442479 linux-headers-2.4.21.ebuild 3594
 MD5 5b8b9d5469f190029664ede84a51c68b linux-headers-2.4.16-r3.ebuild 6100
-MD5 0bb781281de8011730703d16d13e15f3 linux-headers-2.4.16.ebuild 4778
+MD5 305d295e0ac41a2153a96f20556cefac linux-headers-2.4.18-r2.ebuild 4552
 MD5 275f0772fee8369cc609d081ad575db3 linux-headers-2.4.17-r3.ebuild 4410
-MD5 17a52b29dee50ecf065e8e297bc7dd63 linux-headers-2.4.17-r4.ebuild 4663
-MD5 c6a2e4e73e3abeb46863357f5ba192ed linux-headers-2.4.17-r5.ebuild 4251
+MD5 e7da64e9c901ae0fb3a8b7d0fc3aa1c4 linux-headers-2.2.21_pre3.ebuild 4092
 MD5 7002d380ec554a0727bc3e151fdd18a9 linux-headers-2.4.18-r1.ebuild 4510
-MD5 305d295e0ac41a2153a96f20556cefac linux-headers-2.4.18-r2.ebuild 4552
-MD5 e92a42061f868f9d2be14edaad669e63 linux-headers-2.4.18.ebuild 3173
-MD5 8c99dcd5f04edf6be779f5be8093f5ff linux-headers-2.4.19-r1.ebuild 4791
-MD5 387a7cb8cd6eb1dab952b5b22451b26c linux-headers-2.4.19.ebuild 4622
-MD5 40b1a0224290f63ee44609d113442479 linux-headers-2.4.21.ebuild 3594
-MD5 732a9212e5a370154579a03d5838dfcb linux-headers-2.4.22.ebuild 3863
-MD5 5c17aece95a57713fa9ea390d5f48647 linux-headers-2.4.21-r1.ebuild 3888
-MD5 d1e1405c1644214541150d85c3471d62 linux-headers-2.4.23.ebuild 3396
-MD5 36c06ea162f33ad13bb6f2b2c4f7222b linux-headers-2.6.0_beta11.ebuild 3735
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 07aeae7e5036a3ec3e06d29fd68e9cce files/digest-linux-headers-2.2.20 216
 MD5 167e790d7861e0ed3a31577b31a92968 files/digest-linux-headers-2.2.21_pre3 281
-MD5 ac116e74551067f3bd3a2a3c85ba0b0b files/digest-linux-headers-2.4.16 281
-MD5 4bb39400b782c620a61abff4b8abd627 files/digest-linux-headers-2.4.16-r1 348
+MD5 c3e19cc983ab9e751bc4f5c391e66b0c files/generate-asm-sparc 1656
 MD5 d0ff4105ca806cb26f3f990422722cfb files/digest-linux-headers-2.4.16-r3 429
-MD5 6db03bb67f89f2fb55870bcdba4c24e5 files/digest-linux-headers-2.4.17-r3 145
-MD5 700dfcb704ed5987434f84006e39787e files/digest-linux-headers-2.4.17-r4 144
-MD5 eb4cae8b5b8fddbb2c950fdb70fbedb3 files/digest-linux-headers-2.4.17-r5 145
-MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18 67
-MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18-r1 67
+MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
 MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18-r2 67
-MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-linux-headers-2.4.19 67
+MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
 MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-linux-headers-2.4.19-r1 67
+MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
-MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
-MD5 c3e19cc983ab9e751bc4f5c391e66b0c files/generate-asm-sparc 1656
-MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
-MD5 ffa757e9d7c7d84df85fc94aa5387af8 files/linux-headers-strict-ansi-fix.patch 636
-MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
+MD5 eb4cae8b5b8fddbb2c950fdb70fbedb3 files/digest-linux-headers-2.4.17-r5 145
+MD5 6db03bb67f89f2fb55870bcdba4c24e5 files/digest-linux-headers-2.4.17-r3 145
+MD5 700dfcb704ed5987434f84006e39787e files/digest-linux-headers-2.4.17-r4 144
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 f987b67c4dae89ecdb8baf22c5393ec7 files/digest-linux-headers-2.6.0_beta11 73
+MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
+MD5 4bb39400b782c620a61abff4b8abd627 files/digest-linux-headers-2.4.16-r1 348
+MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18-r1 67
+MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-linux-headers-2.4.19 67
+MD5 ac116e74551067f3bd3a2a3c85ba0b0b files/digest-linux-headers-2.4.16 281
+MD5 07aeae7e5036a3ec3e06d29fd68e9cce files/digest-linux-headers-2.2.20 216
+MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
diff --git a/sys-kernel/linux-headers/files/linux-headers-strict-ansi-fix.patch b/sys-kernel/linux-headers/files/linux-headers-strict-ansi-fix.patch
index 1e6a1f657308..f0f142c1ef00 100644
--- a/sys-kernel/linux-headers/files/linux-headers-strict-ansi-fix.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-strict-ansi-fix.patch
@@ -19,3 +19,30 @@
  /*
   * These aren't exported outside the kernel to avoid name space clashes
   */
+--- linux-2.4.22/include/asm-i386/byteorder.h	2003-12-05 20:02:56.000000000 +0000
++++ linux-2.4.22.plasmaroo/include/asm-i386/byteorder.h	2003-12-05 20:05:45.000000000 +0000
+@@ -35,7 +35,7 @@
+ }
+ 
+ 
+-static inline __u64 ___arch__swab64(__u64 val) 
++static __inline__ __const__ __u64 ___arch__swab64(__u64 val)
+ { 
+ 	union { 
+ 		struct { __u32 a,b; } s;
+@@ -43,13 +43,13 @@
+ 	} v;
+ 	v.u = val;
+ #ifdef CONFIG_X86_BSWAP
+-	asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" 
++	__asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" 
+ 	    : "=r" (v.s.a), "=r" (v.s.b) 
+ 	    : "0" (v.s.a), "1" (v.s.b)); 
+ #else
+    v.s.a = ___arch__swab32(v.s.a); 
+ 	v.s.b = ___arch__swab32(v.s.b); 
+-	asm("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b));
++	__asm__("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b));
+ #endif
+ 	return v.u;	
+ }