Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2013-07-08 07:26:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok" Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2013-05-16 15:16:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2013-07-08 07:26:56.000000000 +0200 @@ -1,0 +2,195 @@ +Thu Jul 4 13:56:44 UTC 2013 - [email protected] + +- Update to 2.7.90 + * FEATURES: + * Ctrl+C copies the currently playing artist & title to the + clipboard. (kde#228872) + * Volume fade-out is now also available for pause. + * The Files browser now has a Refresh button. (kde#213666) + * The active playlist item is animated with a soft glow effect. + * Added an audio analyzer visualization applet. + * Added a function for resetting the GUI layout back to default + state. (kde#300753) + * Pressing enter when searching collections now adds found + tracks to the playlist and clears the search bar, this is a + very convenient way to populate your playlist. + * Allow to transcode only certain (different format, + playability) tracks when transferring them to a + collection (kde#312407) + * On-Screen-Display fades in/out smoothly. + * Added support for .asx playlists; (kde#170207) + * Add Radio GFM radio streams to Cool Stream Script. + (kde#317978) + * Added options to pause playback on system suspend and to + inhibit automatic suspend if playing a track (enabled by + default); (kde#259862) (kde#222571) + * Playlist files are now read asynchronously when possible; + (kde#291934) + * Added support to filter tracks to scrobble to Last.fm by + label. (kde#140198) + * Added transcoding support for Opus codec if ffmpeg is + compiled with support for the libopus library + * Added keyboard shortcuts for small 2 s seeks + (Ctrl + Left/Right) and long 1 minute seeks + (Shift + Left/Right) in addition to standard 10 s seeks. + Durations are now configurable in amarokrc, see + Amarok Handbook (kde#177258) + * Added support for files in Opus codec if Amarok is compiled + against recent enough TagLib (post 1.8) (kde#312905) + * Added Ctrl+H shortcut to randomize playlist (kde#208061) + * CHANGES: + * Removed LikeBack (a development feature in debug builds). + (kde#312498) (kde#252323) + * Collection Browser: Artist level was renamed to Track Artist + and replaced by Album Artist by default. Various Artists + item is no longer shown under Track Artist level. + * Removed the splash screen. + * Playlist-related actions were harmonized, double-clicking + or pressing enter will append tracks to playlist, using any + "play media" action will prepend tracks to queue and + immediately start playing; middle-clicking or will append + & play while other append or replace actions will no longer + start playback. (kde#145468, kde#145490, kde#194549) + * When a new collection plugin is enabled, its collections + appear immediately without a need for restart. + * Update the MusicBrainz tagger to MusicBrainz web service 2, + make it show some more good suggestions for tagging, and add + some options to help choosing the best results. + * Add note about generating .mood files into Moodbar Options; + (kde#289483) + * Amarok now depends on Qt 4.8.2. + * Add prepareToQuit() signal to Amarok.Window script bindings; + (kde#241066) + * Data CDs are now recognized in Amarok; (kde#316128) + * On-Screen-Display now uses the system font instead of + hardcoded sans-serif. (kde#248707) + * Fancy behavior of some context menus showing different + actions when Shift key is held has been reverted. + All entries are now shown all the time. + * The dynamic playlist behavior has changed. It will no longer + generate "pretty good" playlists that do not fulfill the + given biases. Instead it might add no song at all if given + impossible-to-fulfill conditions. + * The "tracks have been hidden in the playlist" warning when + filtering the playlist is now displayed inside the playlist. + (kde#260352) + * Update tag widget for Layout edit, filter edit, organize + collection and guess tag dialog. + * When fadeout and/or Replay Gain isn't possible, gray-out + related UI elements in order not to fool users. + * BUGFIXES: + * When you remove whole directories from the Local Collection + and have Watch Folders for Changes enabled, the tracks now + disappear from Collection Browser. (kde#311078) + * Fix dynamic playlist bug: When "Automatically scroll playlist + to current track" was enabled, Amarok would keep scrolling + to the bottom. (kde#284214) + * Fix a problem where ghost tracks would remain in the Local + Collection until the database is wiped. (kde#319084) + * Added missing CMake check for QtWebKit. (kde#321598) + * Definitely fix a bug where Local Collection wouldn't update + in browser. (kde#262504) + * Fix crashed caused by race conditions at the end of the + track scanning. (kde#319835) + * Fix crash when disabling the Free Music Charts script. + (kde#321329) + * Albums having same name but different album artist won't be + mixed together on the playlist if sorting by album is enabled. + * Fix crash on startup with KDE 4.11. (kde#320855) + * Fix tracks not able to be dragged around when playlist + is shuffled. (kde#320129) + * Prevent Last.fm scrobbles not being submitted until restart + due to change in liblastfm 1.0.7. (kde#320219) + * Resume Playback on Start will correctly restore paused state, + instead of always starting in playing state. (kde#313330) + * Optimize removal of tens of thousands of tracks from + playlist. (kde#316242) + * Fix `amarok --queue` which didn't actually queue the + tracks. (kde#317385) + * Fix suboptimal initial MusicBrainz tag dialog size by + remembering it. (kde#269454) + * Fix file-browser becoming empty when a file was moved to + trash. (kde#317944) + * Fix `amarok --play file.mp3` option didn't actually start + playback. + * Reason why a particular track is not playable is now shown + in playlist tooltip; (kde#313649) + * Pre-apmlifier in equalizer is now only enabled if it is + actually supported; (kde#301311) + * Fix Amarok crashed while doing "Organize Files" (kde#317980) + * Fix Amarok erroneously merges two albums. + (kde#216759, kde#272802) + * Fix Crash on very long artist names. (kde#276894) + * Fix Move tracks to rubbish and the current track cover + changes to the deleted cover. (kde#306735) + * Fix theoretical configwidget leak in services. (kde#301352) + * Fix "Local collection" text label is truncated with + large font. (kde#282561) + * Fix crash by putting a broadcast in the playlist. + (kde#313718) + * Fix Keyboard navigates context menu in collection will move + two items. (kde#307794) + * Fix add track to playlist by double click on arrow in the + collection. (kde#279513) + * Fix VFAT safe names missing a couple of idiosyncrasies. + (kde#312574) + * Clarify message when Last.fm streams are not available. + (kde#315771) + * Fix crash when Dynamic Playlist based on last.fm is aborted. + (kde#314243) + * Fix Group by directory doesn't work in main playlist. + (kde#265415) + * Don't remove common labels when editing the tags of multiple + tracks. (kde#316043) + * Fix vertical positioning of On-Screen-Display. (kde#269788) + * Fix OSD sometimes misplaces the font and the font's shadow. + (kde#257643) + * Prevent inability to save Last.fm password in corner cases. + (kde#315306) + * Fix "Copy to Collection" window doesn't fit on small screens. + (kde#283361) + * Fix crash when quitting Amarok with Statistics Synchronization + open. (kde#315525) + * Fix items moving around when expanded in collection browser. + (kde#305602) + * Fix Organize collection folder deletion going 'too far'. + (kde#314348) + * Fix %albumartist% placeholder translates to some strange unicode + symbol. (kde#314351) + * Fix bumpy fade-out when first used. (kde#312062) + * Fix crash when switching/removing organize collection presets. + (kde#314344) + * Fix crash on start if a playlist source is unavailable. + (kde#313460) + * Fix Copy/Move to collection picks up wrong destination path + and fails silently. (kde#314460) + * Cleanup TrackOrganizer. (kde#305291) + * Fix Editing Playist Layout Editor. (kde#250594) + * Fix Display glitch for rating in verbose playlist. (kde#300118) + * Refactoring Ampache service, fix Albums with multiple disks not + listed correctly. (kde#249857) + * Fix playlist sorting by type. (kde#249338) + * Fix subtle bugs when a long fade-out is initiated near the + song end. + * Don't try to fade-out with phonon backends that don't + support it. (vlc) + * Fix Can't edit & save an existing equalizer preset. + (kde#241874) + * Clean up Equalizer Dialog. (kde#274972) +- Drop kill-amarok-mockup.patch, included in this release +- Added oxygen-icon-theme BuildRequires, needed for amzdownloader icon +- Explicitly BuildRequire Qt4 >= 4.8.2, as per upstream change + +------------------------------------------------------------------- +Sun Jun 23 11:13:33 UTC 2013 - [email protected] + +- Added clamz as recommended runtime requirement. + +------------------------------------------------------------------- +Thu Jun 13 20:29:34 UTC 2013 - [email protected] + +- Added kill-amarok-mockup.patch which removes usage of non-existant + Amarok-Mockup plasma theme, that casues crashes with KDE 4.11 + (kde#320855) + +------------------------------------------------------------------- Old: ---- amarok-2.7.1.tar.bz2 New: ---- amarok-2.7.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.xXwx6V/_old 2013-07-08 07:26:58.000000000 +0200 +++ /var/tmp/diff_new_pack.xXwx6V/_new 2013-07-08 07:26:58.000000000 +0200 @@ -19,26 +19,25 @@ %bcond_with ffmpeg Name: amarok -Version: 2.7.1 +Version: 2.7.90 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 +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 [email protected] -- 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 [email protected] -- Support for the changed mimetype for flac files Patch2: flac_mimetype_bnc671581.diff +# PATCH-FIX-UPSTREAM revert_solid_workaround.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 +BuildRequires: pkgconfig(glib-2.0) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with ffmpeg} BuildRequires: libffmpeg-devel BuildRequires: libofa-devel @@ -54,8 +53,10 @@ BuildRequires: libopenssl-devel BuildRequires: libqca2-devel BuildRequires: libqjson-devel +BuildRequires: libqt4-devel >= 4.8.2 BuildRequires: loudmouth-devel BuildRequires: nepomuk-core-devel +BuildRequires: oxygen-icon-theme BuildRequires: qt4-qtscript BuildRequires: taglib-devel BuildRequires: taglib-extras-devel @@ -65,12 +66,13 @@ %endif Requires: libtag-extras1 >= 1.0 Requires: taglib >= 1.6 -%kde4_runtime_requires +Recommends: %{name}-lang = %{version} +Recommends: clamz Recommends: moodbar Recommends: qt4-qtscript -Recommends: %{name}-lang = %{version} Provides: kde4-amarok = 2.0.90 Obsoletes: kde4-amarok <= 2.0.89 +%kde4_runtime_requires %description Amarok is a media player for all kinds of media. This includes MP3, Ogg @@ -96,39 +98,42 @@ %make_jobs %install -cd build -%kde4_makeinstall -cd .. +%kde4_makeinstall -C build # 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 +rm -f %{buildroot}%{_kde4_libdir}/libamarok{core,lib,ocsclient,pud,shared,-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 + # Copy the icon for amzdownloader over from oxygen + for i in 16 22 32 48 + do + mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions + cp %{_kde4_iconsdir}/oxygen/${i}x${i}/actions/download.png %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions/ + done + %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/ +%suse_update_desktop_file -r amzdownloader Qt KDE AudioVideo Audio Player %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 +%post +/sbin/ldconfig +%{_kde4_bindir}/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : + +%postun +/sbin/ldconfig +%{_kde4_bindir}/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : %files %defattr(-,root,root,-) @@ -147,10 +152,12 @@ %{_kde4_libdir}/libamaroklib.so.* %{_kde4_libdir}/libamarokocsclient.so.* %{_kde4_libdir}/libamarokpud.so.* +%{_kde4_libdir}/libamarokshared.so.* %{_kde4_libdir}/libampache_account_login.so %{_kde4_libdir}/libamarok_service_lastfm_shared.so %{_kde4_applicationsdir}/amarok.desktop %{_kde4_applicationsdir}/amarok_containers.desktop +%{_kde4_applicationsdir}/amzdownloader.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 @@ -158,7 +165,9 @@ %{_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 +%{_datadir}/mime/packages/amzdownloader.xml %{_kde4_iconsdir}/hicolor/*/apps/amarok.* +%{_kde4_iconsdir}/hicolor/*/actions/download.png %{_kde4_appsdir}/amarok/ %dir %{_kde4_appsdir}/desktoptheme %dir %{_kde4_appsdir}/desktoptheme/default ++++++ amarok-2.7.1.tar.bz2 -> amarok-2.7.90.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/amarok/amarok-2.7.1.tar.bz2 /work/SRC/openSUSE:Factory/.amarok.new/amarok-2.7.90.tar.bz2 differ: char 11, line 1 ++++++ revert_solid_workaround.diff ++++++ --- /var/tmp/diff_new_pack.xXwx6V/_old 2013-07-08 07:26:58.000000000 +0200 +++ /var/tmp/diff_new_pack.xXwx6V/_new 2013-07-08 07:26:58.000000000 +0200 @@ -2,32 +2,7 @@ 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() ) +@@ -100,11 +100,9 @@ MediaDeviceCache::refreshCache() { m_type[device.udi()] = MediaDeviceCache::SolidVolumeType; m_name[device.udi()] = ssa->filePath(); @@ -39,28 +14,6 @@ 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 @@ -73,7 +26,7 @@ namespace Solid { class Device; -@@ -67,7 +66,6 @@ +@@ -67,7 +66,6 @@ class AMAROK_EXPORT MediaDeviceCache : p private: QMap<QString, MediaDeviceCache::DeviceType> m_type; QMap<QString, QString> m_name; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
