summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2007-03-02 17:06:49 +0000
committerAlexis Ballier <aballier@gentoo.org>2007-03-02 17:06:49 +0000
commit96fde2a84eb20442f90776f989a91e511c0a3fe2 (patch)
tree70c77f0d265f3118b0820479bf1445d162691daa /net-libs/openh323
parentx86 stable wrt bug 129395 (diff)
downloadgentoo-2-96fde2a84eb20442f90776f989a91e511c0a3fe2.tar.gz
gentoo-2-96fde2a84eb20442f90776f989a91e511c0a3fe2.tar.bz2
gentoo-2-96fde2a84eb20442f90776f989a91e511c0a3fe2.zip
Do not include compiler.h, bug #168791
(Portage version: 2.1.2-r13)
Diffstat (limited to 'net-libs/openh323')
-rw-r--r--net-libs/openh323/ChangeLog6
-rw-r--r--net-libs/openh323/files/openh323-1.18.0-compilerh.patch12
-rw-r--r--net-libs/openh323/openh323-1.18.0.ebuild6
3 files changed, 21 insertions, 3 deletions
diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index f248c5c770b7..7dfe7c21b229 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/openh323
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.80 2007/02/22 01:37:04 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.81 2007/03/02 17:06:49 aballier Exp $
+
+ 02 Mar 2007; Alexis Ballier <aballier@gentoo.org>
+ +files/openh323-1.18.0-compilerh.patch, openh323-1.18.0.ebuild:
+ Do not include compiler.h, bug #168791
22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
diff --git a/net-libs/openh323/files/openh323-1.18.0-compilerh.patch b/net-libs/openh323/files/openh323-1.18.0-compilerh.patch
new file mode 100644
index 000000000000..2327420fe8b3
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.18.0-compilerh.patch
@@ -0,0 +1,12 @@
+Index: openh323_v1_18_0/include/ixjlid.h
+===================================================================
+--- openh323_v1_18_0.orig/include/ixjlid.h
++++ openh323_v1_18_0/include/ixjlid.h
+@@ -274,7 +274,6 @@
+
+ #ifdef P_LINUX
+ #include <linux/telephony.h>
+-#include <linux/compiler.h>
+ #include <linux/ixjuser.h>
+ #endif
+
diff --git a/net-libs/openh323/openh323-1.18.0.ebuild b/net-libs/openh323/openh323-1.18.0.ebuild
index ff9d5cbf52de..73a4527796f2 100644
--- a/net-libs/openh323/openh323-1.18.0.ebuild
+++ b/net-libs/openh323/openh323-1.18.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.18.0.ebuild,v 1.7 2006/10/24 03:33:36 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.18.0.ebuild,v 1.8 2007/03/02 17:06:49 aballier Exp $
inherit eutils flag-o-matic multilib
@@ -32,6 +32,8 @@ src_unpack() {
cd ${S}
# Makefile does not work correctly, fix
epatch ${FILESDIR}/${PN}-1.18.0-install.diff
+ # Do not include compiler.h, bug #168791
+ epatch "${FILESDIR}/${P}-compilerh.patch"
}
src_compile() {