Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at Thu May 21 01:52:59 CEST 2009. -------- --- KDE/amarok/amarok.changes 2009-05-20 12:12:53.000000000 +0200 +++ amarok/amarok.changes 2009-04-21 10:17:23.000000000 +0200 @@ -2 +2 @@ -Wed May 20 12:12:22 CEST 2009 - beineri@opensuse.org +Tue Apr 21 10:16:22 CEST 2009 - dmueller@suse.de @@ -4,121 +4 @@ -- require amarok-lang - -------------------------------------------------------------------- -Mon May 11 11:25:01 CEST 2009 - beineri@opensuse.org - -- update to 2.1 Beta 2: several bugfixes and - * New Script method to get current track time in milliseconds. - * Pressing the return key in the playlist search activates the - selected result. - * Pressing escape key in playlist search clears its contents. - * Optimizations to the insertion and removal of large numbers - of tracks from the playlist. Especially clearing a large - playlist is now about 300 times faster. - * Always scroll to newly inserted tracks in the Playlist. - * When removing upcoming tracks from an active dynamic playlist, - add a simmilar number of new ones to keep if from "drying up". - * Some action cleanup in the playlist context menu. - * When clearing the playlist, also reset the search/filter text. - * Podcast titles are stripped of unnecessary whitespace. - -------------------------------------------------------------------- -Tue Apr 21 10:18:16 CEST 2009 - dmueller@suse.de - -- kde4-amarok -> amarok - -------------------------------------------------------------------- -Thu Apr 16 13:21:52 CEST 2009 - shrikantkhare@gmail.com - -- update to version 2.0.90.svn954151.20090415 - -- FEATURES: - * New Script method to get current track time in milliseconds. (BR 177073) - -- BUGFIXES: - * Don't fetch all coverless albums automatically when opening the Cover - Manager. (BR 176170) - * Podcast episodes are loaded correctly when restoring a playlist on - startup. This means the local file will be played if downloaded. - (BR 189328) - * Next button in the main toolbar no longer has a clipped shadow. - (BR 176031) - * Fixed slider mouse events in RTL layouts. (BR 185465) - * Detect iPhones as iPods. (BR 184744) - * Clicking on "Stop after current track" disables the flag if it is - already enabled. - * Show a track marker when the "stop after current track" flag is set. - (BR 185888) - * Don't flash the OSD when opening the settings dialog. Patch thanks - to Andreas Heider <andreas@meetr.de>. - * Podcast file formats are correctly displayed. - * Don't crash when pressing Delete on empty playlist. (BR 189021) - -- VERSION 2.1beta1 - * The collection scanner is now able to be run in batch mode, allowing for - automated scans of both full and incremental types. In addition, all - graphical dependencies have been removed, allowing for headless, remote - runs of collection scans. A wiki page detailing how to do this will be - made available shortly. - * Covers are shown for iPod collections. - * Phonon multimedia system can be configured directly from Amarok. - * Cover art can now be disabled in the collection browser. - * Scrobble tracks from streams that have title and artist metadata - * Add support for showing a stream with multiple alternative servers as a - single item in the playlist and add GUI for manually selecting prefered - source. - * Ampache service: Add support for Ampache 3.5.x as well as 3.4.4. - * Auto timecoding (position bookmarking) now exists for tracks with length - greater than 10 minutes. (BR 148740) - * Add a animated "loading..." screen when dynamically fetching info about - an item to show in the service info applet. - * Deleting tracks from the local collection is now possible. (BR 170999) - * Add a filter-by-date-added to the collection browser. Use added:"today" - or added:<2m2d - * Add a tab bar in the current track applet for showing also the favorite - tracks in the collection. - * Add an advanced but user friendly playlist layout editor allowing users - to modify and create their own playlist layouts. - * The Playlist can now render itself using layouts defined in XML. A - number of default layouts are included and can be switched between. - * Option to automatically scroll the playlist to the active item on track - change. - * New QtScript methods for accessing the playlist: - Amarok.Playlist.selectedFilenames() & Amarok.Playlist.selectedIndizes(). - Patch by Mathias Panzenböck <grosser.meister.morti@gmx.net>. - * New QtScript method for the Track prototype: imagePixmap( size ). Returns - a QPixmap of the given size, or the default if the size argument isn't - supplied. - * New QtScript class 'DataDownloader' that returns results as a QByteArray - instead of a string. Needed for image downloads. - * Cue Sheets are now supported as in Amarok 1.4, plus each cue entry - (usually a track) will be displayed as a timecode on the Progress Bar - with a nice onMouseOver popup. - * Ipod support now uses/depends on libgpod 0.7.0 - * Bookmarking specific positions within local tracks and downloaded local - podcast episodes, with a nice visual indicator on the progress bar. - * When the last.fm service is active, any track, from any collection or - service, can be loved from the browser , and there will always be a love - button for the currently playing track, no matter the source. - * Dbus methods added: VolumeUp, VolumeDown and Mute. (BR 181130) - * The feed url is displayed in the config dialog of a podcast channel. - By left clicking in the url it's copied to the clipboard. (BR 180853) - * The Playlist Browser can now show playlists from multiple sources, - including media devices. - * The last.fm service now allows for the playing of all types of user - stations (personal, loved tracks, recommendations, and neighborhood). - * Arbitrary Tags can now be played in the last.fm service. (BR 139802) - * Replay Gain support for most file formats that Amarok can read tags from. - Reading Replay Gain tags from MP4 files requires libMP4v2. Musepack - (MPC) files are unsupported due to a limitation of TagLib. - * Amarok urls. Amarok can now load and generate "amarok urls" that allows - any "view" to be bookmarked and later retrieved. A protocol handler is - also installed that will launch amarok into the correct state, or make - amarok show the correct view if already running if such a url is - activated system wide. - * Customizable playlist layouts. The playlist is now rendered according to - an xml layout, allowing the playlist to assume a variety of different - looks and supply customizable information. - * Album cover art can be accessed via the scripting API. Patch thanks to - Simon Esneault <simon.esneault@gmail.com>. (BR 179732) - * New vertical Context View layout. - * New applet toolbar in the Context View to arrange, select, and add applets. +- rename kde4-amarok -> amarok calling whatdependson for head-i586 Old: ---- amarok-2.0.96.tar.bz2 New: ---- amarok-2.0.2.tar.bz2 amarok-gcc44.patch errmsg-mysql-embedded.diff errmsg.sys fix-lastfm-authentication.diff link-mysql-embedded.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.B23987/_old 2009-05-21 01:52:12.000000000 +0200 +++ /var/tmp/diff_new_pack.B23987/_new 2009-05-21 01:52:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package amarok (Version 2.0.96) +# spec file for package amarok (Version 2.0.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,28 +22,33 @@ BuildRequires: cups-devel libkcddb4-devel ruby-devel sqlite-devel taglib-devel BuildRequires: kdebase4-workspace-devel libkcompactdisc4-devel tse3-devel update-desktop-files BuildRequires: gstreamer010-devel libmtp-devel libnjb-devel libvisual-devel xine-devel -BuildRequires: flac-devel gtk2-devel libQtWebKit-devel libdvdread-devel libkde4-devel +BuildRequires: flac-devel gtk2-devel libQtWebKit-devel libdvdread-devel libgpod-devel BuildRequires: dbus-1-glib-devel libogg-devel libsamplerate-devel libsndfile-devel -BuildRequires: gdk-pixbuf-devel libcurl-devel libsoprano-devel loudmouth-devel -BuildRequires: libmysqlclient-devel libqca2-devel -BuildRequires: qt4-qtscript taglib-extras-devel -BuildRequires: libgpod-devel >= 0.7.0 -#Currently no package in openSUSE BuildService provides this -#BuildRequires: libmp4v2-devel -# Required for the fdupes macro -BuildRequires: fdupes +BuildRequires: gdk-pixbuf-devel libcurl-devel libsoprano-devel loudmouth-devel mysql-devel +%if %suse_version > 1030 +BuildRequires: libmusicbrainz3-devel +%endif +#%if %suse_version > 1020 +#BuildRequires: poppler-qt4 +#%endif Url: http://amarok.kde.org License: GPL v2 or later Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE -Version: 2.0.96 +Version: 2.0.2 Release: 2 Source0: %name-%version.tar.bz2 +Source1: errmsg.sys +Patch3: link-mysql-embedded.diff +Patch4: errmsg-mysql-embedded.diff +Patch5: amarok-gcc44.patch +Patch6: fix-lastfm-authentication.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: kde4-amarok = 2.0.90 -Obsoletes: kde4-amarok <= 2.0.90 -Requires: qt4-qtscript -Requires: %{name}-lang = %{version} +%kde4_runtime_requires +Requires: %name-lang = %{version} +Requires: libqt4-sql-sqlite +Provides: kde4-amarok = 2.0.2 +Obsoletes: kde4-amarok <= 2.0.2 %description Amarok is a media player for all kinds of media. This includes MP3, Ogg @@ -61,7 +66,11 @@ %lang_package %prep -%setup -q -n %name-%version +%setup -q +%patch3 +%patch4 +%patch5 +%patch6 %build %ifarch ppc ppc64 @@ -74,170 +83,63 @@ cd build %makeinstall cd .. + install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/kde4/apps/amarok/errmsg.sys %suse_update_desktop_file -r amarok AudioVideo Player %find_lang amarok - %find_lang amarokcollectionscanner_qt amarok.lang %kde_post_install - # create hardlinks for duplicate file using fdupes macro - %fdupes %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean -%{__rm} -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT +rm -rf filelists %files lang -f amarok.lang %files %defattr(-,root,root) -%_bindir/amarok -%_bindir/amarokcollectionscanner -%_bindir/amarok_afttagger -%_bindir/amarokmp3tunesharmonydaemon +/usr/bin/amarok +/usr/bin/amarokcollectionscanner +/usr/bin/amarok_afttagger +/usr/bin/amarokmp3tunesharmonydaemon +%dir /usr/%_lib/kde4/plugins/script +%_kde4_modules/plugins/script/* %_kde4_modules/amarok_* %_kde4_modules/kcm_amarok_service_* %_kde4_modules/libamarok_* -%_libdir/libamarok_service_liblastfm.so +%_libdir/libamarok_taglib.so +%_libdir/libamarok_taglib.so.* %_libdir/libamaroklib.so %_libdir/libamaroklib.so.* +%_libdir/libamarokplasma.so +%_libdir/libamarokplasma.so.* %_libdir/libamarokpud.so %_libdir/libamarokpud.so.* -%_libdir/libmediadevicelib.so -%_libdir/libmediadevicelib.so.* +/usr/%_lib/libamarok_service_liblastfm.so %_libdir/strigi/strigita_audible.so %_libdir/strigi/strigita_mp4.so -%{_datadir}/applications/kde4/amarok.desktop -%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml -%{_datadir}/icons/hicolor/*/apps/amarok.* +/usr/share/applications/kde4/amarok.desktop +/usr/share/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml +/usr/share/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml +/usr/share/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml +/usr/share/icons/hicolor/*/apps/amarok.* %_kde_share_dir/apps/amarok %_kde_share_dir/apps/desktoptheme/Amarok-Mockup %_kde_share_dir/apps/desktoptheme/amarok-default.desktop %_kde_share_dir/apps/desktoptheme/default/widgets/amarok-* -%_kde_share_dir/config.kcfg/amarokconfig.kcfg +%_kde_share_dir/config.kcfg/amarok.kcfg %_kde_config_dir/amarok.knsrc -%_kde_share_dir/servicetypes/amarok_* +%_kde_share_dir/services/ServiceMenus/amarok_append.desktop %_kde_share_dir/services/amarok-* %_kde_share_dir/services/amarok_* +%_kde_share_dir/servicetypes/amarok_* %_kde_share_dir/services/amaroklastfm.protocol -%_kde_share_dir/services/amarok.protocol -%_kde_share_dir/services/ServiceMenus/amarok_append.desktop -%_kde_config_dir/amarok_homerc %changelog -* Wed May 20 2009 beineri@opensuse.org -- require amarok-lang -* Mon May 11 2009 beineri@opensuse.org -- update to 2.1 Beta 2: several bugfixes and - * New Script method to get current track time in milliseconds. - * Pressing the return key in the playlist search activates the - selected result. - * Pressing escape key in playlist search clears its contents. - * Optimizations to the insertion and removal of large numbers - of tracks from the playlist. Especially clearing a large - playlist is now about 300 times faster. - * Always scroll to newly inserted tracks in the Playlist. - * When removing upcoming tracks from an active dynamic playlist, - add a simmilar number of new ones to keep if from "drying up". - * Some action cleanup in the playlist context menu. - * When clearing the playlist, also reset the search/filter text. - * Podcast titles are stripped of unnecessary whitespace. * Tue Apr 21 2009 dmueller@suse.de -- kde4-amarok -> amarok -* Thu Apr 16 2009 shrikantkhare@gmail.com -- update to version 2.0.90.svn954151.20090415 -- FEATURES: - * New Script method to get current track time in milliseconds. (BR 177073) -- BUGFIXES: - * Don't fetch all coverless albums automatically when opening the Cover - Manager. (BR 176170) - * Podcast episodes are loaded correctly when restoring a playlist on - startup. This means the local file will be played if downloaded. - (BR 189328) - * Next button in the main toolbar no longer has a clipped shadow. - (BR 176031) - * Fixed slider mouse events in RTL layouts. (BR 185465) - * Detect iPhones as iPods. (BR 184744) - * Clicking on "Stop after current track" disables the flag if it is - already enabled. - * Show a track marker when the "stop after current track" flag is set. - (BR 185888) - * Don't flash the OSD when opening the settings dialog. Patch thanks - to Andreas Heider <andreas@meetr.de>. - * Podcast file formats are correctly displayed. - * Don't crash when pressing Delete on empty playlist. (BR 189021) -- VERSION 2.1beta1 - * The collection scanner is now able to be run in batch mode, allowing for - automated scans of both full and incremental types. In addition, all - graphical dependencies have been removed, allowing for headless, remote - runs of collection scans. A wiki page detailing how to do this will be - made available shortly. - * Covers are shown for iPod collections. - * Phonon multimedia system can be configured directly from Amarok. - * Cover art can now be disabled in the collection browser. - * Scrobble tracks from streams that have title and artist metadata - * Add support for showing a stream with multiple alternative servers as a - single item in the playlist and add GUI for manually selecting prefered - source. - * Ampache service: Add support for Ampache 3.5.x as well as 3.4.4. - * Auto timecoding (position bookmarking) now exists for tracks with length - greater than 10 minutes. (BR 148740) - * Add a animated "loading..." screen when dynamically fetching info about - an item to show in the service info applet. - * Deleting tracks from the local collection is now possible. (BR 170999) - * Add a filter-by-date-added to the collection browser. Use added:"today" - or added:<2m2d - * Add a tab bar in the current track applet for showing also the favorite - tracks in the collection. - * Add an advanced but user friendly playlist layout editor allowing users - to modify and create their own playlist layouts. - * The Playlist can now render itself using layouts defined in XML. A - number of default layouts are included and can be switched between. - * Option to automatically scroll the playlist to the active item on track - change. - * New QtScript methods for accessing the playlist: - Amarok.Playlist.selectedFilenames() & Amarok.Playlist.selectedIndizes(). - Patch by Mathias Panzenböck <grosser.meister.morti@gmx.net>. - * New QtScript method for the Track prototype: imagePixmap( size ). Returns - a QPixmap of the given size, or the default if the size argument isn't - supplied. - * New QtScript class 'DataDownloader' that returns results as a QByteArray - instead of a string. Needed for image downloads. - * Cue Sheets are now supported as in Amarok 1.4, plus each cue entry - (usually a track) will be displayed as a timecode on the Progress Bar - with a nice onMouseOver popup. - * Ipod support now uses/depends on libgpod 0.7.0 - * Bookmarking specific positions within local tracks and downloaded local - podcast episodes, with a nice visual indicator on the progress bar. - * When the last.fm service is active, any track, from any collection or - service, can be loved from the browser , and there will always be a love - button for the currently playing track, no matter the source. - * Dbus methods added: VolumeUp, VolumeDown and Mute. (BR 181130) - * The feed url is displayed in the config dialog of a podcast channel. - By left clicking in the url it's copied to the clipboard. (BR 180853) - * The Playlist Browser can now show playlists from multiple sources, - including media devices. - * The last.fm service now allows for the playing of all types of user - stations (personal, loved tracks, recommendations, and neighborhood). - * Arbitrary Tags can now be played in the last.fm service. (BR 139802) - * Replay Gain support for most file formats that Amarok can read tags from. - Reading Replay Gain tags from MP4 files requires libMP4v2. Musepack - (MPC) files are unsupported due to a limitation of TagLib. - * Amarok urls. Amarok can now load and generate "amarok urls" that allows - any "view" to be bookmarked and later retrieved. A protocol handler is - also installed that will launch amarok into the correct state, or make - amarok show the correct view if already running if such a url is - activated system wide. - * Customizable playlist layouts. The playlist is now rendered according to - an xml layout, allowing the playlist to assume a variety of different - looks and supply customizable information. - * Album cover art can be accessed via the scripting API. Patch thanks to - Simon Esneault <simon.esneault@gmail.com>. (BR 179732) - * New vertical Context View layout. - * New applet toolbar in the Context View to arrange, select, and add applets. +- rename kde4-amarok -> amarok * Thu Apr 09 2009 rhafer@suse.de - included upstream fix for broken last.fm authentication (kde#188678) * Fri Mar 06 2009 wstephenson@suse.de ++++++ amarok-2.0.96.tar.bz2 -> amarok-2.0.2.tar.bz2 ++++++ ++++ 756783 lines of diff (skipped) ++++++ amarok-gcc44.patch ++++++ Index: src/metadata/audible/audibletag.cpp =================================================================== --- src/metadata/audible/audibletag.cpp (Revision 934060) +++ src/metadata/audible/audibletag.cpp (Arbeitskopie) @@ -27,6 +27,7 @@ #include <tag.h> #include <string.h> +#include <stdio.h> #include <stdlib.h> #include <netinet/in.h> // ntohl Index: src/metadata/audible/audibleproperties.cpp =================================================================== --- src/metadata/audible/audibleproperties.cpp (Revision 934060) +++ src/metadata/audible/audibleproperties.cpp (Arbeitskopie) @@ -29,6 +29,7 @@ #include "taglib_audiblefile.h" +#include <stdio.h> #include <netinet/in.h> // ntohl using namespace TagLib; Index: src/metadata/audible/taglib_audiblefile.cpp =================================================================== --- src/metadata/audible/taglib_audiblefile.cpp (Revision 934060) +++ src/metadata/audible/taglib_audiblefile.cpp (Arbeitskopie) @@ -29,6 +29,7 @@ #include "../tfile_helper.h" #include <audioproperties.h> #include <string.h> +#include <stdio.h> namespace TagLib { //////////////////////////////////////////////////////////////////////////////// Index: src/metadata/audible/taglib_audiblefiletyperesolver.cpp =================================================================== --- src/metadata/audible/taglib_audiblefiletyperesolver.cpp (Revision 934060) +++ src/metadata/audible/taglib_audiblefiletyperesolver.cpp (Arbeitskopie) @@ -23,6 +23,7 @@ #include "taglib_audiblefile.h" #include <string.h> +#include <stdio.h> TagLib::File *AudibleFileTypeResolver::createFile(TagLib::FileName fileName, bool readProperties, Index: src/metadata/wav/wavfiletyperesolver.cpp =================================================================== --- src/metadata/wav/wavfiletyperesolver.cpp (Revision 934060) +++ src/metadata/wav/wavfiletyperesolver.cpp (Arbeitskopie) @@ -23,6 +23,7 @@ #include "wavfile.h" #include <string.h> +#include <stdio.h> TagLib::File *WavFileTypeResolver::createFile(TagLib::FileName fileName, bool readProperties, Index: src/metadata/wav/wavproperties.cpp =================================================================== --- src/metadata/wav/wavproperties.cpp (Revision 934060) +++ src/metadata/wav/wavproperties.cpp (Arbeitskopie) @@ -27,6 +27,7 @@ #include <tstring.h> #include <stdint.h> +#include <stdio.h> #include "wavfile.h" Index: src/metadata/wav/wavfile.cpp =================================================================== --- src/metadata/wav/wavfile.cpp (Revision 934060) +++ src/metadata/wav/wavfile.cpp (Arbeitskopie) @@ -28,6 +28,7 @@ #include "../tfile_helper.h" #include <audioproperties.h> #include <tag.h> +#include <stdio.h> namespace TagLib { //////////////////////////////////////////////////////////////////////////////// Index: src/scriptengine/generator/generator/parser/rpp/pp.h =================================================================== --- src/scriptengine/generator/generator/parser/rpp/pp.h (Revision 934060) +++ src/scriptengine/generator/generator/parser/rpp/pp.h (Arbeitskopie) @@ -28,6 +28,7 @@ #include <iostream> #include <cassert> #include <cctype> +#include <cstdio> #include <fcntl.h> ++++++ errmsg-mysql-embedded.diff ++++++ --- src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:00:57 1.1 +++ src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:02:52 @@ -109,7 +109,7 @@ dir.mkpath( "." ); } - static const int num_elements = 8; + static const int num_elements = 9; char **server_options = new char* [ num_elements + 1 ]; server_options[0] = const_cast<char*>( "amarokmysqld" ); server_options[1] = defaultsLine; @@ -121,6 +121,7 @@ server_options[5] = const_cast<char*>( "--loose-skip-innodb" ); server_options[6] = const_cast<char*>( "--skip-grant-tables" ); server_options[7] = const_cast<char*>( "--myisam-recover=FORCE" ); + server_options[8] = const_cast<char*>( "--language=/usr/share/kde4/apps/amarok" ); server_options[num_elements] = 0; char **server_groups = new char* [ 3 ]; ++++++ fix-lastfm-authentication.diff ++++++ Index: src/services/lastfm/LastFmService.cpp =================================================================== --- src/services/lastfm/LastFmService.cpp.orig +++ src/services/lastfm/LastFmService.cpp @@ -115,14 +115,12 @@ LastFmService::LastFmService( LastFmServ debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) ); QString authToken = md5( ( m_userName + md5( password.toUtf8() ) ).toUtf8() ); - QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() ); // now authenticate w/ last.fm and get our session key WsReply* reply = WsRequestBuilder( "auth.getMobileSession" ) .add( "username", m_userName ) .add( "authToken", authToken ) .add( "api_key", Ws::ApiKey ) - .add( "api_sig", sign_key ) .get(); connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) ); Index: src/services/lastfm/LastFmServiceSettings.cpp =================================================================== --- src/services/lastfm/LastFmServiceSettings.cpp.orig +++ src/services/lastfm/LastFmServiceSettings.cpp @@ -94,14 +94,12 @@ LastFmServiceSettings::testLogin() debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) ); QString authToken = md5( ( m_configDialog->kcfg_ScrobblerUsername->text() + md5( m_configDialog->kcfg_ScrobblerPassword->text().toUtf8() ) ).toUtf8() ); - QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() ); // now authenticate w/ last.fm and get our session key WsReply* reply = WsRequestBuilder( "auth.getMobileSession" ) .add( "username", m_configDialog->kcfg_ScrobblerUsername->text() ) .add( "authToken", authToken ) .add( "api_key", Ws::ApiKey ) - .add( "api_sig", sign_key ) .get(); connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) ); ++++++ link-mysql-embedded.diff ++++++ --- src/collection/sqlcollection/CMakeLists.txt +++ src/collection/sqlcollection/CMakeLists.txt @@ -63,11 +63,6 @@ target_link_libraries(amarok_collection- ${KDE4_THREADWEAVER_LIBRARIES} ${CMAKE_DL_LIBS} ${MYSQL_EMBEDDED_LIBRARIES} - #this line may be needed on Debian or other systems where mysql is compiled - #in the prescence of yassl. However it seems to cause problems for other people, - #so its been disabled. - #See http://bugs.mysql.com/bug.php?id=21489 - ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org