compile time fix for 2.6 headers, see #72448 for details

4 files changed, 40 insertions, 29 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index 854eaba2c95d..ec4f6642786d 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/openh323
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.51 2004/11/09 10:36:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.52 2004/11/30 22:30:40 stkn Exp $
+
+  30 Nov 2004; <stkn@gentoo.org> +files/openh323-1.13.2-ixjuser.diff,
+  openh323-1.13.2-r1.ebuild:
+  fixes problem with 2.6 headers (see #72448 for more information),
+  thx to Abdul-Wahid Paterson <aw@lintrix.net> and Bachelier Vincent
+  <vincent_bachelier@yahoo.fr> for this patch
 
   09 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> openh323-1.13.5.ebuild:
   ~alpha keyword.
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index cbf72631bd91..16aaaed72435 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,37 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8ff12b73f518acdd8cc8356ec4fe04b3 openh323-1.13.2-r1.ebuild 4027
-MD5 cba34a1ddf5939fc027e879871a633c7 openh323-1.12.0-r1.ebuild 2821
-MD5 0a3fd72c897ce976e024d66ad6bbf1ca ChangeLog 8518
-MD5 2b323f821a82d94ecaaad482405ac025 openh323-1.13.2.ebuild 3705
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
-MD5 a849ad67e89640b6553a759c07a60c69 openh323-1.13.5.ebuild 4062
-MD5 ac4ea2adff91762288ef0246d7446f48 openh323-1.12.2-r1.ebuild 3106
+MD5 600a575272d12d74811951f6ccd93f55 ChangeLog 8799
 MD5 bc1d3d9e9dfe4dea1ee2195db7e2cd04 openh323-1.11.7.ebuild 1826
-MD5 03ffce610d4d5c1bad37d71290ce3a7b openh323-1.12.2-r2.ebuild 3723
+MD5 cba34a1ddf5939fc027e879871a633c7 openh323-1.12.0-r1.ebuild 2821
 MD5 12403060d8b2aab0cf2256cb868512fc openh323-1.9.10-r1.ebuild 1103
-MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2-r1 68
+MD5 a849ad67e89640b6553a759c07a60c69 openh323-1.13.5.ebuild 4062
+MD5 af3a69233933d2f0e342bbee7f6b5a59 openh323-1.13.2-r1.ebuild 4098
+MD5 03ffce610d4d5c1bad37d71290ce3a7b openh323-1.12.2-r2.ebuild 3723
+MD5 2b323f821a82d94ecaaad482405ac025 openh323-1.13.2.ebuild 3705
+MD5 ac4ea2adff91762288ef0246d7446f48 openh323-1.12.2-r1.ebuild 3106
+MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2 68
+MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.5-include-order.diff 1027
+MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r1 68
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
+MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
 MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
-MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
-MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r2 68
 MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
-MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.5-include-order.diff 1027
+MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
+MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2-r1 68
 MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
+MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
 MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
-MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
-MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2 68
-MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
-MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
 MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
-MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
+MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r2 68
+MD5 2c75f68b5db8444726ae9342b8a02319 files/openh323-1.13.2-ixjuser.diff 285
 MD5 9519f9e7c6a88c9159cba2345725ed9d files/digest-openh323-1.13.5 73
-MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r1 68
+MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
 MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBkJ24ugEuf3OQ0akRAiN3AJ4jzF/2oBQsY5ak2tFz/Vc8Wf957ACggjbS
-b/m4hhb0M77Q3SP56kRm7dA=
-=GweB
------END PGP SIGNATURE-----
diff --git a/net-libs/openh323/files/openh323-1.13.2-ixjuser.diff b/net-libs/openh323/files/openh323-1.13.2-ixjuser.diff
new file mode 100644
index 000000000000..9b26aa5ef6b2
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.13.2-ixjuser.diff
@@ -0,0 +1,11 @@
+--- include/ixjlid.h.orig	2004-01-31 13:13:22.000000000 +0000
++++ include/ixjlid.h	2004-11-29 18:29:07.870950912 +0000
+@@ -257,6 +257,7 @@
+ #ifdef HAS_IXJ
+ #ifdef P_LINUX
+ #include <linux/telephony.h>
++#include <linux/compiler.h>
+ #include <linux/ixjuser.h>
+ #endif
+ #ifdef P_FREEBSD
+
diff --git a/net-libs/openh323/openh323-1.13.2-r1.ebuild b/net-libs/openh323/openh323-1.13.2-r1.ebuild
index 0e9b60cf3f73..53060d174f75 100644
--- a/net-libs/openh323/openh323-1.13.2-r1.ebuild
+++ b/net-libs/openh323/openh323-1.13.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2-r1.ebuild,v 1.15 2004/10/04 22:25:14 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2-r1.ebuild,v 1.16 2004/11/30 22:30:40 stkn Exp $
 
 inherit eutils flag-o-matic
 
@@ -57,6 +57,9 @@ src_unpack() {
 
 	# fix to compile on gcc-3.4 (bug #56951)
 	epatch ${FILESDIR}/${P}-gcc34.diff
+
+	# fix for 2.6 headers (bug #72448)
+	epatch ${FILESDIR}/${P}-ixjuser.diff
 }
 
 src_compile() {