Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at Fri Mar 26 16:48:02 CET 2010. -------- --- KDE/amarok/amarok.changes 2010-03-11 08:55:37.000000000 +0100 +++ amarok/amarok.changes 2010-03-25 12:21:22.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 25 11:20:47 UTC 2010 - tittiatcoke@gmail.com + +- Include patch for Info Applet to prevent crash + (bko#229756, bko#227639) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- info-applet-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.VSgKyZ/_old 2010-03-26 16:47:38.000000000 +0100 +++ /var/tmp/diff_new_pack.VSgKyZ/_new 2010-03-26 16:47:38.000000000 +0100 @@ -43,13 +43,14 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 2.3.0 -Release: 1 +Release: 2 Source0: %{name}-%{version}.tar.bz2 Source100: %{name}-rpmlintrc Patch3: errmsg-mysql-embedded.diff Patch4: errmsg-mysql51-embedded.diff # PATCH-FIX-OPENSUSE no_buildtime.patch cmorve69@yahoo.es -- Remove build time from code so build-compare can make its work Patch5: no_buildtime.patch +Patch6: info-applet-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kde4-amarok = 2.0.90 Obsoletes: kde4-amarok <= 2.0.89 @@ -91,6 +92,7 @@ %patch3 %endif %patch5 -p0 +%patch6 -p0 %build %ifarch ppc ppc64 ++++++ info-applet-fix.diff ++++++ --- src/context/applets/info/CMakeLists.txt 2010-03-11 00:12:15.000000000 +0100 +++ src/context/applets/info/CMakeLists.txt 2010-03-23 20:27:01.734969347 +0100 @@ -3,8 +3,10 @@ set(info_SRCS InfoApplet.cpp ) -include_directories( ../.. - ../../.. ) +include_directories( + ../.. + ../../.. + ) kde4_add_plugin(amarok_context_applet_info ${info_SRCS}) if(APPLE) --- src/context/applets/info/InfoApplet.cpp 2010-03-11 00:12:15.000000000 +0100 +++ src/context/applets/info/InfoApplet.cpp 2010-03-22 18:00:50.174397202 +0100 @@ -40,18 +40,30 @@ 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 @@ constraintsEvent(); } -InfoApplet::~InfoApplet() -{ - delete m_webView; -} - void InfoApplet::constraintsEvent( Plasma::Constraints constraints ) { Q_UNUSED( constraints ) --- src/context/applets/info/InfoApplet.h 2010-03-11 00:12:15.000000000 +0100 +++ src/context/applets/info/InfoApplet.h 2010-03-23 21:00:43.830972210 +0100 @@ -48,6 +48,8 @@ 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 ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org