fix compile problems

Package-Manager: portage-2.1.3.19

4 files changed, 58 insertions, 20 deletions

diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog
index 93d45a82a604..5554e657c821 100644
--- a/net-dialup/capi4k-utils/ChangeLog
+++ b/net-dialup/capi4k-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/capi4k-utils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.57 2007/05/02 00:15:32 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.58 2007/11/11 14:30:23 genstef Exp $
+
+  11 Nov 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/capi-compile.patch, capi4k-utils-20050718-r3.ebuild:
+  fix compile problems
 
   02 May 2007; Marius Mauch <genone@gentoo.org>
   capi4k-utils-20050718-r3.ebuild:
diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest
index f32615cafdcf..3a0854569fd0 100644
--- a/net-dialup/capi4k-utils/Manifest
+++ b/net-dialup/capi4k-utils/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX README.gentoo 2800 RMD160 20def6cfff0f413e67f017179ae00fdb17ad6ed7 SHA1 6f7a68e7efa87d6d9e181a37085f7336f9f36a0a SHA256 809a82b753b12ad0bd75092ec249fe9044090eeb2c2f32b9f04cb3f46815c6fd
 MD5 c1f67e98c19fe5ece86b9242a00e6a38 files/README.gentoo 2800
 RMD160 20def6cfff0f413e67f017179ae00fdb17ad6ed7 files/README.gentoo 2800
 SHA256 809a82b753b12ad0bd75092ec249fe9044090eeb2c2f32b9f04cb3f46815c6fd files/README.gentoo 2800
+AUX capi-compile.patch 1329 RMD160 deacc8d00db9a41aaa58cc3a58251305840eb55c SHA1 6f7a50b99008c418ee59e382af774017209780f9 SHA256 f50848a7d1461e76c80c4fd88bdf7371d0ae907857479a261d0e0e08a19ab3e7
+MD5 522ccf44392e128e781f689ada2db1d1 files/capi-compile.patch 1329
+RMD160 deacc8d00db9a41aaa58cc3a58251305840eb55c files/capi-compile.patch 1329
+SHA256 f50848a7d1461e76c80c4fd88bdf7371d0ae907857479a261d0e0e08a19ab3e7 files/capi-compile.patch 1329
 AUX capi-isdn 287 RMD160 ca4fd4dad2c0c1f669a8e5f793d7b2afc724a67c SHA1 7f1ef51a033d49f1a859644d23f14187c6183d1b SHA256 2154566eae7ce6694ba54d682627bd24484f81cf885f7ffbbdd0415faba1b16a
 MD5 bc75ed1e49b13568f93fb63a37c5dc70 files/capi-isdn 287
 RMD160 ca4fd4dad2c0c1f669a8e5f793d7b2afc724a67c files/capi-isdn 287
@@ -51,14 +52,14 @@ RMD160 070f398e02331f62849d0ff9469beae6d14076ef files/rcapid.xinetd 236
 SHA256 c0bed83e2e4b7eb08ef7be5f2d3ee0de97cbbb45f5043a9d037c0daca4ebf595 files/rcapid.xinetd 236
 DIST capi4k-patches-20050718-r3.tar.bz2 11871 RMD160 010ef7c6f7cdfc87c7d4ef7622407a5d596c3600 SHA1 429f54974716ea4b3c4379d81bad507eb7739466 SHA256 aa085e7ce700e3a698af99675da419952e6afd8d76b9c641faedc098547c08b3
 DIST capi4k-utils-2005-07-18.tar.gz 862826 RMD160 cadd13328aeef50ab26218614176b4f368b0b19d SHA1 df8590d2b933d8230838667666790ca0ba708b5c SHA256 b162d726a31310fc29e7c0a25a4f82a590457f6a95c1b1168bcd72b6497b5746
-EBUILD capi4k-utils-20050718-r3.ebuild 5239 RMD160 17d97840abd5f6c6400b762b8071113ca818cee6 SHA1 9d45efa0088b3b59d97a9f45508165101d7f0997 SHA256 9bf1d10ad576948321ea58caedef51c690f8d28fad0ed9a80d8be12f5a9efbac
-MD5 4941d3951fead1d9bdeee77c0eb6f9dd capi4k-utils-20050718-r3.ebuild 5239
-RMD160 17d97840abd5f6c6400b762b8071113ca818cee6 capi4k-utils-20050718-r3.ebuild 5239
-SHA256 9bf1d10ad576948321ea58caedef51c690f8d28fad0ed9a80d8be12f5a9efbac capi4k-utils-20050718-r3.ebuild 5239
-MISC ChangeLog 10728 RMD160 386c2e1e0b6c14a04bb7e30745da25aa1efabf0c SHA1 ba35d3bfd8a6616eb3781beb49a8a8a522c4ba9c SHA256 71aac0f26667cd59af065e7f6b9d3c82f0cf9782f5255de1612f28a6c0439d8e
-MD5 d2c6bd4c454c104def0f757f1e6c58a1 ChangeLog 10728
-RMD160 386c2e1e0b6c14a04bb7e30745da25aa1efabf0c ChangeLog 10728
-SHA256 71aac0f26667cd59af065e7f6b9d3c82f0cf9782f5255de1612f28a6c0439d8e ChangeLog 10728
+EBUILD capi4k-utils-20050718-r3.ebuild 5297 RMD160 328a80318c6103f8c1984f7ad5922a57e45b3642 SHA1 4f88cd210590ccc04c21275fb3b4a458fed2fa3c SHA256 117488700a25e5a2de2a43982e03c8059405ff812e4a51a58a91e992f2dd030c
+MD5 6396148a4d5ffe039bc167dcf10d107a capi4k-utils-20050718-r3.ebuild 5297
+RMD160 328a80318c6103f8c1984f7ad5922a57e45b3642 capi4k-utils-20050718-r3.ebuild 5297
+SHA256 117488700a25e5a2de2a43982e03c8059405ff812e4a51a58a91e992f2dd030c capi4k-utils-20050718-r3.ebuild 5297
+MISC ChangeLog 10868 RMD160 3511b7bde9a079875632a38886f77e6fcf1c9ffa SHA1 c8b63750d3d930e8c901fe0032effd4f2c340764 SHA256 b7a9a320d0f089f76a7b5126f63bb20e9a85f2497f776cafc73e59b592db3f1c
+MD5 a8ad45c429f5c1c0954cecf446953f21 ChangeLog 10868
+RMD160 3511b7bde9a079875632a38886f77e6fcf1c9ffa ChangeLog 10868
+SHA256 b7a9a320d0f089f76a7b5126f63bb20e9a85f2497f776cafc73e59b592db3f1c ChangeLog 10868
 MISC metadata.xml 618 RMD160 7dc735e007ea83f896fae31e70ce14b5410035fa SHA1 89000a29d9233eb928388c169cb0993c0f187370 SHA256 b99ca46c9cdbd485f0fc6c1cfe135d9e999b515da81632fb5330ebae8a3d025c
 MD5 57ebf0922074a9d61182c51349de5d53 metadata.xml 618
 RMD160 7dc735e007ea83f896fae31e70ce14b5410035fa metadata.xml 618
