summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Knoblich <stkn@gentoo.org>2004-11-30 22:30:40 +0000
committerStefan Knoblich <stkn@gentoo.org>2004-11-30 22:30:40 +0000
commit247b32616643e281397faa1b31cf755a0ff1dddc (patch)
tree2a26e969cd147a29d282ef637295114a5ed7b1e2 /net-libs/openh323
parentFixed invalid atoms in *DEPEND. (Manifest recommit) (diff)
downloadgentoo-2-247b32616643e281397faa1b31cf755a0ff1dddc.tar.gz
gentoo-2-247b32616643e281397faa1b31cf755a0ff1dddc.tar.bz2
gentoo-2-247b32616643e281397faa1b31cf755a0ff1dddc.zip
compile time fix for 2.6 headers, see #72448 for details
Diffstat (limited to 'net-libs/openh323')
-rw-r--r--net-libs/openh323/ChangeLog8
-rw-r--r--net-libs/openh323/files/openh323-1.13.2-ixjuser.diff11
-rw-r--r--net-libs/openh323/openh323-1.13.2-r1.ebuild5
3 files changed, 22 insertions, 2 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/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() {