Hello community, here is the log from the commit of package kde4-amarok checked in at Mon Oct 6 19:02:29 CEST 2008. -------- --- KDE/kde4-amarok/kde4-amarok.changes 2008-10-06 10:27:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde4-amarok/kde4-amarok.changes 2008-09-09 11:10:08.000000000 +0200 @@ -2 +2 @@ -Mon Oct 6 10:26:42 CEST 2008 - dmueller@suse.de +Tue Sep 9 11:09:59 CEST 2008 - dmueller@suse.de @@ -4,11 +4 @@ -- update to 1.92.2 (real Beta2) - -------------------------------------------------------------------- -Mon Sep 29 08:36:26 CEST 2008 - dmueller@suse.de - -- update to 1.92 (2.0 Beta2) - -------------------------------------------------------------------- -Tue Sep 9 11:04:48 CEST 2008 - stbinner@suse.de - -- fix no-return-in-nonvoid-function places +- fix uninitialized return value warnings calling whatdependson for head-i586 Old: ---- amarok-1.92.2.tar.bz2 New: ---- amarok-1.90.tar.bz2 fix-plugin-install.diff fix-uninitialized.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-amarok.spec ++++++ --- /var/tmp/diff_new_pack.EC8168/_old 2008-10-06 19:02:24.000000000 +0200 +++ /var/tmp/diff_new_pack.EC8168/_new 2008-10-06 19:02:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kde4-amarok (Version 1.92.2) +# spec file for package kde4-amarok (Version 1.90) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ BuildRequires: gstreamer010-devel libmtp-devel libnjb-devel libvisual-devel xine-devel BuildRequires: flac-devel libQtWebKit-devel libQtWebKit4 libdvdread-devel libgpod-devel BuildRequires: dbus-1-glib-devel libogg-devel libsamplerate-devel libsndfile-devel xine-devel -BuildRequires: gdk-pixbuf-devel libcurl-devel libsoprano-devel loudmouth-devel mysql-devel +BuildRequires: gdk-pixbuf-devel libcurl-devel libsoprano-devel loudmouth-devel %if %suse_version > 1030 BuildRequires: libmusicbrainz3-devel %endif @@ -35,9 +35,11 @@ License: GPL v2 or later Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE -Version: 1.92.2 -Release: 1 +Version: 1.90 +Release: 6 Source0: amarok-%version.tar.bz2 +Patch0: fix-plugin-install.diff +Patch1: fix-uninitialized.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -57,6 +59,8 @@ %prep %setup -q -n amarok-%version +%patch0 +%patch1 %build %cmake_kde4 -d build @@ -66,8 +70,7 @@ cd build %makeinstall cd .. - %suse_update_desktop_file -r amarok AudioVideo Player - %find_lang amarok + %suse_update_desktop_file amarok AudioVideo Player %post -p /sbin/ldconfig @@ -77,14 +80,14 @@ rm -rf $RPM_BUILD_ROOT rm -rf filelists -%files -f amarok.lang +%files %defattr(-,root,root) /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/plugins/script/amarok %_kde4_modules/amarok_* %_kde4_modules/kcm_amarok_service_* %_kde4_modules/libamarok_* @@ -115,12 +118,8 @@ %_kde_share_dir/servicetypes/amarok_* %changelog -* Mon Oct 06 2008 dmueller@suse.de -- update to 1.92.2 (real Beta2) -* Mon Sep 29 2008 dmueller@suse.de -- update to 1.92 (2.0 Beta2) -* Tue Sep 09 2008 stbinner@suse.de -- fix no-return-in-nonvoid-function places +* Tue Sep 09 2008 dmueller@suse.de +- fix uninitialized return value warnings * Wed Aug 20 2008 dmueller@suse.de - update to 1.90 (2.0 Beta1) * Tue Jul 22 2008 dmueller@suse.de ++++++ amarok-1.92.2.tar.bz2 -> amarok-1.90.tar.bz2 ++++++ KDE/kde4-amarok/amarok-1.92.2.tar.bz2 /mounts/work_src_done/STABLE/kde4-amarok/amarok-1.90.tar.bz2 differ: byte 11, line 1 ++++++ fix-plugin-install.diff ++++++ --- src/scripts/qtscript_debug/CMakeLists.txt +++ src/scripts/qtscript_debug/CMakeLists.txt @@ -10,5 +10,5 @@ install( PROGRAMS install( PROGRAMS debug/__init__.js - DESTINATION lib/kde4/plugins/script/amarok/qtscript_debug/debug -) \ No newline at end of file + DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/script/amarok/qtscript_debug/debug +) ++++++ fix-uninitialized.diff ++++++ --- src/browsers/servicebrowser/mp3tunes/Mp3tunesLocker.cpp +++ src/browsers/servicebrowser/mp3tunes/Mp3tunesLocker.cpp @@ -348,9 +348,9 @@ Mp3tunesLocker::tracksWithFileKeys( QStringList filekeys ) const keys.chop(1); char* c_keys = convertToChar ( keys ); - mp3tunes_locker_track_list_t *tracks_list; - mp3tunes_locker_list_item_t *track_item; - mp3tunes_locker_track_t *track; + mp3tunes_locker_track_list_t *tracks_list = 0; + mp3tunes_locker_list_item_t *track_item = 0; + mp3tunes_locker_track_t *track = 0; QList<Mp3tunesLockerTrack> tracksQList; // to be returned mp3tunes_locker_tracks_with_file_key ( m_locker, c_keys, &tracks_list ); --- src/browsers/servicebrowser/mp3tunes/Mp3tunesServiceQueryMaker.cpp +++ src/browsers/servicebrowser/mp3tunes/Mp3tunesServiceQueryMaker.cpp @@ -150,6 +150,7 @@ QueryMaker * Mp3tunesServiceQueryMaker::setQueryType( QueryType type ) case QueryMaker::Year: case QueryMaker::Custom: case QueryMaker::None: + default: //TODO: Implement. return this; } --- src/scriptengine/AmarokEngineScript.cpp +++ src/scriptengine/AmarokEngineScript.cpp @@ -133,6 +133,7 @@ namespace AmarokScript case Phonon::StoppedState: return 2; //Stopped case Phonon::ErrorState: + default: return -1; }; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de