@@ -66,10 +67,3 @@ SHA256 b99ca46c9cdbd485f0fc6c1cfe135d9e999b515da81632fb5330ebae8a3d025c metadata
 MD5 0ae5c4ba5e9b9b0c0af08e105fd59fab files/digest-capi4k-utils-20050718-r3 551
 RMD160 9bffdd74ebad4b4838829d5215abd45fb18a5530 files/digest-capi4k-utils-20050718-r3 551
 SHA256 bbe584ede20671beccb3ca7f8c11acc6ffdd215a7dd9fc2a9603e85dc2b44463 files/digest-capi4k-utils-20050718-r3 551
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGN9hj6J2i8a8J4okRAkbpAJ4orWnHKWWVNIlUpSgLjN5EPN0UwwCeJac7
-KnhVHKPKtgr31zgJXdMgIeg=
-=rWiJ
------END PGP SIGNATURE-----
diff --git a/net-dialup/capi4k-utils/capi4k-utils-20050718-r3.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20050718-r3.ebuild
index 54cf5339650e..2cc7de1d6cd0 100644
--- a/net-dialup/capi4k-utils/capi4k-utils-20050718-r3.ebuild
+++ b/net-dialup/capi4k-utils/capi4k-utils-20050718-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r3.ebuild,v 1.6 2007/05/02 00:15:32 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r3.ebuild,v 1.7 2007/11/11 14:30:23 genstef Exp $
 
 inherit eutils multilib linux-info
 
@@ -77,6 +77,9 @@ src_unpack() {
 	use fax || sed -i -e "s:^\(CONFIG_CAPIFAX=.*\)$:# \1:g" .config
 	# build pppdcapiplugin
 	use pppd || sed -i -e "s:^\(CONFIG_PPPDCAPIPLUGIN=.*\)$:# \1:g" .config
+
+	# compile fix
+	epatch "${FILESDIR}/capi-compile.patch"
 }
 
 src_compile() {
diff --git a/net-dialup/capi4k-utils/files/capi-compile.patch b/net-dialup/capi4k-utils/files/capi-compile.patch
new file mode 100644
index 000000000000..031cb83e05a5
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/capi-compile.patch
@@ -0,0 +1,37 @@
+diff -ur capi4k-utils.orig/capi20/capi20.h capi4k-utils/capi20/capi20.h
+--- capi4k-utils.orig/capi20/capi20.h	2007-11-11 14:43:34.000000000 +0100
++++ capi4k-utils/capi20/capi20.h	2007-11-11 14:43:49.000000000 +0100
+@@ -62,9 +62,9 @@
+ int capi20ext_clr_flags(unsigned ApplID, unsigned flags);
+ 
+ char *capi20ext_get_tty_devname(unsigned applid, unsigned ncci,
+-				char *buf, size_t size);
++				char *buf, unsigned int size);
+ char *capi20ext_get_raw_devname(unsigned applid, unsigned ncci,
+-				char *buf, size_t size);
++				char *buf, unsigned int size);
+ 
+ int capi20ext_ncci_opencount(unsigned applid, unsigned ncci);
+ 
+diff -ur capi4k-utils.orig/capifax/id.h capi4k-utils/capifax/id.h
+--- capi4k-utils.orig/capifax/id.h	2007-11-11 14:43:34.000000000 +0100
++++ capi4k-utils/capifax/id.h	2007-11-11 14:44:07.000000000 +0100
+@@ -44,12 +44,12 @@
+ 
+ typedef struct {
+ 	_cbyte length;
+-	_cword rate        __attribute__ ((packed));
+-	_cword resolution  __attribute__ ((packed));
+-	_cword format      __attribute__ ((packed));
+-	_cword pages       __attribute__ ((packed));
+-	_cbyte idlen       __attribute__ ((packed));
+-	_cbyte id[50]      __attribute__ ((packed));
++	_cword rate;
++	_cword resolution;
++	_cword format;
++	_cword pages;
++	_cbyte idlen;
++	_cbyte id[50];
+ } faxNCPI_t;
+ 
+ extern const char *ConnectionStateString[7];