Applied patch to fix compile problem with newer alsa-lib.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 34 insertions, 9 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index ecb6b27b7df0..64e0580b2394 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/kaffe
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.41 2006/01/15 18:58:30 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.42 2006/01/20 05:32:03 nichoj Exp $
+
+  20 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/kaffe-1.1.6-alsa.patch, kaffe-1.1.6-r2.ebuild:
+  Applied patch from upstream (bug #119272) to fix compile problems with newer
+  version of alsa-lib.
 
   15 Jan 2006; Joshua Nichols <nichoj@gentoo.org> kaffe-1.1.4.ebuild,
   kaffe-1.1.4-r1.ebuild, kaffe-1.1.5.ebuild, kaffe-1.1.5-r1.ebuild,
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index 7229674f3cfb..400ef49f6089 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 879cdbf2167b4dcaa498fed29f8d1173 ChangeLog 6699
+MD5 c45f8fc620bb1f7c35273491d91b8204 ChangeLog 6908
 MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4 64
 MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4-r1 64
 MD5 15d4e7be27bfaa5a835fd5acc810f3ba files/digest-kaffe-1.1.5 64
@@ -12,17 +12,18 @@ MD5 5705b7951b83fc326ce97b101de8cb49 files/kaffe-1.1.4 506
 MD5 6b922132b47393ca82554800904339da files/kaffe-1.1.4-r1 467
 MD5 db3c5b7c7434756580165a330667dde8 files/kaffe-1.1.5 464
 MD5 42825d131cd9a6c5f3ed65112e06f7a7 files/kaffe-1.1.6 464
+MD5 eddf093a0ea65d4d6f9bc7799250660c files/kaffe-1.1.6-alsa.patch 1132
 MD5 23e8c44e1f004349a3db5ca1bf2f5c47 kaffe-1.1.4-r1.ebuild 1393
 MD5 ee5a07dfacef040bc21d45a6a3d66aac kaffe-1.1.4.ebuild 1349
 MD5 2dcca85c1a74583e9deff9f8b5386edc kaffe-1.1.5-r1.ebuild 2565
 MD5 f1d64d96296bdad2ade674b87f24c17b kaffe-1.1.5.ebuild 1397
-MD5 41e4973adbbe9f3852fe29d2408c93d2 kaffe-1.1.6-r2.ebuild 3177
+MD5 101c1f0e92cfa21705b6f1fc6f732c31 kaffe-1.1.6-r2.ebuild 3291
 MD5 8e843f11037571fd8c1f031874443033 kaffe-1.1.6.ebuild 3109
 MD5 d63ca386275c4844b0c8211d76e01d6f metadata.xml 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDyptnndWRXhKOboURAnMNAJ9OvSbVXygdsz3DTyKIyXiI1SOSbQCglbqi
-d6WT3FahZ7fBLFhLvsgSfhM=
-=spht
+iD8DBQFD0HNandWRXhKOboURAksrAKDIh380X7BgxL03MTzMWjsswMuYAwCeN0vd
+PteoaIV55vBUPuyJmzmE04M=
+=zXVA
 -----END PGP SIGNATURE-----
diff --git a/dev-java/kaffe/files/kaffe-1.1.6-alsa.patch b/dev-java/kaffe/files/kaffe-1.1.6-alsa.patch
new file mode 100644
index 000000000000..55064ec59713
--- /dev/null
+++ b/dev-java/kaffe/files/kaffe-1.1.6-alsa.patch
@@ -0,0 +1,17 @@
+diff -u kaffe/libraries/clib/sound/alsa/constants_check.h:1.1 
+kaffe/libraries/clib/sound/alsa/constants_check.h:1.2
+--- kaffe/libraries/clib/sound/alsa/constants_check.h	2004/04/28 20:42:58	1.1
++++ kaffe/libraries/clib/sound/alsa/constants_check.h	2006/01/18 07:37:43	1.2
+@@ -136,8 +136,12 @@
+ 	assert(SND_SEQ_PRIORITY_HIGH == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_PRIORITY_HIGH);
+ 	assert(SND_SEQ_PRIORITY_MASK == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_PRIORITY_MASK);
+ 	assert(SND_SEQ_CLIENT_SYSTEM == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_SYSTEM);
++#ifdef SND_SEQ_CLIENT_DUMMY
+ 	assert(SND_SEQ_CLIENT_DUMMY == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_DUMMY);
++#endif
++#ifdef SND_SEQ_CLIENT_OSS
+ 	assert(SND_SEQ_CLIENT_OSS == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_OSS);
++#endif
+ /* 	assert(SND_SEQ_FILTER_BROADCAST == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_BROADCAST); */
+ /* 	assert(SND_SEQ_FILTER_MULTICAST == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_MULTICAST); */
+ /* 	assert(SND_SEQ_FILTER_BOUNCE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_BOUNCE); */
diff --git a/dev-java/kaffe/kaffe-1.1.6-r2.ebuild b/dev-java/kaffe/kaffe-1.1.6-r2.ebuild
index 41b45ec5a363..d9f39ecf09e3 100644
--- a/dev-java/kaffe/kaffe-1.1.6-r2.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.6-r2.ebuild,v 1.3 2006/01/15 18:58:30 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.6-r2.ebuild,v 1.4 2006/01/20 05:32:03 nichoj Exp $
 
 inherit base eutils java flag-o-matic
 
@@ -32,7 +32,7 @@ DEPEND="
 	gmp? ( >=dev-libs/gmp-3.1 )"
 RDEPEND=${DEPEND}
 
-#We need to build this after kaffe because it is implemented in java
+# We need to build this after kaffe because it is implemented in java
 PDEPEND="dev-java/gjdoc"
 LICENSE="GPL-2"
 SLOT="0"
@@ -43,7 +43,9 @@ IUSE="alsa esd gmp gtk nls"
 PROVIDE="virtual/jdk
 	virtual/jre"
 
-PATCHES="${DISTDIR}/${P}-kaffeh.patch.bz2"
+# ${P}-alsa is needed to prevent compile errors with newer alsas
+#	(see bug #119272)
+PATCHES="${DISTDIR}/${P}-kaffeh.patch.bz2 ${FILESDIR}/${P}-alsa.patch"
 
 pkg_setup() {
 	if ! use gmp; then