Applied upstream patch to fix a crash on startup on the info applet caused by a Qt bug.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 192 insertions, 2 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 6dbd54c8dc3f..1a1118094efd 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.368 2010/03/15 12:32:41 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.369 2010/03/28 12:18:04 jmbsvicetto Exp $
+
+*amarok-2.3.0-r1 (28 Mar 2010)
+
+  28 Mar 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.0-r1.ebuild, +files/amarok-2.3.0-crash_fix_info_applet.patch:
+  Applied upstream patch to fix a crash on startup on the info applet caused
+  by a Qt bug.
 
 *amarok-2.3.0 (15 Mar 2010)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 33c0eeb0b576..273f1c614553 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,5 +1,6 @@
 AUX amarok-2.2-mysql-libs.patch 540 RMD160 16b143a50c126ba69851e4c1d1524b1d6b7c175d SHA1 0358c91184604bf4587cfa755202a41ba9c4d346 SHA256 ace02a3f8d20295077de08d17af00382c19ad21ddf4ef324ff7c5e5ec4d666e1
 AUX amarok-2.2.2-nodebug.patch 16478 RMD160 8f8eedbd5a29f10da6243cc4ac586f59ca493a7d SHA1 c2316800d0632b473b14d683415f51a36879922a SHA256 022a655eff5cd918fc61999001a3251de7e406cbffb40127295820eb4e398a29
+AUX amarok-2.3.0-crash_fix_info_applet.patch 1820 RMD160 2ddbd8e30d7c9031eead648430bc8c9e2e6ec0cd SHA1 5aa6fd5ae30c956ea4f4be3d5bb6078af9e88ea3 SHA256 2f48faa43ad621616289b30da5b2febcd2861bc500a73bf9112916d1eeb3b41c
 AUX amarok-qtscriptcheck.patch 1024 RMD160 0693ddd6bbaa2f15d381eec329cfeff1e8b176cd SHA1 0585c08f8159a06c95e89f22e788d6e039224fbb SHA256 8a2983f3bd5ec422f2ed0a90a49970fd13fed3852c66ed220c01b4d8418ce89d
 DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fca SHA1 7603f991aa92810669e71278f9abc20a2180f97d SHA256 2f40b0664701f79d5a49cb336ba2567535e0eb093c1a0691bbac08b73224643d
 DIST amarok-2.2.2.90.tar.bz2 9166245 RMD160 0b595183c17b58fe2f9da6afcca44bf32d574366 SHA1 fd0f2f42aae199b63a8fb0818033b4c3c027b866 SHA256 4c1c3da3d7b59847a47c41e46bd4b1425c98e4efd7c325f1818381f37ac65fb9
@@ -9,6 +10,7 @@ EBUILD amarok-2.2.0.ebuild 2812 RMD160 9b384218b43191ffca1cb8d77b6f19385c286e59
 EBUILD amarok-2.2.2-r1.ebuild 3129 RMD160 7f2f764b4542d2447b7e1109c757a45ea8f0f403 SHA1 24f628aaf70a20f4160fa135df7d07e4f83f724f SHA256 fda21a42223a92bf47f68e2b2824b332017c480c3164389b76b1f8c5106459d1
 EBUILD amarok-2.2.2.90.ebuild 3186 RMD160 5ab2c57a94f45f8fa701e8f4806fac7f79d2f602 SHA1 2c6a656bf6235f55bdee379edc4a415dcaf3d44b SHA256 9979342df63168644c5afd42489ee3041ab642786306c9ddf75748b4e8432337
 EBUILD amarok-2.2.2.ebuild 2850 RMD160 9b7b2f61e0d5b01f4ba3259d8303d72a72f95c6c SHA1 58e7e13f771a08ce334ec451348d267c95807e72 SHA256 b328deb759121d97a91efbf89e8ebed65f6c76cf4ff274554a761a2e2788e07a
+EBUILD amarok-2.3.0-r1.ebuild 3425 RMD160 5a01c3daf02c51e561baf84045a35f672fbd875e SHA1 ddd0cf1ce64761547028f0013eb3d1f918de3075 SHA256 6d60b0ef36d56b43f5cf17eafee55a163e9ddd0823e55e8f4494c92993525644
 EBUILD amarok-2.3.0.ebuild 3362 RMD160 383175b7c7192174aa09c4bd17103b7757e634d7 SHA1 ee33ebae814777706f2ae99df51dc2b77f9cf241 SHA256 2d977d3eade9e2dde0baa517775093fafb56e03a5a375595c61be5f7c742689e
-MISC ChangeLog 60609 RMD160 7ee7a612d38fb1f3be96d3051b8576459514fa79 SHA1 900e388385b9c613ee692d9d077aa279eaae4618 SHA256 ed25634460e1e155661737827dd94056f38e04ee0c04e5e87de92f6870914131
+MISC ChangeLog 60877 RMD160 17895ded7043db07448a8128a9eab3764e5aafa8 SHA1 8e3db501aa413229accccddc7fa522d357a3ba10 SHA256 f1b82ff2064c5d70cfb0a239a5324f0fb2be077454da9b8bb44fd2c8f65327d4
 MISC metadata.xml 1283 RMD160 f188f32c38a3e5425d86c59b8c1af8f27833d6b2 SHA1 34f8738cfbf39c87b3ef2ed35f43711b3302c15c SHA256 72c533c0a2afe35a34f0064cdac226e714a1d4bfdddd5cbb6a2ecc75541c16c8
