Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2012-08-31 09:12:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2012-06-25 12:21:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2012-08-31 09:12:41.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Aug 14 06:50:24 UTC 2012 - [email protected] + +- Remove ksuseinstall patch entirely + +------------------------------------------------------------------- +Mon Aug 13 09:19:22 UTC 2012 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- amarok-2.5.0.tar.bz2 amarok-ffmpeg11.patch kde-290123.patch ksuseinstall.diff New: ---- amarok-2.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.s9836K/_old 2012-08-31 09:12:47.000000000 +0200 +++ /var/tmp/diff_new_pack.s9836K/_new 2012-08-31 09:12:47.000000000 +0200 @@ -19,7 +19,7 @@ %bcond_with ffmpeg Name: amarok -Version: 2.5.0 +Version: 2.6.0 Release: 0 Summary: Media Player for KDE License: GPL-2.0+ @@ -27,25 +27,16 @@ Url: http://amarok.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 -# PATCH-FEATURE-OPENSUSE ksuseinstall.diff [email protected] -- Support for on-demand codecs install using ksuseinstall -Patch1: ksuseinstall.diff # PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 [email protected] -- Increase initial preference to be used for audio files instead of Kaffeine -Patch2: initial-preference.diff +Patch1: initial-preference.diff # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 [email protected] -- Support for the changed mimetype for flac files -Patch3: flac_mimetype_bnc671581.diff -# PATCH-FIX-UPSTREAM kde#290123 [email protected] -- Fix for kde bug 290123 -Patch4: kde-290123.patch -Patch5: revert_solid_workaround.diff -Patch6: amarok-ffmpeg11.patch +Patch2: flac_mimetype_bnc671581.diff +Patch3: revert_solid_workaround.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # Required for the fdupes macro BuildRequires: fdupes -%if 0%{?suse_version} == 1130 -BuildRequires: gtk2-devel -%else BuildRequires: gdk-pixbuf-devel -%endif BuildRequires: glib2-devel BuildRequires: libcurl-devel %if %{with ffmpeg} @@ -89,16 +80,9 @@ %lang_package %prep %setup -q -%if !0%{?kde_updatedapps} -%patch1 -p1 -%endif +%patch1 %patch2 -%if 0%{?suse_version} > 1130 -%patch3 -%endif -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%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') @@ -176,7 +160,6 @@ %{_kde4_iconsdir}/hicolor/*/apps/amarok.* %{_kde4_appsdir}/amarok/ %dir %{_kde4_appsdir}/desktoptheme -%{_kde4_appsdir}/desktoptheme/Amarok-Mockup/ %dir %{_kde4_appsdir}/desktoptheme/default %dir %{_kde4_appsdir}/desktoptheme/default/widgets %{_kde4_appsdir}/desktoptheme/default/widgets/amarok-* ++++++ amarok-2.5.0.tar.bz2 -> amarok-2.6.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/amarok/amarok-2.5.0.tar.bz2 /work/SRC/openSUSE:Factory/.amarok.new/amarok-2.6.0.tar.bz2 differ: char 11, line 1 ++++++ flac_mimetype_bnc671581.diff ++++++ --- /var/tmp/diff_new_pack.s9836K/_old 2012-08-31 09:12:47.000000000 +0200 +++ /var/tmp/diff_new_pack.s9836K/_new 2012-08-31 09:12:47.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- src/amarok.desktop.orig +++ src/amarok.desktop -@@ -183,7 +183,7 @@ Comment[zh_TW]=Amarok - 重新探索您� +@@ -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 @@ -10,4 +10,4 @@ +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[el]=μουσική,podcast + X-KDE-Keywords[ca]=música,podcast ++++++ revert_solid_workaround.diff ++++++ --- /var/tmp/diff_new_pack.s9836K/_old 2012-08-31 09:12:47.000000000 +0200 +++ /var/tmp/diff_new_pack.s9836K/_new 2012-08-31 09:12:47.000000000 +0200 @@ -2,7 +2,7 @@ index 15583b8..8682f4d 100644 --- a/src/MediaDeviceCache.cpp +++ b/src/MediaDeviceCache.cpp -@@ -50,14 +50,10 @@ MediaDeviceCache::MediaDeviceCache() : QObject() +@@ -50,10 +50,10 @@ { DEBUG_BLOCK s_instance = this; @@ -10,25 +10,21 @@ - this, SLOT( slotAddSolidDevice( const QString & ) ) ); - connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceRemoved( const QString & ) ), - this, SLOT( slotRemoveSolidDevice( const QString & ) ) ); -- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -- -- m_timer.setSingleShot(true); -- m_timer.start(1000); -+ connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceAdded( QString) ), -+ this, SLOT( slotAddSolidDevice( QString) ) ); -+ connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceRemoved(QString) ), -+ this, SLOT( slotRemoveSolidDevice( 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() -@@ -96,19 +92,17 @@ MediaDeviceCache::refreshCache() +@@ -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) ) ); ++ connect( ssa, SIGNAL( accessibilityChanged(bool, QString&) ), ++ this, SLOT( slotAccessibilityChanged(bool, QString&) ) ); m_volumes.append( device.udi() ); } if( ssa->isAccessible() ) @@ -43,74 +39,28 @@ debug() << "Solid device is not accessible, will wait until it is to consider it added."; } } -@@ -198,8 +192,8 @@ MediaDeviceCache::slotAddSolidDevice( const QString &udi ) +@@ -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) ) ); ++ connect( ssa, SIGNAL( accessibilityChanged(bool, QString&) ), ++ this, SLOT( slotAccessibilityChanged(bool, QString&) ) ); m_volumes.append( device.udi() ); } if( ssa->isAccessible() ) -@@ -271,8 +265,8 @@ MediaDeviceCache::slotRemoveSolidDevice( const QString &udi ) +@@ -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) ) ); ++ disconnect( device.as<Solid::StorageAccess>(), SIGNAL( accessibilityChanged(bool, QString&) ), ++ this, SLOT( slotAccessibilityChanged(bool, QString&) ) ); m_volumes.removeAll( udi ); emit deviceRemoved( udi ); } -@@ -287,45 +281,6 @@ MediaDeviceCache::slotRemoveSolidDevice( const QString &udi ) - emit deviceRemoved( udi ); - } - --void MediaDeviceCache::slotTimeout() --{ -- KMountPoint::List possibleMountList = KMountPoint::possibleMountPoints(); -- KMountPoint::List currentMountList = KMountPoint::currentMountPoints(); -- QList<Solid::Device> deviceList = Solid::Device::listFromType( Solid::DeviceInterface::StorageAccess ); -- -- for (KMountPoint::List::iterator it = possibleMountList.begin(); it != possibleMountList.end(); ++it) { -- if ((*it)->mountType() == "nfs" || (*it)->mountType() == "nfs4" || -- (*it)->mountType() == "smb" || (*it)->mountType() == "cifs") { -- QString path = (*it)->mountPoint(); -- bool mounted = false; -- QString udi = QString(); -- -- foreach( const Solid::Device &device, deviceList ) -- { -- const Solid::StorageAccess* ssa = device.as<Solid::StorageAccess>(); -- if( ssa && path == ssa->filePath()) -- udi = device.udi(); -- } -- -- for (KMountPoint::List::iterator it2 = currentMountList.begin(); it2 != currentMountList.end(); ++it2) { -- if ( (*it)->mountType() == (*it2)->mountType() && -- (*it)->mountPoint() == (*it2)->mountPoint() ) { -- mounted = true; -- break; -- } -- } -- -- if ( m_accessibility[udi] != mounted ) { -- m_accessibility[udi] = mounted; -- slotAccessibilityChanged( mounted, udi); -- } -- } -- } -- -- m_timer.setSingleShot(true); -- m_timer.start(1000); --} -- - void - MediaDeviceCache::slotAccessibilityChanged( bool accessible, const QString &udi ) - { diff --git a/src/MediaDeviceCache.h b/src/MediaDeviceCache.h index a48d453..0e971cc 100644 --- a/src/MediaDeviceCache.h @@ -123,19 +73,11 @@ namespace Solid { class Device; -@@ -62,15 +61,12 @@ class AMAROK_EXPORT MediaDeviceCache : public QObject - void slotAddSolidDevice( const QString &udi ); - void slotRemoveSolidDevice( const QString &udi ); - void slotAccessibilityChanged( bool accessible, const QString &udi ); -- void slotTimeout(); - +@@ -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; -- QTimer m_timer; }; - - #endif /* AMAROK_MEDIADEVICECACHE_H */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
