Gcc 4 patch wrt to bug #144889

Package-Manager: portage-2.1.2_pre3-r3

6 files changed, 115 insertions, 26 deletions

diff --git a/media-sound/djplay/ChangeLog b/media-sound/djplay/ChangeLog
index 497adb4486e2..92d62f0a83a3 100644
--- a/media-sound/djplay/ChangeLog
+++ b/media-sound/djplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/djplay
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/djplay/ChangeLog,v 1.2 2006/03/08 15:34:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/djplay/ChangeLog,v 1.3 2006/10/17 17:11:35 aballier Exp $
+
+  17 Oct 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/djplay-0.3.0-gcc4.patch, metadata.xml, djplay-0.3.0.ebuild:
+  Taking maintainance, adding gcc 4 patch wrt to bug #144889
 
   08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
   djplay-0.3.0.ebuild:
diff --git a/media-sound/djplay/Manifest b/media-sound/djplay/Manifest
index 780dc7d90d8d..c386a1fa903a 100644
--- a/media-sound/djplay/Manifest
+++ b/media-sound/djplay/Manifest
@@ -1,22 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0c766090eb7c207fd1ba162af675f027 ChangeLog 506
-RMD160 90a2fbef4896593a85c0a41ff42c51b9133f9fd8 ChangeLog 506
-SHA256 6511c8d0537d7e8b87b513c1d654008e1e4a951f797581ecd66fd6920af4fe0b ChangeLog 506
-MD5 b710b001f51de81386694e0c1e7faba7 djplay-0.3.0.ebuild 957
-RMD160 68a5f7f790c5baf64fdfaa83f35ecb3c7e64a287 djplay-0.3.0.ebuild 957
-SHA256 f6e5910d331e4f6665c9d6b94f218f32629609c8ef1865aff19106f88902af5b djplay-0.3.0.ebuild 957
-MD5 f11793ac18ac89156eb4d64ffb100d3f files/digest-djplay-0.3.0 64
-RMD160 dc88b448e1e96d0abff83bd18d3d1e2066df2896 files/digest-djplay-0.3.0 64
-SHA256 9c9f356d946e1c4dc615d672fe831188b162bbfb03e33f9af52f10fedfd563f4 files/digest-djplay-0.3.0 64
-MD5 ddfb3333c9094f5009caeec20777064b metadata.xml 248
-RMD160 2db1bef0220609103232cf3f5959a203235830da metadata.xml 248
-SHA256 2fda23b6df8a661010fc6584b3afefb9ef41e8051f1f9a6d6f79199f5bfdb5cf metadata.xml 248
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDvmmAiZjviIA2XgRArEnAJ9lzHxkBvU1pH3ALYbjwEYdRFCG6wCg2Ud7
-otP4vBcvkU+iEuG7HlRnEgU=
-=B+hG
------END PGP SIGNATURE-----
+AUX djplay-0.3.0-gcc4.patch 3197 RMD160 d9a6cec1c92ecd6b165298a4905fa5917868c4b3 SHA1 4aaa806eb31bb5a4bf686d98e02772ea91bcc7f4 SHA256 4802b9ce0a136237b29d8e46e65808ef8c3a50465fbd186ab48ccdeb587d7275
+MD5 ead8fae9511a95880f8cdbdf933da788 files/djplay-0.3.0-gcc4.patch 3197
+RMD160 d9a6cec1c92ecd6b165298a4905fa5917868c4b3 files/djplay-0.3.0-gcc4.patch 3197
+SHA256 4802b9ce0a136237b29d8e46e65808ef8c3a50465fbd186ab48ccdeb587d7275 files/djplay-0.3.0-gcc4.patch 3197
+DIST djplay-0.3.0.tar.gz 586474 RMD160 0c20de8bcc341733be7349b1d4056f9a6b1c78c1 SHA1 4784dc507683e1655dd2eb65d0e1623f55d18cb8 SHA256 7c9c4c330dd03f84943300ae507341744cc81d9cedc6e3c0bf769f2a094eaf1f
+EBUILD djplay-0.3.0.ebuild 994 RMD160 de6b8ee3e79ce6ebf6663be5fdafbe0c0233ba39 SHA1 8f5ed3de019a885749c23a82bd9034899f093d06 SHA256 f51bb3ac487059a2d7fd2acb26b281f4d59e3c7fc7021b8d5cf0c8f0893a7dbb
+MD5 083bff8874213acc73abc15d54599f11 djplay-0.3.0.ebuild 994
+RMD160 de6b8ee3e79ce6ebf6663be5fdafbe0c0233ba39 djplay-0.3.0.ebuild 994
+SHA256 f51bb3ac487059a2d7fd2acb26b281f4d59e3c7fc7021b8d5cf0c8f0893a7dbb djplay-0.3.0.ebuild 994
+MISC ChangeLog 688 RMD160 45f5f41e6015d39a79572b4ab04480d9b368f49a SHA1 5305c4813541b7dc888c4ce01e39d2ab1f116250 SHA256 f3b1c3e126cff14bb8ec60f23d5bfb5eb2e08d59b5e595938e20ca43ad7c0b6d
+MD5 8d5b82f36eec0b381320eef3bea5734c ChangeLog 688
+RMD160 45f5f41e6015d39a79572b4ab04480d9b368f49a ChangeLog 688
+SHA256 f3b1c3e126cff14bb8ec60f23d5bfb5eb2e08d59b5e595938e20ca43ad7c0b6d ChangeLog 688
+MISC metadata.xml 248 RMD160 c7f720eb33fe22c475808cefc20781099f9ca6c5 SHA1 0807051ee930d86bbb5ad31c30347f5a0ad94552 SHA256 dcb9d4fdc80f7fb9d58ef5f6e3717dce2934ae523e6ae1b9e82b9c483089cbc5
+MD5 24c788d91e0ff9ae917ac1c1fa21e18d metadata.xml 248
+RMD160 c7f720eb33fe22c475808cefc20781099f9ca6c5 metadata.xml 248
+SHA256 dcb9d4fdc80f7fb9d58ef5f6e3717dce2934ae523e6ae1b9e82b9c483089cbc5 metadata.xml 248
+MD5 190731d7863f8d56b259b5c25ebfb80c files/digest-djplay-0.3.0 238
+RMD160 6c9e70a9889a964ecd68a24102ec27da1cffaff4 files/digest-djplay-0.3.0 238
+SHA256 c45856e0c5c42d86dac7db881cb0ce53e3a0c5c392a94f92b13e7d39ab2125e1 files/digest-djplay-0.3.0 238
diff --git a/media-sound/djplay/djplay-0.3.0.ebuild b/media-sound/djplay/djplay-0.3.0.ebuild
index 439000ff06c7..4dec08ea8294 100644
--- a/media-sound/djplay/djplay-0.3.0.ebuild
+++ b/media-sound/djplay/djplay-0.3.0.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/media-sound/djplay/djplay-0.3.0.ebuild,v 1.2 2006/03/08 15:34:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/djplay/djplay-0.3.0.ebuild,v 1.3 2006/10/17 17:11:35 aballier Exp $
 
 IUSE=""
 
