Fix building with recent toolchain (missing #include <cstdlib> for function "free") wrt #405667 by Piotr Szymaniak and Krzysztof Kundzicz. Install 128x128 icon to hicolor directory instead of legacy pixmaps and update icon cache.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 51 insertions, 18 deletions

diff --git a/media-sound/qtscrobbler/ChangeLog b/media-sound/qtscrobbler/ChangeLog
index da70319c8a73..82566c69ff42 100644
--- a/media-sound/qtscrobbler/ChangeLog
+++ b/media-sound/qtscrobbler/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/qtscrobbler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtscrobbler/ChangeLog,v 1.9 2012/05/05 08:47:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtscrobbler/ChangeLog,v 1.10 2012/05/24 03:02:06 ssuominen Exp $
+
+  24 May 2012; Samuli Suominen <ssuominen@gentoo.org> qtscrobbler-0.10.ebuild,
+  +files/qtscrobbler-0.10-free.patch:
+  Fix building with recent toolchain (missing #include <cstdlib> for function
+  "free") wrt #405667 by Piotr Szymaniak and Krzysztof Kundzicz. Install
+  128x128 icon to hicolor directory instead of legacy pixmaps and update icon
+  cache.
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> qtscrobbler-0.10.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index e363150e2ed8..dc2bdae5175a 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX qtscrobbler-0.10-Makefile.patch 1359 RMD160 b0770f10fa409f1dc1a29d2504e256e778ee64fa SHA1 e72919be7c032032c6a5518b86050fc1d0d42df9 SHA256 3f7437b4ebdfb7085b5575e8aece347304b56647082500f950b8e4f0a2b45dda
+AUX qtscrobbler-0.10-free.patch 623 RMD160 ca5164031b3f50b56a18e32ed5970406e001e6eb SHA1 06739a05444f2e4a2ca0fd2db8fcbcf8b6d76ac2 SHA256 522fe173f6cb6d147398b6679f1f9c4af7e3518e4840e8322ef055c6da23c0d2
 DIST qtscrob-0.10.tar.bz2 132507 RMD160 2319c77e262022f1369aa8cc83fbadf2d2395d1d SHA1 ce0bc2d4fe4a7773fbfd300f7e1a271bad88888d SHA256 b77451625d4943a1e19e4418616417944091339db7b31983c593f4bf7d73ee7b
-EBUILD qtscrobbler-0.10.ebuild 1314 RMD160 5f5d3a096bfb7306deb3b08aa06b94d653eb04b0 SHA1 2c6bdc254c52a7bbe158db4f7c0034d022eaa4ab SHA256 72e7c3cb6280316259592c5a49e9c9f081b5ae6f0e2b2df29ac37e90d925a88b
-MISC ChangeLog 1439 RMD160 d4913047167c9369aa4a8b2137ed756b6c186a70 SHA1 73ea05d6e066f77bbc2507d209047eeb455954d2 SHA256 db0e1cbb40877e01f016aaf65e2e6c6f6654a7e6a08ccd65f09fdcd5280841a0
+EBUILD qtscrobbler-0.10.ebuild 1531 RMD160 baa0803215adec37ad45d65ab1b6eb33ac5fe496 SHA1 76c8121005d4fba0f91d52f1bd31e42e1792fa3e SHA256 b37d720a5308b51b83f0a36035367a202c8b0f8823fb66cd54c7bedd4a0ae00f
+MISC ChangeLog 1799 RMD160 f474499d68c449f92af93319ffa7b6ebe2a3b6de SHA1 73ba7aaae4c67518b7ffd3be27af400f123a052c SHA256 bea0d48563264b9ce36beb9d6b85afa2d52511b1d1b3ef035a97bda2922eec30
 MISC metadata.xml 230 RMD160 e4eadb1f04df0059db1cfcf2be4b985b7dbad5a9 SHA1 d04586124a91e94d252da19ffcba5d67d2dabe0c SHA256 28eeba781d0d677392552603cc8bad4bee83475ac5cb70459b5e007cde761342
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k6WUACgkQfXuS5UK5QB3CyAP9HJZK1bZ6yH58RXhIZKVzWInP
-eT81tAPgU8hf0xOJ9LjiaIfHI441OyIjep25DlUDu/ryJty8r1B9W9uFl9oBJZzk
-xXyd8VrBM5GG6JrtQE4OjojaC1WEcHANlVX4qkeSYTLT+lnOqdhAzGY49I3oxyaa
-YzQFSPmwos8ZEQlb6x8=
-=AeeY
+iQEcBAEBAgAGBQJPvaSzAAoJEEdUh39IaPFNbXQH/j3EMTvqLZcoOkRnOFJyN3Fv
+b2V6o2O1VNJmLn9QnVQ1GaG0lmKqcSyZzXX3ImaB4ttJnG+92sRYgLKbk6MTbT6r
+T7ZuG0EZiAj0Y090mTmgQADiBZT4El/g7wnp6lvNBOtmLQZ5gdLXj9V75YE5PMmb
+OV4+N6rxienpxXIJxBXw1PhlCgC4KzPBgYZkOP//S6sXmRP1rJ1YIRsZ2YcwK3s5
+t8OIZG8AwLhn+5kd+ap1YaO5drDBVeWgPS1cl0mfJDPDfEy+hyHLRYt4n1qu/9fH
+/hfIakmlhl61ylQCPlYAjvZboRL3WUw4pppi63pS/8ikfAZvF5GGTOdBgn+Weqc=
+=xBgG
 -----END PGP SIGNATURE-----
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
new file mode 100644
index 000000000000..d6802751f0e0
--- /dev/null
+++ b/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
@@ -0,0 +1,16 @@
+g++ -c ../lib/mtp-libmtp.cpp -o mtp.o -Wall -I../lib `curl-config --cflags` `pkg-config --cflags libmtp` -DHAVE_LIBMTP
+../lib/mtp-libmtp.cpp: In member function ‘void Scrobble::mtp_iterate(bool)’:
+../lib/mtp-libmtp.cpp:104:30: error: ‘free’ was not declared in this scope
+
+http://bugs.gentoo.org/405667
+
+--- src/lib/mtp-libmtp.cpp
++++ src/lib/mtp-libmtp.cpp
+@@ -16,6 +16,7 @@
+  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+  ***************************************************************************/
+ 
++#include <cstdlib> /* free */
+ #include <iostream>
+ #include "libscrobble.h"
+ 
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
index bd89db26e6bd..0aaa56c98f14 100644
--- a/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
+++ b/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild,v 1.5 2012/05/05 08:47:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild,v 1.6 2012/05/24 03:02:06 ssuominen Exp $
 
-EAPI=2
-inherit eutils qt4-r2 toolchain-funcs
+EAPI=4
+inherit eutils gnome2-utils qt4-r2 toolchain-funcs
 
 MY_PN=qtscrob
 MY_P=${MY_PN}-${PV}
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cli +qt4"
 
-RDEPEND="media-libs/libmtp
+RDEPEND=">=media-libs/libmtp-1.1.0
 	net-misc/curl
 	x11-libs/qt-gui:4"
 DEPEND="${RDEPEND}
@@ -26,7 +26,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch \
+		"${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-free.patch
 }
 
 src_configure() {
@@ -40,26 +42,31 @@ src_configure() {
 src_compile() {
 	if use cli; then
 		tc-export CXX
-		emake -C src/cli || die
+		emake -C src/cli
 	fi
 
 	if use qt4; then
-		emake -C src/qt || die
+		emake -C src/qt
 	fi
 }
 
 src_install() {
 	if use cli; then
-		newbin src/cli/scrobble-cli qtscrobbler-cli || die
+		newbin src/cli/scrobble-cli qtscrobbler-cli
 	fi
 
 	if use qt4; then
 		pushd src/qt >/dev/null
 		newbin qtscrob qtscrobbler
-		newicon resources/icons/128.png qtscrobbler.png
+		insinto /usr/share/icons/hicolor/128x128/apps
+		newins resources/icons/128.png qtscrobbler.png
 		make_desktop_entry qtscrobbler QtScrobbler
 		popd >/dev/null
 	fi
 
 	dodoc AUTHORS CHANGELOG README
 }
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }