summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2005-08-13 13:20:40 +0000
committerTony Vroon <chainsaw@gentoo.org>2005-08-13 13:20:40 +0000
commitc7a22090e06d959d118d8fb8bd2364eb85c2eaba (patch)
treecdc1ee575288f4a99fcf4d2179ac021f2c9c3022 /media-libs/nas
parentAdd sanity checks & fix a cast, based on patches by Ben Bennett <sink@limey.n... (diff)
downloadgentoo-2-c7a22090e06d959d118d8fb8bd2364eb85c2eaba.tar.gz
gentoo-2-c7a22090e06d959d118d8fb8bd2364eb85c2eaba.tar.bz2
gentoo-2-c7a22090e06d959d118d8fb8bd2364eb85c2eaba.zip
GCC 4 compilation fix by Kristiaan Lenaerts <kristiaan.lenaerts@gmail.com>, closes bug #91053.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'media-libs/nas')
-rw-r--r--media-libs/nas/ChangeLog7
-rw-r--r--media-libs/nas/Manifest21
-rw-r--r--media-libs/nas/files/nas-1.7-gcc4.patch12
-rw-r--r--media-libs/nas/nas-1.7-r1.ebuild5
4 files changed, 32 insertions, 13 deletions
diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index 1e80f25acd91..2751f5d44965 100644
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/nas
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.41 2005/06/17 20:27:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.42 2005/08/13 13:20:40 chainsaw Exp $
+
+ 13 Aug 2005; Tony Vroon <chainsaw@gentoo.org> +files/nas-1.7-gcc4.patch,
+ nas-1.7-r1.ebuild:
+ GCC 4 compilation fix by Kristiaan Lenaerts <kristiaan.lenaerts@gmail.com>,
+ closes bug #91053.
17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> nas-1.7-r1.ebuild:
Stable on ppc.
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 34f831159155..c11973fcaadf 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,17 +1,18 @@
MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 0626f895b20c5da1096b952a129cf277 nas-1.7.ebuild 1827
MD5 c463719b4d889b05ee0d9bc8f4c9b30f ChangeLog 5143
+MD5 0626f895b20c5da1096b952a129cf277 nas-1.7.ebuild 1827
MD5 3b67c96b73c8cb790b25e8b1bf14df3c nas-1.5-r1.ebuild 1109
-MD5 9de655765f4ba715b60ffd73a62c74e1 nas-1.6.ebuild 1018
-MD5 6e5925b25008409edc7e32bd6ce73a44 nas-1.7-r1.ebuild 1636
MD5 b8146b42d6df26229f2cdffcf4d549d7 nas-1.6c-r2.ebuild 1820
-MD5 520a4d59a7e5ce53b6130d9e920c064c files/digest-nas-1.7-r1 64
-MD5 ac506d33fb676e68c2a77d95d3f6027e files/digest-nas-1.5-r1 63
-MD5 520a4d59a7e5ce53b6130d9e920c064c files/digest-nas-1.7 64
+MD5 0434a51f4896d08264595e3c96655b06 nas-1.7-r1.ebuild 1667
+MD5 9de655765f4ba715b60ffd73a62c74e1 nas-1.6.ebuild 1018
MD5 4a7327fe2c6fba8c4315133a522358a3 files/digest-nas-1.6 64
-MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c-r2 65
-MD5 53c1b622336ab2a0dabb9da8e69f7f56 files/nas-1.7-header.patch 774
MD5 83023e52672dc59996f4f620563b072a files/nas.conf.d 235
-MD5 f0200b3a05bd59ab92413ec1eee10a5b files/nas-1.5-libaudioMakefile.patch 300
-MD5 fa86b591efa17e2e000c996127a2c77f files/nas-1.6c-header.patch 264
MD5 e533db5e64a7cf585a37091b49735c64 files/nas.init.d 569
+MD5 53c1b622336ab2a0dabb9da8e69f7f56 files/nas-1.7-header.patch 774
+MD5 fa86b591efa17e2e000c996127a2c77f files/nas-1.6c-header.patch 264
+MD5 f0200b3a05bd59ab92413ec1eee10a5b files/nas-1.5-libaudioMakefile.patch 300
+MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c-r2 65
+MD5 520a4d59a7e5ce53b6130d9e920c064c files/digest-nas-1.7 64
+MD5 7967799b246c81b4ee91254561192584 files/nas-1.7-gcc4.patch 442
+MD5 520a4d59a7e5ce53b6130d9e920c064c files/digest-nas-1.7-r1 64
+MD5 ac506d33fb676e68c2a77d95d3f6027e files/digest-nas-1.5-r1 63
diff --git a/media-libs/nas/files/nas-1.7-gcc4.patch b/media-libs/nas/files/nas-1.7-gcc4.patch
new file mode 100644
index 000000000000..24cc7b5f09bd
--- /dev/null
+++ b/media-libs/nas/files/nas-1.7-gcc4.patch
@@ -0,0 +1,12 @@
+diff -u -r server/dia/auutil.c server-new/dia/auutil.c
+--- server/dia/auutil.c 1999-09-05 04:43:13.000000000 +0200
++++ server-new/dia/auutil.c 2005-05-01 15:55:29.317370904 +0200
+@@ -173,7 +173,7 @@
+ AuCreateResourceTypes()
+ {
+ void AuFreeComponent();
+- static void freeFlow();
++ void freeFlow();
+
+ auComponentType = CreateNewResourceType(AuFreeComponent);
+ auFlowType = CreateNewResourceType(freeFlow);
diff --git a/media-libs/nas/nas-1.7-r1.ebuild b/media-libs/nas/nas-1.7-r1.ebuild
index bd4d6cf3d8b2..ac34f82b0348 100644
--- a/media-libs/nas/nas-1.7-r1.ebuild
+++ b/media-libs/nas/nas-1.7-r1.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/media-libs/nas/nas-1.7-r1.ebuild,v 1.6 2005/06/17 20:27:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.7-r1.ebuild,v 1.7 2005/08/13 13:20:40 chainsaw Exp $
IUSE="static"
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}
src_unpack() {
unpack ${A}
cd ${S}
- epatch ${FILESDIR}/${PN}-1.7-header.patch
+ epatch ${FILESDIR}/${P}-header.patch
+ epatch ${FILESDIR}/${P}-gcc4.patch
}
src_compile() {