Fix compilation errors on gcc-4.1 (#138368).

Package-Manager: portage-2.1-r1

4 files changed, 67 insertions, 12 deletions

diff --git a/app-mobilephone/bemused/ChangeLog b/app-mobilephone/bemused/ChangeLog
index 48d09ceddebf..aaf7dd9552b5 100644
--- a/app-mobilephone/bemused/ChangeLog
+++ b/app-mobilephone/bemused/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/bemused
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bemused/ChangeLog,v 1.3 2006/05/05 14:37:10 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bemused/ChangeLog,v 1.4 2006/06/28 17:51:45 mrness Exp $
+
+  28 Jun 2006; Alin Nastac <mrness@gentoo.org>
+  +files/bemused-1.73-gcc41.patch, bemused-1.73.ebuild:
+  Fix compilation errors on gcc-4.1 (#138368).
 
   05 May 2006; Jon Hood <squinky86@gentoo.org> bemused-1.73.ebuild:
   Add ~amd64, #108312.
diff --git a/app-mobilephone/bemused/Manifest b/app-mobilephone/bemused/Manifest
index 5ee31a2d8759..540d08232690 100644
--- a/app-mobilephone/bemused/Manifest
+++ b/app-mobilephone/bemused/Manifest
@@ -1,16 +1,30 @@
-DIST bemusedlinuxserver-1_73.tar.gz 77143 RMD160 8a1f88201c96eb3592462c88826497c2b224e380 SHA256 efa0c787f1ccde036c03e4eb066ef6d0dac98798ec37098b2a70ce2a02638546 size 77143
-EBUILD bemused-1.73.ebuild 889 RMD160 6acc25422b2a2cd4951afed1a596473bb146bc53 SHA1 04ab880ddee9748344488782e167a06b60380326 SHA256 60f0a3f988ae0ce2722dca196a2582a1a89af63613064d435362e05fb2cf263a size 889
-MD5 eaae217d77a89c53b4272d783bcb310a bemused-1.73.ebuild 889
-RMD160 6acc25422b2a2cd4951afed1a596473bb146bc53 bemused-1.73.ebuild 889
-SHA256 60f0a3f988ae0ce2722dca196a2582a1a89af63613064d435362e05fb2cf263a bemused-1.73.ebuild 889
-MISC ChangeLog 778 RMD160 418afb5aa2448e086c82dee1483e1e5d1f9b1019 SHA1 d1155dff77a333aae5bb4baaf4faee028386e712 SHA256 40fa92fb627c91adcb047bd03f34f771d3135dfab2560945306d0afcff036678 size 778
-MD5 7e2d0d24886d182f6805575b6ecbd54c ChangeLog 778
-RMD160 418afb5aa2448e086c82dee1483e1e5d1f9b1019 ChangeLog 778
-SHA256 40fa92fb627c91adcb047bd03f34f771d3135dfab2560945306d0afcff036678 ChangeLog 778
-MISC metadata.xml 451 RMD160 c6efed769faefd0ce190b7fee2f424b578b95eaa SHA1 d34a095794d50435f165dd121d35b8b7dcbba3e7 SHA256 28bb860973ee1976c08cc8cfadf7d91154e226983d5691c560f79e6c1fa40b5c size 451
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX bemused-1.73-gcc41.patch 1843 RMD160 98b18e114e0f3b62442097123833152a55057005 SHA1 72c5d126ff193ecb16432a7ce75e392f8fb0b7a6 SHA256 37aa7fc6e021be4148938d7fd453022e21e32bb7026a9756c7e41687b5a2a0e4
+MD5 4d8012e4d3b2911156db76b4d79d63dd files/bemused-1.73-gcc41.patch 1843
+RMD160 98b18e114e0f3b62442097123833152a55057005 files/bemused-1.73-gcc41.patch 1843
+SHA256 37aa7fc6e021be4148938d7fd453022e21e32bb7026a9756c7e41687b5a2a0e4 files/bemused-1.73-gcc41.patch 1843
+DIST bemusedlinuxserver-1_73.tar.gz 77143 RMD160 8a1f88201c96eb3592462c88826497c2b224e380 SHA1 26dbdbb229401b38c095695971e4d3cf84b3a27d SHA256 efa0c787f1ccde036c03e4eb066ef6d0dac98798ec37098b2a70ce2a02638546
+EBUILD bemused-1.73.ebuild 973 RMD160 d1b26702ecebcbfeb607773c725b03d4ae3283d2 SHA1 736a8a2c266794a935e1af102399a86353c8ec5f SHA256 ab1eb790dbe02c821b0a04e2ba97809ea6cb4fa4e5e4d85fd0af7474b8514a94
+MD5 86a9af70a31cc36d76e1183637e50f2c bemused-1.73.ebuild 973
+RMD160 d1b26702ecebcbfeb607773c725b03d4ae3283d2 bemused-1.73.ebuild 973
+SHA256 ab1eb790dbe02c821b0a04e2ba97809ea6cb4fa4e5e4d85fd0af7474b8514a94 bemused-1.73.ebuild 973
+MISC ChangeLog 926 RMD160 9c9f8bead2d9a28dd818c39f6634b3c71757bccc SHA1 3490d37c32960a909b785bb0b3cf83953b368005 SHA256 3829227d9acd909f91dc1daa3fdb2024b9526b90892885489a45be480fbc5f1f
+MD5 3d9aad4045ca4a776cb719296a975212 ChangeLog 926
+RMD160 9c9f8bead2d9a28dd818c39f6634b3c71757bccc ChangeLog 926
+SHA256 3829227d9acd909f91dc1daa3fdb2024b9526b90892885489a45be480fbc5f1f ChangeLog 926
+MISC metadata.xml 451 RMD160 c6efed769faefd0ce190b7fee2f424b578b95eaa SHA1 d34a095794d50435f165dd121d35b8b7dcbba3e7 SHA256 28bb860973ee1976c08cc8cfadf7d91154e226983d5691c560f79e6c1fa40b5c
 MD5 9672ea9b2345c8f1d48127a47e7e5de7 metadata.xml 451
 RMD160 c6efed769faefd0ce190b7fee2f424b578b95eaa metadata.xml 451
 SHA256 28bb860973ee1976c08cc8cfadf7d91154e226983d5691c560f79e6c1fa40b5c metadata.xml 451
 MD5 46d87433cfc60ee7529d65484f7087e0 files/digest-bemused-1.73 268
 RMD160 167f64e68bebe0cf2cc3be8c891fbaeaa044ca7d files/digest-bemused-1.73 268
 SHA256 5b83c580050aca653f19333fd909524c7f7a417b5a0ea8f382fa54bd4525c6f4 files/digest-bemused-1.73 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEosHA3sf9c6kjmR8RAqppAJ41CBAeUGudrsSPm0CRihwIjPjQEgCeL7sA
+Mf6PqW+If6ZJQ5K31d+eqpQ=
+=5rkC
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/bemused/bemused-1.73.ebuild b/app-mobilephone/bemused/bemused-1.73.ebuild
index f710363419d3..fd94bd53cdb9 100644
--- a/app-mobilephone/bemused/bemused-1.73.ebuild
+++ b/app-mobilephone/bemused/bemused-1.73.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bemused/bemused-1.73.ebuild,v 1.3 2006/05/05 14:37:10 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bemused/bemused-1.73.ebuild,v 1.4 2006/06/28 17:51:45 mrness Exp $
+
+inherit eutils
 
 MY_P=${PN}linuxserver-${PV/./_}
 
@@ -18,6 +20,12 @@ S="${WORKDIR}/${PN}linuxserver${PV}"
 DEPEND="media-sound/xmms
 	net-wireless/bluez-libs"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+}
+
 src_install() {
 	dobin bemusedlinuxserver
 	insinto /etc
diff --git a/app-mobilephone/bemused/files/bemused-1.73-gcc41.patch b/app-mobilephone/bemused/files/bemused-1.73-gcc41.patch
new file mode 100644
index 000000000000..a927754eb72a
--- /dev/null
+++ b/app-mobilephone/bemused/files/bemused-1.73-gcc41.patch
@@ -0,0 +1,29 @@
+diff -Nru bemusedlinuxserver1.73.orig/BemusedServerDlg.h bemusedlinuxserver1.73/BemusedServerDlg.h
+--- bemusedlinuxserver1.73.orig/BemusedServerDlg.h	2004-05-01 17:24:32.000000000 +0300
++++ bemusedlinuxserver1.73/BemusedServerDlg.h	2006-06-28 20:47:58.812926250 +0300
+@@ -63,11 +63,11 @@
+ 	void HandleBluetooth();
+ 
+ 	bool CheckWinamp(const char* aWindowName);
+-  bool CBemusedServerDlg::ReadFile(int handle,char* buffer,int maxbytes,long unsigned int* bytesread,int* bla);
+-  bool CBemusedServerDlg::ReadFile(int handle,unsigned char* buffer,int maxbytes,long unsigned int* bytesread,int* bla);
+-  bool CBemusedServerDlg::WriteFile(int handle, char* buffer,int maxbytes, long unsigned int* byteswritten,int* bla);
+-  bool CBemusedServerDlg::WriteFile(int handle,unsigned char* buffer,int maxbytes, long unsigned int* byteswritten,int* bla);
+-  char* CBemusedServerDlg::GetLastError();
++  bool ReadFile(int handle,char* buffer,int maxbytes,long unsigned int* bytesread,int* bla);
++  bool ReadFile(int handle,unsigned char* buffer,int maxbytes,long unsigned int* bytesread,int* bla);
++  bool WriteFile(int handle, char* buffer,int maxbytes, long unsigned int* byteswritten,int* bla);
++  bool WriteFile(int handle,unsigned char* buffer,int maxbytes, long unsigned int* byteswritten,int* bla);
++  char* GetLastError();
+ 
+ 	void WriteListToPhone();
+ 	void WriteDirectoryListToPhone();
+@@ -99,7 +99,7 @@
+ 	void FadeOut();
+ 	void ReadIniFile();
+ 
+-	void CBemusedServerDlg::AddBookmarks(CDirTreeNode* aNode, CDirTreeNode* pNode, bool aRecursive);
++	void AddBookmarks(CDirTreeNode* aNode, CDirTreeNode* pNode, bool aRecursive);
+ 	void GenerateFileList(const char* aRoot, bool aRecursive);
+ 	void ReadDir(char* aDir, CDirTreeNode* aNode, bool aRecursive);
+ 	bool WriteNodeToBuffer(CDirTreeNode* aNode, unsigned char*& aBufferPtr, int& aSizeRemaining);