diff --git a/media-sound/amarok/amarok-2.3.0-r1.ebuild b/media-sound/amarok/amarok-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..75edaeb26711
--- /dev/null
+++ b/media-sound/amarok/amarok-2.3.0-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.0-r1.ebuild,v 1.1 2010/03/28 12:18:04 jmbsvicetto Exp $
+
+EAPI="2"
+
+# Translations are only in the tarballs, not the git repo
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl
+	pa pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+else
+	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
+	GIT_ECLASS="git"
+fi
+OPENGL_REQUIRED="optional"
+inherit kde4-base ${GIT_ECLASS}
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="4"
+IUSE="cdda daap debug embedded ipod lastfm mp3tunes mtp semantic-desktop"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+DEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.5.7[dbus,qt4]
+	>=dev-db/mysql-5.0.76
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
+	sys-libs/zlib
+	x11-libs/qt-script
+	>=x11-libs/qtscriptgenerator-0.1.0
+	embedded? ( <dev-db/mysql-5.1[embedded,-minimal] )
+	cdda? (
+		>=kde-base/libkcddb-${KDE_MINIMAL}
+		>=kde-base/libkcompactdisc-${KDE_MINIMAL}
+		>=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL}
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-0.3.0 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core[glib]
+	)
+	mtp? ( >=media-libs/libmtp-0.3.0 )
+"
+RDEPEND="${DEPEND}
+	>=kde-base/phonon-kde-${KDE_MINIMAL}
+	>=media-sound/amarok-utils-${PV}
+	semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
+"
+
+PATCHES=( "${FILESDIR}/${P}-crash_fix_info_applet.patch" )
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+# Only really required for live ebuild, to skip git_src_prepare
+src_prepare() {
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_UTILITIES=OFF
+		-DWITH_Libgcrypt=OFF
+		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+		$(cmake-utils_use_with ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with lastfm LibLastFm)
+		$(cmake-utils_use_with mtp)
+		$(cmake-utils_use_with mp3tunes MP3Tunes)
+	)
+		# $(cmake-utils_use_with semantic-desktop Nepomuk)
+		# $(cmake-utils_use_with semantic-desktop Soprano)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use daap; then
+		echo
+		elog "You have installed amarok with daap support."
+		elog "You may be interested in installing www-servers/mongrel as well."
+		echo
+	fi
+
+	if ! use embedded; then
+		echo
+		elog "You've disabled the amarok support for embedded mysql DBs."
+		elog "You'll have to configure amarok to use an external db server."
+		echo
+		elog "Please read http://amaroklive.com/wiki/MySQL_Server for details on how"
+		elog "to configure the external db and migrate your data from the embedded database."
+		echo
+
+		if has_version "dev-db/mysql[minimal]"; then
+			elog "You built mysql with the minimal use flag, so it doesn't include the server."
+			elog "You won't be able to use the local mysql installation to store your amarok collection."
+			echo
+		fi
+	fi
+}
diff --git a/media-sound/amarok/files/amarok-2.3.0-crash_fix_info_applet.patch b/media-sound/amarok/files/amarok-2.3.0-crash_fix_info_applet.patch
new file mode 100644
index 000000000000..bd92cd01d1bb
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.3.0-crash_fix_info_applet.patch
@@ -0,0 +1,61 @@
+diff --git a/src/context/applets/info/InfoApplet.cpp b/src/context/applets/info/InfoApplet.cpp
+index 166da4c..e415e98 100644
+--- a/src/context/applets/info/InfoApplet.cpp
++++ b/src/context/applets/info/InfoApplet.cpp
+@@ -40,18 +40,30 @@ QString InfoApplet::s_defaultHtml = "<html>"
+ 
+ InfoApplet::InfoApplet( QObject* parent, const QVariantList& args )
+     : Context::Applet( parent, args )
++    , m_webView( 0 )
+     , m_initialized( false )
+     , m_currentPlaylist( 0 )
++   
+ {
+     setHasConfigurationInterface( false );
+     setBackgroundHints( Plasma::Applet::NoBackground );
++}
++
++InfoApplet::~InfoApplet()
++{
++    delete m_webView;
++}
++
++
++void  InfoApplet::init()
++{
+ 
+     dataEngine( "amarok-info" )->connectSource( "info", this );
+ 
+     m_webView = new AmarokWebView( this );
+ 
+     resize( 500, -1 );
+-    
++
+     QPalette p = m_webView->palette();
+     p.setColor( QPalette::Dark, QColor( 255, 255, 255, 0)  );
+     p.setColor( QPalette::Window, QColor( 255, 255, 255, 0)  );
+@@ -62,11 +74,6 @@ InfoApplet::InfoApplet( QObject* parent, const QVariantList& args )
+     constraintsEvent();
+ }
+ 
+-InfoApplet::~InfoApplet()
+-{
+-    delete m_webView;
+-}
+-
+ void InfoApplet::constraintsEvent( Plasma::Constraints constraints )
+ {
+     Q_UNUSED( constraints )
+diff --git a/src/context/applets/info/InfoApplet.h b/src/context/applets/info/InfoApplet.h
+index 4be28fc..775ea7c 100644
+--- a/src/context/applets/info/InfoApplet.h
++++ b/src/context/applets/info/InfoApplet.h
+@@ -48,6 +48,8 @@ public:
+     InfoApplet( QObject* parent, const QVariantList& args );
+     virtual ~InfoApplet();
+ 
++    void init();
++
+     void paintInterface( QPainter *painter, const QStyleOptionGraphicsItem *option, const QRect &contentsRect );
+     void constraintsEvent( Plasma::Constraints constraints = Plasma::AllConstraints );
+