@@ -31,6 +31,7 @@ src_unpack() {
 	cd ${S}
 	sed -i "s/INCLUDES = -I\$(QTDIR)\/include/INCLUDES = -I\$(QTDIR)\/include -Iplugins\/bitmapbutton -Iplugins\/bitmapslider/" Makefile.am Makefile.in
 	rm moc_*.cpp
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 }
 
 src_install() {
diff --git a/media-sound/djplay/files/digest-djplay-0.3.0 b/media-sound/djplay/files/digest-djplay-0.3.0
index 49e51eb88a84..b9551d1b9efb 100644
--- a/media-sound/djplay/files/digest-djplay-0.3.0
+++ b/media-sound/djplay/files/digest-djplay-0.3.0
@@ -1 +1,3 @@
 MD5 2d81129cc089c8abf17e47aac8ef5372 djplay-0.3.0.tar.gz 586474
+RMD160 0c20de8bcc341733be7349b1d4056f9a6b1c78c1 djplay-0.3.0.tar.gz 586474
+SHA256 7c9c4c330dd03f84943300ae507341744cc81d9cedc6e3c0bf769f2a094eaf1f djplay-0.3.0.tar.gz 586474
diff --git a/media-sound/djplay/files/djplay-0.3.0-gcc4.patch b/media-sound/djplay/files/djplay-0.3.0-gcc4.patch
new file mode 100644
index 000000000000..c8bbd285b60c
--- /dev/null
+++ b/media-sound/djplay/files/djplay-0.3.0-gcc4.patch
@@ -0,0 +1,84 @@
+diff -N -u djplay-0.3.0/cdlist.cpp djplay-0.3.0-new/cdlist.cpp
+--- djplay-0.3.0/cdlist.cpp	2004-12-07 20:32:12.000000000 +0100
++++ djplay-0.3.0-new/cdlist.cpp	2006-08-28 12:17:31.344450132 +0200
+@@ -184,7 +184,7 @@
+ 				++i;
+ 				VirList *list=(VirList *)obj;
+ 				int id=submenu->insertItem(list->getTitle(), this, SLOT(moveToList(int)));
+-				submenu->setItemParameter(id, (int)list);
++				submenu->setItemParameter(id, (long)list);
+ 			}
+ 			menu->insertItem("Send to", submenu);
+ 		}
+diff -N -u djplay-0.3.0/list.cpp djplay-0.3.0-new/list.cpp
+--- djplay-0.3.0/list.cpp	2005-07-14 11:21:48.000000000 +0200
++++ djplay-0.3.0-new/list.cpp	2006-08-28 12:18:26.844221734 +0200
+@@ -222,7 +222,7 @@
+ 				if(list->isA("PlayerList"))
+ 					autolist=list;
+ 				int id=submenu->insertItem(list->getTitle(), this, SLOT(moveToList(int)));
+-				submenu->setItemParameter(id, (int)list);
++				submenu->setItemParameter(id, (long)list);
+ 			}
+ 			menu->insertItem("Send to", submenu);
+ 		}
+@@ -230,7 +230,7 @@
+ 	if(autolist)
+ 	{
+ 		int id=menu->insertItem("Set Auto list", this, SLOT(setAutoList(int)));
+-		menu->setItemParameter(id, (int)autolist);
++		menu->setItemParameter(id, (long)autolist);
+ 	}
+ 	menu->insertItem("Select all", this, SLOT(selectAll()));
+ 	delete ch;
+diff -N -u djplay-0.3.0/mp3map.h djplay-0.3.0-new/mp3map.h
+--- djplay-0.3.0/mp3map.h	2005-07-14 11:21:50.000000000 +0200
++++ djplay-0.3.0-new/mp3map.h	2006-08-28 12:18:51.998679392 +0200
+@@ -1,10 +1,10 @@
+ class Mp3Map
+ {
+ public:
+-	Mp3Map::Mp3Map();
+-	Mp3Map::Mp3Map(int fd);
+-	Mp3Map::Mp3Map(const char *path);
+-	Mp3Map::~Mp3Map();
++	Mp3Map();
++	Mp3Map(int fd);
++	Mp3Map(const char *path);
++	~Mp3Map();
+ 
+ 	int offset_to_frame(unsigned long offset);
+ 	unsigned long frame_to_offset(int frame);
+diff -N -u djplay-0.3.0/playerlist.cpp djplay-0.3.0-new/playerlist.cpp
+--- djplay-0.3.0/playerlist.cpp	2003-11-09 19:52:03.000000000 +0100
++++ djplay-0.3.0-new/playerlist.cpp	2006-08-28 12:20:54.451699023 +0200
+@@ -149,7 +149,7 @@
+                 ++i;
+                 PlayerList *list=(PlayerList *)obj;
+                 int id=submenu->insertItem(list->getTitle(), this, SLOT(moveToList(int)));
+-                submenu->setItemParameter(id, (int)list);
++                submenu->setItemParameter(id, (long)list);
+             }
+             menu->insertItem("Send to", submenu);
+         }
+diff -N -u djplay-0.3.0/virlist.cpp djplay-0.3.0-new/virlist.cpp
+--- djplay-0.3.0/virlist.cpp	2003-11-10 11:42:29.000000000 +0100
++++ djplay-0.3.0-new/virlist.cpp	2006-08-28 12:21:24.005187431 +0200
+@@ -178,7 +178,7 @@
+ 				if(list->isA("PlayerList"))
+ 					autolist=list;
+                 int id=submenu->insertItem(list->getTitle(), this, SLOT(moveToList(int)));
+-                submenu->setItemParameter(id, (int)list);
++                submenu->setItemParameter(id, (long)list);
+             }
+             menu->insertItem("Send to", submenu);
+         }
+@@ -186,7 +186,7 @@
+ 	if(autolist)
+ 	{
+ 		int id=menu->insertItem("Set Auto list", this, SLOT(setAutoList(int)));
+-		menu->setItemParameter(id, (int)autolist);
++		menu->setItemParameter(id, (long)autolist);
+ 	}
+ 	menu->insertItem("Select all", this, SLOT(selectAll()));
+     delete ch;
diff --git a/media-sound/djplay/metadata.xml b/media-sound/djplay/metadata.xml
index 0c5c334667fb..f4fe049f6a24 100644
--- a/media-sound/djplay/metadata.xml
+++ b/media-sound/djplay/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-<email>fvdpol@gentoo.org</email>
-<name>Frank van de Pol</name>
+<email>aballier@gentoo.org</email>
+<name>Alexis Ballier</name>
 </maintainer>
 </pkgmetadata>