Add patch to allow compiling on amd64 again thanks to Mehmet Kemal EROL <mehmetkemal@gmx.net> and David Li <matrixhax0r@gmail.com> in bug 141729

Package-Manager: portage-2.1.1_pre3-r5

4 files changed, 52 insertions, 10 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index 71fd829edf2f..e72c1aff8b64 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lastfmplayer
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.5 2006/07/23 18:18:50 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.6 2006/07/28 22:36:26 genstef Exp $
+
+  28 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/lastfmplayer-amd64.patch, lastfmplayer-1.0.0.1_p2113.ebuild:
+  Add patch to allow compiling on amd64 again thanks to Mehmet Kemal EROL
+  <mehmetkemal@gmx.net> and David Li <matrixhax0r@gmail.com> in bug 141729
 
 *lastfmplayer-1.0.0.1_p2113 (23 Jul 2006)
 
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index 06b42af08f02..8f45a67b8509 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -2,14 +2,18 @@ AUX lastfm.protocol 159 RMD160 863935a9ee6f66f5c901f39182278346117f80b3 SHA1 827
 MD5 fb5e9996204c9704722582e18e15fb1a files/lastfm.protocol 159
 RMD160 863935a9ee6f66f5c901f39182278346117f80b3 files/lastfm.protocol 159
 SHA256 c0f82b00703ed8c307e448ae49f173e30801a06ea2eb7a82d21a6b3f75f25093 files/lastfm.protocol 159
-EBUILD lastfmplayer-1.0.0.1_p2113.ebuild 2809 RMD160 b1d80b2992730784dca4122ecc46e3c8df034da2 SHA1 2e31e01370a6b54bb606332c97d86ed74b7a397f SHA256 c3772f506b4ec5b6342fce9f6b43e334711439d582d171631fe7affee2d52c56
-MD5 64a9fc6de8394c2d16dd4c9ed209c62e lastfmplayer-1.0.0.1_p2113.ebuild 2809
-RMD160 b1d80b2992730784dca4122ecc46e3c8df034da2 lastfmplayer-1.0.0.1_p2113.ebuild 2809
-SHA256 c3772f506b4ec5b6342fce9f6b43e334711439d582d171631fe7affee2d52c56 lastfmplayer-1.0.0.1_p2113.ebuild 2809
-MISC ChangeLog 1383 RMD160 6569be062a0def1a204a56c5514eb09d573b0878 SHA1 a9b49d15c077b5b480df87d7779f185687dcd52f SHA256 26797c8aec4eb29118b903a3b8b342c15768175911d58b40d80c8066e557a64b
-MD5 ce7c46f2e5204427b4d7ee86c3904331 ChangeLog 1383
-RMD160 6569be062a0def1a204a56c5514eb09d573b0878 ChangeLog 1383
-SHA256 26797c8aec4eb29118b903a3b8b342c15768175911d58b40d80c8066e557a64b ChangeLog 1383
+AUX lastfmplayer-amd64.patch 1187 RMD160 5d965cbc1e670c0b1b0f121e78577cc9452f6ad6 SHA1 8e03b717b93918910108cf781844175fc46c1413 SHA256 fb282c0067bf91a3d62b208a0ffe39da08cc307f84d5c3d6b6001b948bf6089a
+MD5 98fd5b839973495daeabb4bd64331416 files/lastfmplayer-amd64.patch 1187
+RMD160 5d965cbc1e670c0b1b0f121e78577cc9452f6ad6 files/lastfmplayer-amd64.patch 1187
+SHA256 fb282c0067bf91a3d62b208a0ffe39da08cc307f84d5c3d6b6001b948bf6089a files/lastfmplayer-amd64.patch 1187
+EBUILD lastfmplayer-1.0.0.1_p2113.ebuild 2903 RMD160 a9391c185c3b6c0084fe9fe846ffb1a654789dfe SHA1 d622e2bbe73840c9e10d9b11455a3358ecc7ffa2 SHA256 384a4a3c37cdf3ae76ca24f50a1d661d46ff77bdee72c18d4ddf1797329048ea
+MD5 381af6f2ec67ab810f7487c8af232c0e lastfmplayer-1.0.0.1_p2113.ebuild 2903
+RMD160 a9391c185c3b6c0084fe9fe846ffb1a654789dfe lastfmplayer-1.0.0.1_p2113.ebuild 2903
+SHA256 384a4a3c37cdf3ae76ca24f50a1d661d46ff77bdee72c18d4ddf1797329048ea lastfmplayer-1.0.0.1_p2113.ebuild 2903
+MISC ChangeLog 1656 RMD160 1aee88d3e6310746153b8e7d57e6caab81547d73 SHA1 94c0dcf7303893cee70792f3edbf609d97c1b00b SHA256 a31b622dcd83a2fbfb63f224ac2c859fa2683006b3fcd164c15d29330599ce81
+MD5 596cda08cabb96bd1f4faf0c9acc35ea ChangeLog 1656
+RMD160 1aee88d3e6310746153b8e7d57e6caab81547d73 ChangeLog 1656
+SHA256 a31b622dcd83a2fbfb63f224ac2c859fa2683006b3fcd164c15d29330599ce81 ChangeLog 1656
 MISC metadata.xml 251 RMD160 d7ccc9e1d41d94cb971d83931a8ece9a684f6fc6 SHA1 1a65ae8b81af34d32b85ed8a18e1df5caef40ff3 SHA256 c87b81ca4913491f67f603b92fa806fb2af4f29d1fec96891731d2ac7490cb2b
 MD5 99b44433affea389a5ec121d625af495 metadata.xml 251
 RMD160 d7ccc9e1d41d94cb971d83931a8ece9a684f6fc6 metadata.xml 251
