Hello community, here is the log from the commit of package amarok.1886 for openSUSE:12.3:Update checked in at 2013-07-31 11:53:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/amarok.1886 (Old) and /work/SRC/openSUSE:12.3:Update/.amarok.1886.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok.1886" Changes: -------- New Changes file: --- /dev/null 2013-07-23 23:44:04.804033756 +0200 +++ /work/SRC/openSUSE:12.3:Update/.amarok.1886.new/amarok.changes 2013-07-31 11:53:36.000000000 +0200 @@ -0,0 +1,1138 @@ +------------------------------------------------------------------- +Wed May 15 23:07:45 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to 2.7.1 + * CHANGES: + * Problematic support for treating MusicBrainz ids as track + unique ids was dropped; should avoid surprising + "Duplicate Tracks Found" errors. (315329) + * BUGFIXES: + * Fix inability to reverse "Use Music Location" decision and + inability to clear database once all collection directories + have been unset. (kde#316216) + * Fix frequent crashes on Linux when starting to play a track. + (kde#319371) + * Fix compilation error on systems with gcc-4.2 (kde#314528) + * Fix inability to create database when home directory contains + non-ASCII characters. (kde#313914) + * Fix typo in Nepomuk query which did not let track numbers of + Nepomuk Collection tracks show up in Amarok. (kde#311847) +- Drop fix-crashes-on-track-change.patch and trackNumber-typo-fix.diff + these patches are included in this release + +------------------------------------------------------------------- +Thu May 9 18:10:48 UTC 2013 - hrvoje.sen...@gmail.com + +- Added fix-crashes-on-track-change.patch, fixes frequent crashes + when changing tracks (kde#319371) + +------------------------------------------------------------------- +Fri Feb 15 14:54:31 UTC 2013 - hrvoje.sen...@gmail.com + +- Added trackNumber-typo-fix.diff, fixes kde#311847, track number + not shown in Nepomuk collection + +------------------------------------------------------------------- +Fri Jan 18 05:09:28 UTC 2013 - tittiatc...@gmail.com + +- Update to 2.7 + * FEATURES: + * Track dragging support in Unique Tracks tab of the Synchronize + Statistics action; allows you to do a "diff" between collections + and transfer missing tracks. (kde#237266) + * Amarok now scrobbles tracks in streams if the stream correctly + updates meta-data. (kde#240732) + * When scrobbling to Last.fm, Amarok announces suggested tag + corrections (configurable). (kde#309697) + * Ability to scrobble recently played tracks from iPod (and + the like) to Last.fm. + * Synchronization of labels and rating between Last.fm and + Amarok collections; play count can be synchronized one-way + from Last.fm to Amarok. (kde#206249) + * Statistics synchronization between collections, supports + rating, first / last played time, play count and labels. + * New APG constraint: Specify a total file size for playlist. + (kde#283618) + * Amazon store: Added support for Amazon MP3 in Italy and + Spain. (kde#307981) + * Mark downloaded podcast episodes to keep, even when purge + is enabled. (kde#261062) + * Nepomuk plugin: Play and manage tracks using the Nepomuk + database. + * Support for reading and writing tags from/to mod, s3m, + it and xm files. + * Amazon store: It is now possible to add items to your + shopping cart using amarok:// URLs. + * Amazon store: Use the context info applet to show further + infos about a selected item. + * New argument --debug-audio to enable Phonon debugging. + * Amazon store: We now ship a utility to handle downloads + from Amazon. + +- Removed patch liblastfm1-support.diff (fixed upstream) +- Added build require for nepomuk-core-devel for the Nepomuk plugin + +------------------------------------------------------------------- +Sun Dec 16 01:09:22 UTC 2012 - stefan.bru...@rwth-aachen.de + +- fix broken signal/slot signatures caused by SR:130759 + +------------------------------------------------------------------- +Fri Nov 2 15:54:05 UTC 2012 - ctri...@opensuse.org + +- Install the english handbook only with the lang-package as otherwise + translations will not be displayed when they are provided by + bundle-lang-kde-* (bnc#695108) +- No longer Build-require libksuseinstall-devel as the corresponding + patch was removed + +------------------------------------------------------------------- +Thu Sep 6 15:59:28 UTC 2012 - dmuel...@suse.com + +- add support for liblastfm1 + * liblastfm1-support.diff + +------------------------------------------------------------------- +Tue Aug 14 06:50:24 UTC 2012 - toddrme2...@gmail.com + +- Remove ksuseinstall patch entirely + +------------------------------------------------------------------- +Mon Aug 13 09:19:22 UTC 2012 - toddrme2...@gmail.com + +- Update to 2.6 + * See http://strohel.blogspot.com/2012/08/amarok-26-released-enjoy-great-ipod.html +- Removed obsolete version checks +- Remove upstream implemented patches +- Temporarily disabled non-working ksuseinstall patch +- Rebased patches + +------------------------------------------------------------------- +Fri Jun 15 23:58:24 UTC 2012 - stefan.bru...@rwth-aachen.de + +- remove errmsg patch, it must match the version of the installed + libmysqld, thus libmysqld need a matching dependency + depends on fixed mysql package + fixes bnc#712749 + +------------------------------------------------------------------- +Mon May 28 21:06:39 UTC 2012 - reddw...@opensuse.org + +- Fix build with ffmpeg 0.11 + +------------------------------------------------------------------- +Tue Mar 6 04:24:27 UTC 2012 - stefan.bru...@rwth-aachen.de + +- Revert: Fix detection of mounts of NFS & SMB Shares + depends on fix in solids mtab handling, available with SC 4.8.2 + +------------------------------------------------------------------- +Wed Feb 1 07:14:00 UTC 2012 - tittiatc...@gmail.com + +- Enable proper script support again as that qt4-qtscript now + compiles for Qt 4.8 + +------------------------------------------------------------------- +Fri Jan 27 10:08:00 UTC 2012 - idon...@suse.com + +- Add patch to fix kde#290123 + +------------------------------------------------------------------- +Tue Dec 20 15:48:16 UTC 2011 - adr...@suse.de + +- Update to final version 2.5.0 + * Mainly bugfixes since Beta 1, check the ChangeLog file for details + +------------------------------------------------------------------- +Mon Dec 12 09:22:18 UTC 2011 - idon...@suse.com + +- Fix path to errmsg.sys + +------------------------------------------------------------------- +Fri Dec 9 13:00:51 CET 2011 - dmuel...@suse.de + +- remove qt4-qtscript dependency + +------------------------------------------------------------------- +Wed Nov 30 14:00:38 UTC 2011 - m...@suse.com + +- Add amarok-fix-infinite-loop-eating-CPU.diff + * Fix infinite loop in context view eating CPU until main + window is shown (bnc#733421) + +------------------------------------------------------------------- +Tue Nov 15 23:37:39 UTC 2011 - tittiatc...@gmail.com + +- Update to 2.5 Beta 1 (2.4.90) + * New "equals" match in collection filter + * Enable dropping tracks on empty area in Saved Playlists to + create new playlist. + * Added a "create new playlist" action in the empty space of the + Saved Playlists. (bko#202725) + * Add new type of optional tokens in format string + (Collection Organizer) (bko#264874) + * Music store based on the Amazon catalogue. + * Auto-save the playlist so that it is not lost if Amarok + crashes. + * Both Delete and Move to Trash actions are now offered in the + collection browser context menu. (bko#286356) + * New USB Mass Storage media-device plugin using the Amarok + Collection Scanner. + * Playlist: Don't group albums without name. (bko#243344) + * Total rewrite of Automated Playlist Generator algorithm. + * Several bugfixes + +------------------------------------------------------------------- +Sun Nov 6 17:49:24 UTC 2011 - ctri...@opensuse.org + +- Change ksuseinstall to support the gstreamer-backend instead of + the xine one (bnc#728476) + +------------------------------------------------------------------- +Fri Oct 7 10:48:44 UTC 2011 - ctri...@opensuse.org + +- Remove errmsg-mysql51-embedded.diff as this causes amarok to fail + when initializing the collection (bnc#712749) +- Remove the action for audio-cds as amarok is not really a good + player for these (bnc#712749) ++++ 941 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.amarok.1886.new/amarok.changes New: ---- amarok-2.7.1.tar.bz2 amarok.changes amarok.spec flac_mimetype_bnc671581.diff initial-preference.diff revert_solid_workaround.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ # # spec file for package amarok # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %bcond_with ffmpeg Name: amarok Version: 2.7.1 Release: 0 Summary: Media Player for KDE License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://amarok.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 llu...@novell.com -- Increase initial preference to be used for audio files instead of Kaffeine Patch1: initial-preference.diff # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctri...@gmx.net -- Support for the changed mimetype for flac files Patch2: flac_mimetype_bnc671581.diff Patch3: revert_solid_workaround.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # Required for the fdupes macro BuildRequires: fdupes BuildRequires: gdk-pixbuf-devel BuildRequires: glib2-devel BuildRequires: libcurl-devel %if %{with ffmpeg} BuildRequires: libffmpeg-devel BuildRequires: libofa-devel %endif BuildRequires: libgcrypt-devel BuildRequires: libgpod-devel >= 0.7.0 BuildRequires: libkde4-devel >= 4.6.0 BuildRequires: liblastfm-devel BuildRequires: libmtp-devel BuildRequires: libmygpo-qt-devel >= 1.0.5 BuildRequires: libmysqlclient-devel BuildRequires: libmysqld-devel BuildRequires: libopenssl-devel BuildRequires: libqca2-devel BuildRequires: libqjson-devel BuildRequires: loudmouth-devel BuildRequires: nepomuk-core-devel BuildRequires: qt4-qtscript BuildRequires: taglib-devel BuildRequires: taglib-extras-devel BuildRequires: tcpd-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif Requires: libtag-extras1 >= 1.0 Requires: taglib >= 1.6 %kde4_runtime_requires Recommends: moodbar Recommends: qt4-qtscript Recommends: %{name}-lang = %{version} Provides: kde4-amarok = 2.0.90 Obsoletes: kde4-amarok <= 2.0.89 %description Amarok is a media player for all kinds of media. This includes MP3, Ogg Vorbis, audio CDs, podcasts and streams. Play lists can be stored in .m3u or .pls files. %lang_package %prep %setup -q %patch1 %patch2 %patch3 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/main.cpp %build %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif %cmake_kde4 -d build %make_jobs %install cd build %kde4_makeinstall cd .. # Remove *.so files (not needed), fix "devel-file-in-non-devel-package" rpmlint warning # "libampache_account_login.so" should not be removed rm -f %{buildroot}%{_kde4_libdir}/libamarok{core,lib,ocsclient,pud,-sqlcollection,-transcoding}.so #bnc722284 amarok is not really a good player for audio-cds, remove the action for solid rm -f %{buildroot}%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop %if 0%{?suse_version} %suse_update_desktop_file amarok Qt KDE AudioVideo Audio Player %endif # Remove unneeded locales %if 0%{?suse_version} && 0%{?suse_version} < 1140 rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/ rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/ %endif %fdupes -s %{buildroot} %find_lang amarok %find_lang amarokcollectionscanner_qt amarok.lang %find_lang amarok_scriptengine_qscript amarok.lang %find_lang amarokpkg amarok.lang %kde_post_install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING* ChangeLog README TODO %{_kde4_bindir}/amarok %{_kde4_bindir}/amarok_afttagger %{_kde4_bindir}/amarokcollectionscanner %{_kde4_bindir}/amarokmp3tunesharmonydaemon %{_kde4_bindir}/amarokpkg %{_kde4_bindir}/amzdownloader %{_kde4_modulesdir}/amarok_* %{_kde4_modulesdir}/kcm_amarok_service_* %{_kde4_libdir}/libamarok-sqlcollection.so.* %{_kde4_libdir}/libamarok-transcoding.so.* %{_kde4_libdir}/libamarokcore.so.* %{_kde4_libdir}/libamaroklib.so.* %{_kde4_libdir}/libamarokocsclient.so.* %{_kde4_libdir}/libamarokpud.so.* %{_kde4_libdir}/libampache_account_login.so %{_kde4_libdir}/libamarok_service_lastfm_shared.so %{_kde4_applicationsdir}/amarok.desktop %{_kde4_applicationsdir}/amarok_containers.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}/dbus-1/interfaces/org.kde.amarok.App.xml %{_datadir}/dbus-1/interfaces/org.kde.amarok.Collection.xml %{_datadir}/dbus-1/interfaces/org.kde.amarok.Mpris1Extensions.Player.xml %{_datadir}/dbus-1/interfaces/org.kde.amarok.Mpris2Extensions.Player.xml %{_kde4_iconsdir}/hicolor/*/apps/amarok.* %{_kde4_appsdir}/amarok/ %dir %{_kde4_appsdir}/desktoptheme %dir %{_kde4_appsdir}/desktoptheme/default %dir %{_kde4_appsdir}/desktoptheme/default/widgets %{_kde4_appsdir}/desktoptheme/default/widgets/amarok-* %{_kde4_appsdir}/kconf_update/amarok-2.4.1-tokens_syntax_update.pl %{_kde4_appsdir}/kconf_update/amarok.upd %{_kde4_sharedir}/config.kcfg/amarokconfig.kcfg %{_kde4_configdir}/amarok* %{_kde4_servicesdir}/ServiceMenus/amarok_append.desktop %{_kde4_servicesdir}/amarok-* %{_kde4_servicesdir}/amarok_* %{_kde4_servicesdir}/amarok.protocol %{_kde4_servicesdir}/amarok*.protocol %{_kde4_servicetypesdir}/amarok_* %files lang -f amarok.lang %defattr(-,root,root,-) %changelog ++++++ flac_mimetype_bnc671581.diff ++++++ Index: src/amarok.desktop =================================================================== --- src/amarok.desktop.orig +++ src/amarok.desktop @@ -184,7 +184,7 @@ Comment[zh_TW]=Amarok - 重新探索您 Icon=amarok # Add pure audio formats here, for other formats see amarok_*.desktop files # See bug 242292 -MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg; +MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg; X-DocPath=amarok/index.html X-KDE-Keywords=music,podcast X-KDE-Keywords[ca]=música,podcast ++++++ initial-preference.diff ++++++ --- src/amarok.desktop 2013-01-17 13:53:54.000000000 +0100 +++ src/amarok.desktop 2013-01-18 06:04:57.679101847 +0100 @@ -224,5 +224,6 @@ X-KDE-Keywords[zh_CN]=music,podcast,音乐,播客 X-KDE-Keywords[zh_TW]=music,podcast X-KDE-Protocols=http +InitialPreference=5 Terminal=false Categories=Qt;KDE;AudioVideo;Audio;Player; ++++++ revert_solid_workaround.diff ++++++ diff --git a/src/MediaDeviceCache.cpp b/src/MediaDeviceCache.cpp index 15583b8..8682f4d 100644 --- a/src/MediaDeviceCache.cpp +++ b/src/MediaDeviceCache.cpp @@ -50,10 +50,10 @@ { DEBUG_BLOCK s_instance = this; - connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceAdded( const QString & ) ), - this, SLOT( slotAddSolidDevice( const QString & ) ) ); - connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceRemoved( const QString & ) ), - this, SLOT( slotRemoveSolidDevice( const QString & ) ) ); + connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceAdded(QString) ), + this, SLOT( slotAddSolidDevice(QString) ) ); + connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceRemoved(QString) ), + this, SLOT( slotRemoveSolidDevice(QString) ) ); } MediaDeviceCache::~MediaDeviceCache() @@ -92,19 +92,17 @@ { if( !m_volumes.contains( device.udi() ) ) { - connect( ssa, SIGNAL( accessibilityChanged(bool, const QString&) ), - this, SLOT( slotAccessibilityChanged(bool, const QString&) ) ); + connect( ssa, SIGNAL( accessibilityChanged(bool,QString) ), + this, SLOT( slotAccessibilityChanged(bool,QString) ) ); m_volumes.append( device.udi() ); } if( ssa->isAccessible() ) { m_type[device.udi()] = MediaDeviceCache::SolidVolumeType; m_name[device.udi()] = ssa->filePath(); - m_accessibility[ device.udi() ] = true; } else { - m_accessibility[ device.udi() ] = false; debug() << "Solid device is not accessible, will wait until it is to consider it added."; } } @@ -194,8 +192,8 @@ debug() << "volume is generic storage"; if( !m_volumes.contains( device.udi() ) ) { - connect( ssa, SIGNAL( accessibilityChanged(bool, const QString&) ), - this, SLOT( slotAccessibilityChanged(bool, const QString&) ) ); + connect( ssa, SIGNAL( accessibilityChanged(bool,QString) ), + this, SLOT( slotAccessibilityChanged(bool,QString) ) ); m_volumes.append( device.udi() ); } if( ssa->isAccessible() ) @@ -267,8 +265,8 @@ Solid::Device device( udi ); if( m_volumes.contains( udi ) ) { - disconnect( device.as<Solid::StorageAccess>(), SIGNAL( accessibilityChanged(bool, const QString&) ), - this, SLOT( slotAccessibilityChanged(bool, const QString&) ) ); + disconnect( device.as<Solid::StorageAccess>(), SIGNAL( accessibilityChanged(bool,QString) ), + this, SLOT( slotAccessibilityChanged(bool,QString) ) ); m_volumes.removeAll( udi ); emit deviceRemoved( udi ); } diff --git a/src/MediaDeviceCache.h b/src/MediaDeviceCache.h index a48d453..0e971cc 100644 --- a/src/MediaDeviceCache.h +++ b/src/MediaDeviceCache.h @@ -23,7 +23,6 @@ #include <QMap> #include <QString> #include <QStringList> -#include <QtCore/QTimer> namespace Solid { class Device; @@ -67,7 +66,6 @@ private: QMap<QString, MediaDeviceCache::DeviceType> m_type; QMap<QString, QString> m_name; - QMap<QString, bool> m_accessibility; QStringList m_volumes; static MediaDeviceCache* s_instance; }; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