diff --git a/media-sound/lastfmplayer/files/lastfmplayer-amd64.patch b/media-sound/lastfmplayer/files/lastfmplayer-amd64.patch
new file mode 100644
index 000000000000..bff8283df96a
--- /dev/null
+++ b/media-sound/lastfmplayer/files/lastfmplayer-amd64.patch
@@ -0,0 +1,31 @@
+--- src/Makefile	2006-07-28 00:46:38.325333128 -0400
++++ src/Makefile	2006-07-28 00:46:45.732207112 -0400
+@@ -748,7 +748,7 @@
+ 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/main.o main.cpp
+ 
+ build/Loqqer.o: Loqqer.cpp Loqqer.h
+-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/Loqqer.o Loqqer.cpp
++	$(CXX) -c $(CXXFLAGS) -fPIC $(INCPATH) -o build/Loqqer.o Loqqer.cpp
+ 
+ build/container.o: container.cpp container.h \
+ 		playerlistener.h \
+--- src/wizardselectupdatespage.cpp	2006-07-28 14:32:19.099658720 -0400
++++ src/wizardselectupdatespage.cpp	2006-07-28 15:29:14.400454080 -0400
+@@ -86,7 +86,7 @@
+         item->setCheckState(nCheck == 1 ? Qt::Checked : Qt::Unchecked);
+ 
+         // Store its pointer along with string
+-        item->setData(1, reinterpret_cast<unsigned int>(&current));
++        item->setData(1, reinterpret_cast<unsigned long long>(&current));
+     }
+ }
+ 
+@@ -122,7 +122,7 @@
+         {
+             CComponentInfo* pComp =
+                 reinterpret_cast<CComponentInfo*>(
+-                    ui.updatesList->item(i)->data(1).toUInt());
++                    ui.updatesList->item(i)->data(1).toULongLong());
+             vecChecked.push_back(pComp);
+         }
+     }
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild
index 11a7c7dc1c00..bd65210f5485 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.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/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild,v 1.1 2006/07/23 18:18:50 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild,v 1.2 2006/07/28 22:36:26 genstef Exp $
 
 inherit eutils subversion versionator
 
@@ -33,6 +33,8 @@ pkg_setup() {
 
 src_compile() {
 	qmake || die "qmake failed"
+	emake qmake_all || die "emake qmake_all failed"
+	epatch ${FILESDIR}/lastfmplayer-amd64.patch
 	emake || die "emake failed"
 }